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
@@ -7,6 +7,7 @@
 #include <consensus/validation.h>
 #include <script/standard.h>
 #include <test/util.h>
+#include <test/util/mining.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
@@ -8,6 +8,7 @@
 #include <node/context.h>
 #include <optional.h>
 #include <test/util.h>
+#include <test/util/mining.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
@@ -47,6 +47,7 @@
 add_library(testutil OBJECT
 	util/blockfilter.cpp
 	util/logging.cpp
+	util/mining.cpp
 	util/setup_common.cpp
 	util/str.cpp
 	util/transaction_utils.cpp
diff --git a/src/test/util.h b/src/test/util.h
--- a/src/test/util.h
+++ b/src/test/util.h
@@ -5,34 +5,20 @@
 #ifndef BITCOIN_TEST_UTIL_H
 #define BITCOIN_TEST_UTIL_H
 
-#include <memory>
 #include <string>
 
-class CBlock;
 class Config;
-class CScript;
-class CTxIn;
 class CWallet;
 
 // Constants //
 
 extern const std::string ADDRESS_BCHREG_UNSPENDABLE;
 
-// Lower-level utils //
-
-/** Returns the generated coin */
-CTxIn MineBlock(const Config &config, const CScript &coinbase_scriptPubKey);
-/** Prepare a block to be mined */
-std::shared_ptr<CBlock> PrepareBlock(const Config &config,
-                                     const CScript &coinbase_scriptPubKey);
-
 // RPC-like //
 
 /** Import the address to the wallet */
 void importaddress(CWallet &wallet, const std::string &address);
 /** Returns a new address from the wallet */
 std::string getnewaddress(const Config &config, CWallet &w);
-/** Returns the generated coin */
-CTxIn generatetoaddress(const Config &config, const std::string &address);
 
 #endif // BITCOIN_TEST_UTIL_H
diff --git a/src/test/util.cpp b/src/test/util.cpp
--- a/src/test/util.cpp
+++ b/src/test/util.cpp
@@ -4,13 +4,8 @@
 
 #include <test/util.h>
 
-#include <chainparams.h>
 #include <config.h>
-#include <consensus/merkle.h>
 #include <key_io.h>
-#include <miner.h>
-#include <pow/pow.h>
-#include <validation.h>
 
 #ifdef ENABLE_WALLET
 #include <wallet/wallet.h>
@@ -46,40 +41,3 @@
     wallet.SetAddressBook(dest, /* label */ "", "receive");
 }
 #endif // ENABLE_WALLET
-
-CTxIn generatetoaddress(const Config &config, const std::string &address) {
-    const auto dest = DecodeDestination(address, config.GetChainParams());
-    assert(IsValidDestination(dest));
-    const auto coinbase_script = GetScriptForDestination(dest);
-
-    return MineBlock(config, coinbase_script);
-}
-
-CTxIn MineBlock(const Config &config, const CScript &coinbase_scriptPubKey) {
-    auto block = PrepareBlock(config, coinbase_scriptPubKey);
-
-    while (!CheckProofOfWork(block->GetHash(), block->nBits,
-                             config.GetChainParams().GetConsensus())) {
-        ++block->nNonce;
-        assert(block->nNonce);
-    }
-
-    bool processed{ProcessNewBlock(config, block, true, nullptr)};
-    assert(processed);
-
-    return CTxIn{block->vtx[0]->GetId(), 0};
-}
-
-std::shared_ptr<CBlock> PrepareBlock(const Config &config,
-                                     const CScript &coinbase_scriptPubKey) {
-    auto block =
-        std::make_shared<CBlock>(BlockAssembler{config, ::g_mempool}
-                                     .CreateNewBlock(coinbase_scriptPubKey)
-                                     ->block);
-
-    LOCK(cs_main);
-    block->nTime = ::ChainActive().Tip()->GetMedianTimePast() + 1;
-    block->hashMerkleRoot = BlockMerkleRoot(*block);
-
-    return block;
-}
diff --git a/src/test/util.h b/src/test/util/mining.h
copy from src/test/util.h
copy to src/test/util/mining.h
--- a/src/test/util.h
+++ b/src/test/util/mining.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_MINING_H
+#define BITCOIN_TEST_UTIL_MINING_H
 
 #include <memory>
 #include <string>
@@ -12,27 +12,15 @@
 class Config;
 class CScript;
 class CTxIn;
-class CWallet;
-
-// Constants //
-
-extern const std::string ADDRESS_BCHREG_UNSPENDABLE;
-
-// Lower-level utils //
 
 /** Returns the generated coin */
 CTxIn MineBlock(const Config &config, const CScript &coinbase_scriptPubKey);
+
 /** Prepare a block to be mined */
 std::shared_ptr<CBlock> PrepareBlock(const Config &config,
                                      const CScript &coinbase_scriptPubKey);
 
-// RPC-like //
-
-/** Import the address to the wallet */
-void importaddress(CWallet &wallet, const std::string &address);
-/** Returns a new address from the wallet */
-std::string getnewaddress(const Config &config, CWallet &w);
-/** Returns the generated coin */
+/** RPC-like helper function, returns the generated coin */
 CTxIn generatetoaddress(const Config &config, const std::string &address);
 
-#endif // BITCOIN_TEST_UTIL_H
+#endif // BITCOIN_TEST_UTIL_MINING_H
diff --git a/src/test/util.cpp b/src/test/util/mining.cpp
copy from src/test/util.cpp
copy to src/test/util/mining.cpp
--- a/src/test/util.cpp
+++ b/src/test/util/mining.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/mining.h>
 
 #include <chainparams.h>
 #include <config.h>
@@ -10,43 +10,12 @@
 #include <key_io.h>
 #include <miner.h>
 #include <pow/pow.h>
+#include <script/standard.h>
 #include <validation.h>
 
-#ifdef ENABLE_WALLET
-#include <wallet/wallet.h>
-#endif // ENABLE_WALLET
-
 const std::string ADDRESS_BCHREG_UNSPENDABLE =
     "bchreg:qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqha9s37tt";
 
-#ifdef ENABLE_WALLET
-std::string getnewaddress(const Config &config, CWallet &w) {
-    constexpr auto output_type = OutputType::LEGACY;
-    CTxDestination dest;
-    std::string error;
-    if (!w.GetNewDestination(output_type, "", dest, error)) {
-        assert(false);
-    }
-
-    return EncodeDestination(dest, config);
-}
-
-void importaddress(CWallet &wallet, const std::string &address) {
-    auto spk_man = wallet.GetLegacyScriptPubKeyMan();
-    LOCK(wallet.cs_wallet);
-    AssertLockHeld(spk_man->cs_wallet);
-    const auto dest = DecodeDestination(address, wallet.chainParams);
-    assert(IsValidDestination(dest));
-    const auto script = GetScriptForDestination(dest);
-    wallet.MarkDirty();
-    assert(!spk_man->HaveWatchOnly(script));
-    if (!spk_man->AddWatchOnly(script, 0 /* nCreateTime */)) {
-        assert(false);
-    }
-    wallet.SetAddressBook(dest, /* label */ "", "receive");
-}
-#endif // ENABLE_WALLET
-
 CTxIn generatetoaddress(const Config &config, const std::string &address) {
     const auto dest = DecodeDestination(address, config.GetChainParams());
     assert(IsValidDestination(dest));