diff --git a/Makefile.am b/Makefile.am
index 1f7a69866..fe99852c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,8 @@ CODE_COVERAGE_HTML = coverage.html
 CODE_COVERAGE_DIRS = \
 	src/common src/knot src/libknot \
 	src/knot/conf \
-	src/zscanner
+	src/zscanner \
+	dnssec/lib dnssec/shared
 
 code_coverage_quiet = --quiet
 
diff --git a/dnssec/Makefile.am b/dnssec/Makefile.am
index c3926b557..fefe9f09f 100644
--- a/dnssec/Makefile.am
+++ b/dnssec/Makefile.am
@@ -3,14 +3,18 @@ SUBDIRS = . utils tests
 AM_CPPFLAGS = \
 	-include $(top_builddir)/src/config.h \
 	-Ishared -Ilib -Ilib/dnssec \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(gnutls_CFLAGS) \
 	$(jannson_CFLAGS)
 
+AM_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS)
+
 noinst_LTLIBRARIES = libshared.la
 lib_LTLIBRARIES = libdnssec.la
 
-libshared_la_CFLAGS = \
-	$(AM_CFLAGS)
+libshared_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)
 
 libshared_la_SOURCES = \
 	shared/dname.c \
@@ -25,8 +29,8 @@ libshared_la_SOURCES = \
 	shared/strtonum.h \
 	shared/wire.h
 
-libdnssec_la_CFLAGS = \
-	$(AM_CFLAGS) \
+libdnssec_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
 	-fvisibility=hidden
 
 libdnssec_la_LDFLAGS = \
diff --git a/dnssec/tests/Makefile.am b/dnssec/tests/Makefile.am
index f1d7517f5..f801267a2 100644
--- a/dnssec/tests/Makefile.am
+++ b/dnssec/tests/Makefile.am
@@ -2,9 +2,11 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libtap \
 	-I$(srcdir)/../shared \
 	-I$(srcdir)/../lib \
-	-I$(srcdir)/../lib/dnssec
+	-I$(srcdir)/../lib/dnssec \
+	$(CODE_COVERAGE_CFLAGS)
 
 AM_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
 	-static
 
 LDADD = \
diff --git a/dnssec/utils/Makefile.am b/dnssec/utils/Makefile.am
index 25e6745d5..9c06c1633 100644
--- a/dnssec/utils/Makefile.am
+++ b/dnssec/utils/Makefile.am
@@ -1,18 +1,22 @@
 noinst_LTLIBRARIES = libutils.la
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
 	-include $(top_builddir)/src/config.h \
 	-I$(srcdir)/../shared \
 	-I$(srcdir)/../lib/dnssec \
-	-I$(srcdir)/../lib
+	-I$(srcdir)/../lib \
+	$(CODE_COVERAGE_CFLAGS)
+
+AM_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS)
 
 libutils_la_LIBADD = \
 	$(builddir)/../libshared.la \
 	$(builddir)/../libdnssec.la \
 	$(top_builddir)/src/zscanner/libzscanner.la
 
-libutils_la_CFLAGS = \
-	$(AM_CFLAGS) \
+libutils_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
 	-I$(top_srcdir)/src/zscanner
 
 libutils_la_SOURCES = \