diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 0000000..ee0881b
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,12 @@
+# gtest unit tests which run during a 'make check'
+check_PROGRAMS =
+
+# Run all 'check' test programs
+TESTS = $(check_PROGRAMS)
+
+# Basic test suite for elog interfaces
+check_PROGRAMS += elog_unittest
+elog_unittest_CPPFLAGS = -Igtest $(GTEST_CPPFLAGS)
+elog_unittest_CXXFLAGS = $(PTHREAD_CFLAGS)
+elog_unittest_LDFLAGS = -lgtest_main -lgtest $(PTHREAD_LIBS) $(OESDK_TESTCASE_FLAGS)
+elog_unittest_SOURCES = elog_unittest.cpp
\ No newline at end of file
diff --git a/test/elog_unittest.cpp b/test/elog_unittest.cpp
new file mode 100644
index 0000000..cc14189
--- /dev/null
+++ b/test/elog_unittest.cpp
@@ -0,0 +1,7 @@
+#include <elog.hpp>
+#include <gtest/gtest.h>
+
+// TODO - need to get gtest working in the SDK
+TEST(BasicLog, Zero) {
+    EXPECT_EQ(1, 1);
+}
diff --git a/test/logging_test.cpp b/test/logging_test.cpp
deleted file mode 100644
index 2b75854..0000000
--- a/test/logging_test.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <iostream>
-#include "elog.hpp"
-#include "log.hpp"
-
-using namespace phosphor;
-using namespace logging;
-
-int main()
-{
-    std::cout << "hello world!\n";
-
-    // Simple elog test
-    const char *test_string = "/tmp/test_string/";
-    elog<file_not_found>(file_not_found::errnum(1),
-                         file_not_found::file_path(test_string),
-                         file_not_found::file_name("elog_test_1.txt"));
-
-    log<level::DEBUG>("Info trace to log file path",
-                      entry(file_not_found::file_path::str,
-                            "/tmp/log_file_test/"));
-
-    // pass parameter and previous_entry
-    elog<file_not_found>(file_not_found::errnum(2),
-                         prev_entry<file_not_found::file_path>(),
-                         file_not_found::file_name("elog_test_2.txt"));
-
-    // Simple test to prove we fail to compile due to missing param
-    //elog<file_not_found>(file_not_found::errnum(1),
-    //                     file_not_found::file_path("test"));
-
-    // Simple test to prove we fail to compile due to invalid param
-    //elog<file_not_found>(file_not_found::errnum(1),
-    //                     file_not_found::file_path("test"),
-    //                     file_not_found::file_name(1));
-
-    // Log tests
-    log<level::DEBUG>("Simple Example");
-
-    const char *file_name = "HELLO.txt";
-    int number = 0xFEFE;
-
-    log<level::DEBUG>("THIS IS A PHOSPHOR LOGGING TEST",
-            entry("FILE_NAME=%s_%x", file_name, number));
-
-    return 0;
-}