diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -43,6 +43,21 @@
 create_test_suite(bitcoin)
 add_dependencies(check check-bitcoin)
 
+if(BUILD_BITCOIN_WALLET)
+	set(BITCOIN_WALLET_TEST_FIXTURE
+		../wallet/test/wallet_test_fixture.cpp
+	)
+	set(BITCOIN_WALLET_TESTS
+		../wallet/test/accounting_tests.cpp
+		../wallet/test/db_tests.cpp
+		../wallet/test/coinselector_tests.cpp
+		../wallet/test/psbt_wallet_tests.cpp
+		../wallet/test/wallet_tests.cpp
+		../wallet/test/walletdb_tests.cpp
+		../wallet/test/wallet_crypto_tests.cpp
+	)
+endif()
+
 add_boost_unit_tests_to_suite(bitcoin test_bitcoin
 	jsonutil.cpp
 	scriptflags.cpp
@@ -53,6 +68,9 @@
 	# Tests generated from JSON
 	${JSON_HEADERS}
 
+	# Wallet test fixture
+	${BITCOIN_WALLET_TEST_FIXTURE}
+
 	TESTS
 		activation_tests.cpp
 		addrman_tests.cpp
@@ -153,6 +171,9 @@
 
 		# RPC Tests
 		../rpc/test/server_tests.cpp
+
+		# Wallet tests
+		${BITCOIN_WALLET_TESTS}
 )
 
 target_link_libraries(test_bitcoin rpcclient server)
@@ -162,20 +183,6 @@
 	target_link_libraries(test_bitcoin bitcoinconsensus)
 endif()
 
-if(BUILD_BITCOIN_WALLET)
-	target_sources(test_bitcoin
-		PRIVATE
-			../wallet/test/accounting_tests.cpp
-			../wallet/test/db_tests.cpp
-			../wallet/test/coinselector_tests.cpp
-			../wallet/test/psbt_wallet_tests.cpp
-			../wallet/test/wallet_test_fixture.cpp
-			../wallet/test/wallet_tests.cpp
-			../wallet/test/walletdb_tests.cpp
-			../wallet/test/wallet_crypto_tests.cpp
-	)
-endif()
-
 add_executable(test_bitcoin_fuzzy EXCLUDE_FROM_ALL
 	test_bitcoin_fuzzy.cpp
 )