diff --git a/Makefile.am b/Makefile.am
index 2828e6f..ef1bf14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,6 +78,13 @@
 	sensordatahandler.cpp \
 	$(libapphandler_BUILT_LIST)
 
+@CODE_COVERAGE_RULES@
+
+check_PROGRAMS =
+XFAIL_TESTS =
+
+TESTS = $(check_PROGRAMS)
+
 libapphandler_la_LDFLAGS = $(SYSTEMD_LIBS) $(libmapper_LIBS) $(PHOSPHOR_LOGGING_LIBS) $(PHOSPHOR_DBUS_INTERFACES_LIBS) -lstdc++fs -version-info 0:0:0 -shared
 libapphandler_la_CXXFLAGS = $(SYSTEMD_CFLAGS) $(libmapper_CFLAGS) $(PHOSPHOR_LOGGING_CFLAGS) $(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
 
diff --git a/configure.ac b/configure.ac
index ac42e1d..9007582 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,9 @@
     AC_SUBST([OESDK_TESTCASE_FLAGS], [$testcase_flags])
 )
 
+# Add code coverage tool
+AX_CODE_COVERAGE
+
 AC_ARG_VAR(WHITELIST_CONF, [Paths to IPMI whitelisted commands conf files. (default = ${srcdir}/host-ipmid-whitelist.conf)])
 if test -z "$WHITELIST_CONF"; then
         WHITELIST_CONF=${srcdir}/host-ipmid-whitelist.conf
diff --git a/test/Makefile.am b/test/Makefile.am
index 75658aa..cb5640e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,13 +1,16 @@
-AM_CPPFLAGS = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir) $(CODE_COVERAGE_CPPFLAGS)
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
 check_PROGRAMS =
 
 # Run all 'check' test programs
 TESTS = $(check_PROGRAMS)
 
 # Build/add sample_unittest to test suite
-check_PROGRAMS += sample_unittest
 sample_unittest_CPPFLAGS = -Igtest $(GTEST_CPPFLAGS) $(AM_CPPFLAGS)
-sample_unittest_CXXFLAGS = $(PTHREAD_CFLAGS)
-sample_unittest_LDFLAGS = -lgtest_main -lgtest $(PTHREAD_LIBS) $(OESDK_TESTCASE_FLAGS)
-sample_unittest_SOURCES = sample_unittest.cpp
+sample_unittest_CXXFLAGS = $(PTHREAD_CFLAGS) $(CODE_COVERAGE_CXXFLAGS) \
+			   $(CODE_COVERAGE_CFLAGS)
+sample_unittest_LDFLAGS = -lgtest_main -lgtest $(PTHREAD_LIBS) $(OESDK_TESTCASE_FLAGS) \
+   			$(CODE_COVERAGE_LDFLAGS)
+sample_unittest_SOURCES = %reldir%/sample_unittest.cpp
 sample_unittest_LDADD = $(top_builddir)/sample.o
+check_PROGRAMS += %reldir%/sample_unittest