diff --git a/test/Makefile.am b/test/Makefile.am
index 2a51c00..7fdbaf5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,12 +1,11 @@
 AM_CPPFLAGS = -I$(top_srcdir)/ $(GTEST_CFLAGS) $(GMOCK_CFLAGS)
-AM_CXXFLAGS = $(PTHREAD_CFLAGS) \
-	$(GTEST_CFLAGS) \
-	$(GMOCK_CFLAGS) \
+AM_CXXFLAGS = \
+	$(GTEST_MAIN_CFLAGS) \
 	$(SDBUSPLUS_CFLAGS) \
 	$(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
-AM_LDFLAGS = $(GTEST_LIBS) \
-	$(PTHREAD_LIBS) \
+AM_LDFLAGS = \
 	$(GMOCK_LIBS) \
+	$(GTEST_MAIN_LIBS) \
 	$(OESDK_TESTCASE_FLAGS) \
 	$(SDBUSPLUS_LIBS) \
 	$(PHOSPHOR_DBUS_INTERFACES_LIBS)