diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index 4358c2eba..dd5fc223e 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -1,91 +1,93 @@
 # Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 bin_PROGRAMS += bench/bench_bitcoin
 BENCH_SRCDIR = bench
 BENCH_BINARY = bench/bench_bitcoin$(EXEEXT)
 
 RAW_BENCH_FILES = \
   bench/data/block413567.raw
 GENERATED_BENCH_FILES = $(RAW_BENCH_FILES:.raw=.raw.h)
 
 bench_bench_bitcoin_SOURCES = \
   $(RAW_BENCH_FILES) \
   bench/bench_bitcoin.cpp \
   bench/bench.cpp \
   bench/bench.h \
   bench/block_assemble.cpp \
   bench/cashaddr.cpp \
   bench/checkblock.cpp \
   bench/checkqueue.cpp \
   bench/duplicate_inputs.cpp \
   bench/examples.cpp \
   bench/rollingbloom.cpp \
   bench/crypto_aes.cpp \
   bench/crypto_hash.cpp \
   bench/ccoins_caching.cpp \
   bench/gcs_filter.cpp \
   bench/merkle_root.cpp \
   bench/mempool_eviction.cpp \
   bench/rpc_mempool.cpp \
   bench/util_time.cpp \
   bench/base58.cpp \
   bench/lockedpool.cpp \
   bench/prevector.cpp \
   test/setup_common.h \
