diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 0000000..b80b6d2
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,19 @@
+AM_CPPFLAGS = -I$(top_srcdir)/ \
+	$(GTEST_CFLAGS) \
+	$(GMOCK_CFLAGS)
+AM_CXXFLAGS = \
+	$(GTEST_MAIN_CFLAGS)
+AM_LDFLAGS = \
+	$(GMOCK_LIBS) \
+	$(GTEST_MAIN_LIBS) \
+	$(OESDK_TESTCASE_FLAGS)
+
+# Run all 'check' test programs
+check_PROGRAMS = \
+	handler_unittest
+TESTS = $(check_PROGRAMS)
+
+handler_unittest_SOURCES = handler_unittest.cpp
+handler_unittest_LDADD = $(PHOSPHOR_LOGGING_LIBS) \
+	$(top_builddir)/handler.o
+handler_unittest_CXXFLAGS = $(PHOSPHOR_LOGGING_CFLAGS)
diff --git a/test/handler_unittest.cpp b/test/handler_unittest.cpp
new file mode 100644
index 0000000..124a3ff
--- /dev/null
+++ b/test/handler_unittest.cpp
@@ -0,0 +1,12 @@
+#include "handler_unittest.hpp"
+
+namespace blobs
+{
+
+TEST_F(BinaryStoreBlobHandlerBasicTest, CanHandleBlobChecksNameInvalid)
+{
+    // Verify canHandleBlob checks and returns false on an invalid name.
+    EXPECT_FALSE(bstore.canHandleBlob("asdf"));
+}
+
+} // namespace blobs
diff --git a/test/handler_unittest.hpp b/test/handler_unittest.hpp
new file mode 100644
index 0000000..fd93de4
--- /dev/null
+++ b/test/handler_unittest.hpp
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "handler.hpp"
+
+#include <gtest/gtest.h>
+
+namespace blobs
+{
+
+class BinaryStoreBlobHandlerTest : public ::testing::Test
+{
+  protected:
+    BinaryStoreBlobHandlerTest() = default;
+
+    BinaryStoreBlobHandler bstore;
+};
+
+class BinaryStoreBlobHandlerBasicTest : public BinaryStoreBlobHandlerTest
+{
+};
+
+} // namespace blobs