diff --git a/Makefile.am b/Makefile.am
index 533f423..32fe3ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,9 +46,10 @@
 libsdbusplus_la_SOURCES = \
 	$(LIBSDBUSPLUS_FILES) \
 	$(LIBSDBUPLUS_FILES_TRANSACTION)
-libsdbusplus_la_LIBADD = $(SYSTEMD_LIBS)
+libsdbusplus_la_LIBADD = $(SYSTEMD_LIBS) $(CODE_COVERAGE_LIBS)
 libsdbusplus_la_LDFLAGS = -version-info 1:0:0 -shared
-libsdbusplus_la_CXXFLAGS = $(SYSTEMD_CFLAGS)
+libsdbusplus_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
+libsdbusplus_la_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS) $(SYSTEMD_CFLAGS)
 
 pkgconfiglibdir = ${libdir}/pkgconfig
 pkgconfiglib_DATA = sdbusplus.pc
diff --git a/configure.ac b/configure.ac
index 217e200..a959d31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,18 @@
 AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign dist-xz])
 AM_SILENT_RULES([yes])
 
+# Make sure the default CFLAGS of `-O2 -g` don't override CODE_COVERAGE_CFLAGS
+# It is important that this comes before AC_PROG_C{C,XX}, as we are attempting
+# to stop them from populating default CFLAGS and CXXFLAGS.
+AS_IF([test "x$enable_code_coverage" != "xno"], [
+    AS_IF([test "x${CXXFLAGS+set}" != "xset"], [
+        AC_SUBST(CXXFLAGS, [""])
+    ])
+    AS_IF([test "x${CFLAGS+set}" != "xset"], [
+        AC_SUBST(CFLAGS, [""])
+    ])
+])
+
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
@@ -115,6 +127,10 @@
     AX_RESTORE_FLAGS_WITH_PREFIX(OLD, [LDFLAGS])
 ])
 
+# Code coverage
+AX_CODE_COVERAGE
+AM_EXTRA_RECURSIVE_TARGETS([check-code-coverage])
+
 AC_ARG_ENABLE([oe-sdk],
     AS_HELP_STRING([--enable-oe-sdk], [Link testcases absolutely against OE SDK so they can be ran within it.])
 )
diff --git a/test/Makefile.am b/test/Makefile.am
index 56fefad..5061933 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,11 +1,15 @@
+@CODE_COVERAGE_RULES@
+
 if WANT_LIBSDBUSPLUS
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
-              $(GTEST_CFLAGS) $(SYSTEMD_CFLAGS)
+              $(GTEST_CFLAGS) $(SYSTEMD_CFLAGS) $(CODE_COVERAGE_CPPFLAGS)
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+AM_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
 test_ldadd = $(top_builddir)/libsdbusplus.la $(SYSTEMD_LIBS) \
-             $(OESDK_TESTCASE_FLAGS)
+             $(OESDK_TESTCASE_FLAGS) $(CODE_COVERAGE_LIBS)
 gtest_ldadd = $(test_ldadd) $(GTEST_LIBS) -lgtest_main
-legacy_test_cxxflags = $(PTHREAD_CFLAGS)
+legacy_test_cxxflags = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
 legacy_test_ldadd = $(test_ldadd) $(PTHREAD_LIBS)
 
 check_PROGRAMS =