-  test/setup_common.cpp
+  test/setup_common.cpp \
+  test/util.h \
+  test/util.cpp
 
 nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_BENCH_FILES)
 
 bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
 bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 bench_bench_bitcoin_LDADD = \
   $(LIBBITCOIN_SERVER) \
   $(LIBBITCOIN_WALLET) \
   $(LIBBITCOIN_SERVER) \
   $(LIBBITCOIN_COMMON) \
   $(LIBBITCOIN_UTIL) \
   $(LIBBITCOIN_CONSENSUS) \
   $(LIBBITCOIN_CRYPTO) \
   $(LIBLEVELDB) \
   $(LIBLEVELDB_SSE42) \
   $(LIBMEMENV) \
   $(LIBSECP256K1) \
   $(LIBUNIVALUE) \
   $(EVENT_PTHREADS_LIBS) \
   $(EVENT_LIBS)
 
 if ENABLE_ZMQ
 bench_bench_bitcoin_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
 endif
 
 if ENABLE_WALLET
 bench_bench_bitcoin_SOURCES += bench/coin_selection.cpp
 endif
 
 bench_bench_bitcoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
 bench_bench_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 
 CLEAN_BITCOIN_BENCH = bench/*.gcda bench/*.gcno $(GENERATED_BENCH_FILES)
 
 CLEANFILES += $(CLEAN_BITCOIN_BENCH)
 
 bench/checkblock.cpp: bench/data/block413567.raw.h
 
 bitcoin_bench: $(BENCH_BINARY)
 
 bench: $(BENCH_BINARY) FORCE
 	$(BENCH_BINARY)
 
 bitcoin_bench_clean : FORCE
 	rm -f $(CLEAN_BITCOIN_BENCH) $(bench_bench_bitcoin_OBJECTS) $(BENCH_BINARY)
 
 %.raw.h: %.raw
 	@$(MKDIR_P) $(@D)
 	@{ \
 	 echo "static unsigned const char $(*F)[] = {" && \
 	 $(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' && \
 	 echo "};"; \
 	} > "$@.new" && mv -f "$@.new" "$@"
 	@echo "Generated $@"
diff --git a/src/bench/CMakeLists.txt b/src/bench/CMakeLists.txt
index 454c1a1c7..a702879ba 100644
--- a/src/bench/CMakeLists.txt
+++ b/src/bench/CMakeLists.txt
@@ -1,72 +1,74 @@
 # Copyright (c) 2018 The Bitcoin developers
 
 project(bitcoin-bench)
 
 set(BENCH_DATA_RAW_FILES
 	data/block413567.raw
 )
 
 # Process raw files.
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/data")
 
 foreach(_raw_file ${BENCH_DATA_RAW_FILES})
 	string(APPEND
 		_generated_header_output
 		"${CMAKE_CURRENT_BINARY_DIR}/${_raw_file}" ".h"
 	)
 
 	list(APPEND BENCH_DATA_GENERATED_HEADERS ${_generated_header_output})
 	get_filename_component(_test_name ${_raw_file} NAME_WE)
 
 	add_custom_command(
 		OUTPUT "${_generated_header_output}"
 		COMMAND
 			"${Python_EXECUTABLE}"
 			"data/convert-raw-to-header.py"
 			"${_test_name}"
 			"${_raw_file}" > "${_generated_header_output}"
 		COMMENT "Transforming raw file ${_raw_file} into header"
 		MAIN_DEPEDENCY "${_raw_file}"
 		DEPENDS "data/convert-raw-to-header.py"
 		VERBATIM
 		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
 	)
 endforeach()
 
 add_executable(bitcoin-bench
 	base58.cpp
 	bench.cpp
 	bench_bitcoin.cpp
 	block_assemble.cpp
 	cashaddr.cpp
 	ccoins_caching.cpp
 	checkblock.cpp
 	checkqueue.cpp
 	crypto_aes.cpp
 	crypto_hash.cpp
 	duplicate_inputs.cpp
 	examples.cpp
 	gcs_filter.cpp
 	lockedpool.cpp
 	mempool_eviction.cpp
 	merkle_root.cpp
 	prevector.cpp
 	rollingbloom.cpp
 	rpc_mempool.cpp
 	util_time.cpp
 
 	# TODO: make a test library
 	../test/setup_common.cpp
+	../test/util.cpp
+
 
 	# Add the generated headers to trigger the conversion command
 	${BENCH_DATA_GENERATED_HEADERS}
 )
 
 target_link_libraries(bitcoin-bench common bitcoinconsensus server)
 
 if(BUILD_BITCOIN_WALLET)
 	target_sources(bitcoin-bench PRIVATE coin_selection.cpp)
 	target_link_libraries(bitcoin-bench wallet)
 endif()
 
 add_custom_target(bench-bitcoin COMMAND bitcoin-bench USES_TERMINAL)
diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp
index 2321b7f62..9cb27cc09 100644
--- a/src/bench/block_assemble.cpp
+++ b/src/bench/block_assemble.cpp
@@ -1,91 +1,59 @@
 // Copyright (c) 2011-2017 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <chainparams.h>
 #include <config.h>
-#include <consensus/merkle.h>
 #include <consensus/validation.h>
-#include <miner.h>
-#include <policy/policy.h>
-#include <pow.h>
+#include <script/standard.h>
+#include <test/util.h>
 #include <txmempool.h>
 #include <validation.h>
 
 #include <vector>
 
-static 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);
-
-    block->nTime = ::ChainActive().Tip()->GetMedianTimePast() + 1;
-    block->hashMerkleRoot = BlockMerkleRoot(*block);
-
-    return block;
-}
-
-static 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};
-}
-
 static void AssembleBlock(benchmark::State &state) {
     const Config &config = GetConfig();
 
     const CScript redeemScript = CScript() << OP_DROP << OP_TRUE;
     const CScript SCRIPT_PUB =
         CScript() << OP_HASH160 << ToByteVector(CScriptID(redeemScript))
                   << OP_EQUAL;
 
     const CScript scriptSig = CScript() << std::vector<uint8_t>(100, 0xff)
                                         << ToByteVector(redeemScript);
 
     // Collect some loose transactions that spend the coinbases of our mined
     // blocks
     constexpr size_t NUM_BLOCKS{200};
     std::array<CTransactionRef, NUM_BLOCKS - COINBASE_MATURITY + 1> txs;
     for (size_t b = 0; b < NUM_BLOCKS; ++b) {
         CMutableTransaction tx;
         tx.vin.push_back(MineBlock(config, SCRIPT_PUB));
         tx.vin.back().scriptSig = scriptSig;
         tx.vout.emplace_back(1337 * SATOSHI, SCRIPT_PUB);
         if (NUM_BLOCKS - b >= COINBASE_MATURITY) {
             txs.at(b) = MakeTransactionRef(tx);
         }
     }
 
     {
         // Required for ::AcceptToMemoryPool.
         LOCK(::cs_main);
 
         for (const auto &txr : txs) {
             CValidationState vstate;
             bool ret{::AcceptToMemoryPool(config, ::g_mempool, vstate, txr,
                                           nullptr /* pfMissingInputs */,
                                           false /* bypass_limits */,
                                           /* nAbsurdFee */ Amount::zero())};
             assert(ret);
         }
     }
 
     while (state.KeepRunning()) {
         PrepareBlock(config, SCRIPT_PUB);
     }
 }
 
 BENCHMARK(AssembleBlock, 700);
diff --git a/src/test/util.cpp b/src/test/util.cpp
new file mode 100644
index 000000000..fbae302da
--- /dev/null
+++ b/src/test/util.cpp
@@ -0,0 +1,40 @@
+// Copyright (c) 2019 The Bitcoin Core developers
+// 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 <chainparams.h>
+#include <config.h>
+#include <consensus/merkle.h>
+#include <miner.h>
+#include <pow.h>
+#include <validation.h>
+
+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);
+
+    block->nTime = ::ChainActive().Tip()->GetMedianTimePast() + 1;
+    block->hashMerkleRoot = BlockMerkleRoot(*block);
+
+    return block;
+}
diff --git a/src/test/util.h b/src/test/util.h
new file mode 100644
index 000000000..6d35ea3f3
--- /dev/null
+++ b/src/test/util.h
@@ -0,0 +1,24 @@
+// Copyright (c) 2019 The Bitcoin Core developers
+// 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
+
+#include <memory>
+
+class CBlock;
+class Config;
+class CScript;
+class CTxIn;
+class CWallet;
+
+// 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);
+
+#endif // BITCOIN_TEST_UTIL_H