diff --git a/Makefile.am b/Makefile.am
index 2b584b039..9e146d836 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,6 +158,8 @@ baseline_filtered.info: baseline.info
                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
                       "$(abs_builddir)/src/gtest/*" \
                       "$(abs_builddir)/src/test/*" \
+                      "$(abs_builddir)/src/wallet/gtest/*" \
+                      "$(abs_builddir)/src/wallet/test/*" \
                       -o $@
 
 leveldb_baseline.info: baseline_filtered.info
@@ -171,6 +173,8 @@ leveldb_baseline_filtered.info: leveldb_baseline.info
                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
                       "$(abs_builddir)/src/gtest/*" \
                       "$(abs_builddir)/src/test/*" \
+                      "$(abs_builddir)/src/wallet/gtest/*" \
+                      "$(abs_builddir)/src/wallet/test/*" \
                       -o $@
 
 baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
@@ -190,6 +194,8 @@ test_bitcoin_filtered.info: test_bitcoin.info
                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
                       "$(abs_builddir)/src/gtest/*" \
                       "$(abs_builddir)/src/test/*" \
+                      "$(abs_builddir)/src/wallet/gtest/*" \
+                      "$(abs_builddir)/src/wallet/test/*" \
                       -o $@
 
 zcash-gtest.info: baseline_filtered_combined.info
@@ -206,6 +212,8 @@ zcash-gtest_filtered.info: zcash-gtest.info
                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
                       "$(abs_builddir)/src/gtest/*" \
                       "$(abs_builddir)/src/test/*" \
+                      "$(abs_builddir)/src/wallet/gtest/*" \
+                      "$(abs_builddir)/src/wallet/test/*" \
                       -o $@
 
 block_test.info: test_bitcoin_filtered.info
@@ -223,6 +231,8 @@ block_test_filtered.info: block_test.info
                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
                       "$(abs_builddir)/src/gtest/*" \
                       "$(abs_builddir)/src/test/*" \
+                      "$(abs_builddir)/src/wallet/gtest/*" \
+                      "$(abs_builddir)/src/wallet/test/*" \
                       -o $@
 
 test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
diff --git a/src/Makefile.am b/src/Makefile.am
index 78684a4eb..f18071678 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -483,7 +483,7 @@ libzcashconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCO
 endif
 #
 
-CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno
+CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno */*.gcno wallet/*/*.gcno
 
 DISTCLEANFILES = obj/build.h