diff --git a/Makefile.am b/Makefile.am
index 27db186..d2b7989 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,4 +27,4 @@
 	timer.cpp \
 	hwmon.cpp
 
-SUBDIRS = . msl tools
+SUBDIRS = . msl test tools
diff --git a/configure.ac b/configure.ac
index 1e0f27d..086dee0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,5 +90,5 @@
 AC_DEFINE_UNQUOTED([SENSOR_ROOT], ["$SENSOR_ROOT"], [The DBus sensors namespace root.])
 
 # Create configured output
-AC_CONFIG_FILES([Makefile tools/Makefile msl/Makefile])
+AC_CONFIG_FILES([Makefile test/Makefile tools/Makefile msl/Makefile])
 AC_OUTPUT
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 0000000..70cb196
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1 @@
+test-suite.log
diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 0000000..7f302ca
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,20 @@
+AM_CPPFLAGS = -I$(top_srcdir)/ $(GTEST_CFLAGS) $(GMOCK_CFLAGS)
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) \
+	$(GTEST_CFLAGS) \
+	$(GMOCK_CFLAGS) \
+	$(SDBUSPLUS_CFLAGS) \
+	$(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
+AM_LDFLAGS = $(GTEST_LIBS) \
+	$(PTHREAD_LIBS) \
+	$(GMOCK_LIBS) \
+	$(OESDK_TESTCASE_FLAGS) \
+	$(SDBUSPLUS_LIBS) \
+	$(PHOSPHOR_DBUS_INTERFACES_LIBS)
+
+# Run all 'check' test programs
+check_PROGRAMS = hwmon_unittest
+TESTS = $(check_PROGRAMS)
+
+hwmon_unittest_SOURCES = hwmon_unittest.cpp
+hwmon_unittest_LDADD = $(top_builddir)/hwmon.o
+
diff --git a/test/hwmon_unittest.cpp b/test/hwmon_unittest.cpp
new file mode 100644
index 0000000..035d098
--- /dev/null
+++ b/test/hwmon_unittest.cpp
@@ -0,0 +1,12 @@
+#include "hwmon.hpp"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+TEST(HwmonTest, InvalidType) {
+
+  hwmon::Attributes attrs;
+  EXPECT_FALSE(hwmon::getAttributes("invalid", attrs));
+
+}
+