diff --git a/configure.ac b/configure.ac
index b95dc93..59cf5ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,11 +22,12 @@
     AC_MSG_ERROR(["Requires sdbusplus package."]))
 PKG_CHECK_MODULES([PHOSPHOR_LOGGING], [phosphor-logging],,\
     AC_MSG_ERROR(["Requires phosphor-logging package."]))
+AX_PTHREAD([], [AC_MSG_ERROR(["pthread required and not found"])])
 
-# gtest
 # Check/set gtest specific functions.
-AX_PTHREAD([GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1"],[GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0"])
-AC_SUBST(GTEST_CPPFLAGS)
+PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_NOTICE([gtest not found, tests will not build])])
+PKG_CHECK_MODULES([GMOCK], [gmock], [], [AC_MSG_NOTICE([gmock not found, tests will not build])])
+PKG_CHECK_MODULES([GTEST_MAIN], [gtest_main], [], [AC_MSG_NOTICE([gtest_main not found, tests will not build])])
 
 # Test cases require SDK so only build if we're told to (and SDK is available)
 AC_ARG_ENABLE([oe-sdk],
diff --git a/test/Makefile.am b/test/Makefile.am
index 3071c72..0c14421 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -15,14 +15,16 @@
 test_LDADD = $(top_builddir)/libtimemanager.la
 
 test_CPPFLAGS = $(GTEST_CPPFLAGS) \
+                $(GMOCK_CFLAGS) \
+                $(GTEST_MAIN_CFLAGS) \
                 $(AM_CPPFLAGS)
 
 test_CXXFLAGS = $(PTHREAD_CFLAGS) \
                 $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
                 $(SDBUSPLUS_CFLAGS)
 
-test_LDFLAGS = -lgmock_main \
-               -lgmock \
+test_LDFLAGS = $(GMOCK_LIBS) \
+               $(GTEST_MAIN_LIBS) \
                $(PTHREAD_LIBS) \
                $(OESDK_TESTCASE_FLAGS)