diff --git a/src/bench/CMakeLists.txt b/src/bench/CMakeLists.txt
--- a/src/bench/CMakeLists.txt
+++ b/src/bench/CMakeLists.txt
@@ -59,9 +59,6 @@
 
 	# Add the generated headers to trigger the conversion command
 	${BENCH_DATA_GENERATED_HEADERS}
-
-	# Testing related utilities
-	../test/util.cpp
 )
 
 target_link_libraries(bitcoin-bench testutil)
diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp
--- a/src/bench/block_assemble.cpp
+++ b/src/bench/block_assemble.cpp
@@ -6,8 +6,8 @@
 #include <config.h>
 #include <consensus/validation.h>
 #include <script/standard.h>
-#include <test/util.h>
 #include <test/util/mining.h>
+#include <test/util/wallet.h>
 #include <txmempool.h>
 #include <validation.h>
 
diff --git a/src/bench/wallet_balance.cpp b/src/bench/wallet_balance.cpp
--- a/src/bench/wallet_balance.cpp
+++ b/src/bench/wallet_balance.cpp
@@ -7,8 +7,8 @@
 #include <interfaces/chain.h>
 #include <node/context.h>
 #include <optional.h>
-#include <test/util.h>
 #include <test/util/mining.h>
+#include <test/util/wallet.h>
 #include <validationinterface.h>
 #include <wallet/wallet.h>
 
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -51,6 +51,7 @@
 	util/setup_common.cpp
 	util/str.cpp
 	util/transaction_utils.cpp
+	util/wallet.cpp
 )
 
 target_link_libraries(testutil server)
diff --git a/src/test/util.h b/src/test/util/wallet.h
rename from src/test/util.h
rename to src/test/util/wallet.h
--- a/src/test/util.h
+++ b/src/test/util/wallet.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_TEST_UTIL_H
-#define BITCOIN_TEST_UTIL_H
+#ifndef BITCOIN_TEST_UTIL_WALLET_H
+#define BITCOIN_TEST_UTIL_WALLET_H
 
 #include <string>
 
@@ -21,4 +21,4 @@
 /** Returns a new address from the wallet */
 std::string getnewaddress(const Config &config, CWallet &w);
 
-#endif // BITCOIN_TEST_UTIL_H
+#endif // BITCOIN_TEST_UTIL_WALLET_H
diff --git a/src/test/util.cpp b/src/test/util/wallet.cpp
rename from src/test/util.cpp
rename to src/test/util/wallet.cpp
--- a/src/test/util.cpp
+++ b/src/test/util/wallet.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <test/util.h>
+#include <test/util/wallet.h>
 
 #include <config.h>
 #include <key_io.h>