diff --git a/doc/unit-tests.md b/doc/unit-tests.md
--- a/doc/unit-tests.md
+++ b/doc/unit-tests.md
@@ -53,13 +53,13 @@
 ### Note on adding test cases
 
 The build system is setup to compile an executable called `test_bitcoin`
-that runs all of the unit tests.  The main source file is called
-setup_common.cpp. To add a new unit test file to our test suite you need
-to add the file to `src/test/CMakeLists.txt`. The pattern is to create
-one test file for each class or source file for which you want to create
-unit tests.  The file naming convention is `<source_filename>_tests.cpp`
-and such files should wrap their tests in a test suite
-called `<source_filename>_tests`. For an example of this pattern,
+that runs all of the unit tests. The main source file for the test library
+is found in `util/setup_common.cpp`. To add a new unit test file to our
+test suite you need to add the file to `src/test/CMakeLists.txt`.
+The pattern is to create one test file for each class or source file for
+which you want to create unit tests.  The file naming convention is
+`<source_filename>_tests.cpp` and such files should wrap their tests in
+a test suite called `<source_filename>_tests`. For an example of this pattern,
 examine `uint256_tests.cpp`.
 
 For further reading, I found the following website to be helpful in
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -36,8 +36,8 @@
   bench/base58.cpp \
   bench/lockedpool.cpp \
   bench/prevector.cpp \
-  test/setup_common.h \
-  test/setup_common.cpp \
+  test/util/setup_common.h \
+  test/util/setup_common.cpp \
   test/util.h \
   test/util.cpp
 
diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include
--- a/src/Makefile.qttest.include
+++ b/src/Makefile.qttest.include
@@ -37,10 +37,10 @@
   qt/test/wallettests.h
 
 TEST_BITCOIN_CPP = \
-  test/setup_common.cpp
+  test/util/setup_common.cpp
 
 TEST_BITCOIN_H = \
-  test/setup_common.h
+  test/util/setup_common.h
 
 qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
   $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS)
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -52,21 +52,21 @@
 
 BITCOIN_TEST_SUITE = \
   test/jsonutil.cpp \
-  test/lib/blockfilter.cpp \
-  test/lib/blockfilter.h \
-  test/lib/logging.cpp \
-  test/lib/logging.h \
-  test/lib/transaction_utils.cpp \
-  test/lib/transaction_utils.h \
+  test/util/blockfilter.cpp \
+  test/util/blockfilter.h \
+  test/util/logging.cpp \
+  test/util/logging.h \
+  test/util/transaction_utils.cpp \
+  test/util/transaction_utils.h \
   test/main.cpp \
   test/scriptflags.cpp \
   test/sigutil.cpp \
-  test/setup_common.h \
-  test/setup_common.cpp
+  test/util/setup_common.h \
+  test/util/setup_common.cpp
 
 FUZZ_SUITE = \
-  test/setup_common.cpp \
-  test/setup_common.h \
+  test/util/setup_common.cpp \
+  test/util/setup_common.h \
   test/fuzz/fuzz.cpp \
   test/fuzz/fuzz.h
 
diff --git a/src/bench/CMakeLists.txt b/src/bench/CMakeLists.txt
--- a/src/bench/CMakeLists.txt
+++ b/src/bench/CMakeLists.txt
@@ -58,7 +58,7 @@
 	util_time.cpp
 
 	# TODO: make a test library
-	../test/setup_common.cpp
+	../test/util/setup_common.cpp
 	../test/util.cpp
 
 
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -7,7 +7,7 @@
 #include <chainparams.h>
 #include <validation.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/qt/test/CMakeLists.txt b/src/qt/test/CMakeLists.txt
--- a/src/qt/test/CMakeLists.txt
+++ b/src/qt/test/CMakeLists.txt
@@ -17,7 +17,7 @@
 	util.cpp
 
 	# Test framework
-	../../test/setup_common.cpp
+	../../test/util/setup_common.cpp
 )
 
 target_link_libraries(test_bitcoin-qt bitcoin-qt-base Qt5::Test)
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp
--- a/src/qt/test/addressbooktests.cpp
+++ b/src/qt/test/addressbooktests.cpp
@@ -1,5 +1,5 @@
 #include <qt/test/addressbooktests.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <interfaces/chain.h>
 #include <interfaces/node.h>
diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp
--- a/src/qt/test/apptests.cpp
+++ b/src/qt/test/apptests.cpp
@@ -20,7 +20,7 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <univalue.h>
 
diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp
--- a/src/qt/test/paymentservertests.cpp
+++ b/src/qt/test/paymentservertests.cpp
@@ -13,7 +13,7 @@
 #include <script/standard.h>
 #include <util/strencodings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <openssl/x509.h>
 #include <openssl/x509_vfy.h>
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -10,7 +10,7 @@
 #include <rpc/server.h>
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <univalue.h>
 
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -25,7 +25,7 @@
 #include <qt/test/wallettests.h>
 #endif // ENABLE_WALLET
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <QApplication>
 #include <QObject>
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -22,7 +22,7 @@
 #include <validation.h>
 #include <wallet/wallet.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <QAbstractButton>
 #include <QApplication>
diff --git a/src/rpc/test/server_tests.cpp b/src/rpc/test/server_tests.cpp
--- a/src/rpc/test/server_tests.cpp
+++ b/src/rpc/test/server_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <rpc/server.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 #include <util/system.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -74,13 +74,13 @@
 
 add_boost_unit_tests_to_suite(bitcoin test_bitcoin
 	jsonutil.cpp
-	lib/blockfilter.cpp
-	lib/logging.cpp
-	lib/transaction_utils.cpp
+	util/blockfilter.cpp
+	util/logging.cpp
+	util/setup_common.cpp
+	util/transaction_utils.cpp
 	main.cpp
 	scriptflags.cpp
 	sigutil.cpp
-	setup_common.cpp
 
 	# Tests generated from JSON
 	${JSON_HEADERS}
diff --git a/src/test/activation_tests.cpp b/src/test/activation_tests.cpp
--- a/src/test/activation_tests.cpp
+++ b/src/test/activation_tests.cpp
@@ -7,7 +7,7 @@
 #include <consensus/activation.h>
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -7,7 +7,7 @@
 #include <netbase.h>
 #include <random.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp
--- a/src/test/allocator_tests.cpp
+++ b/src/test/allocator_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp
--- a/src/test/amount_tests.cpp
+++ b/src/test/amount_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <amount.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/arith_uint256_tests.cpp b/src/test/arith_uint256_tests.cpp
--- a/src/test/arith_uint256_tests.cpp
+++ b/src/test/arith_uint256_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <uint256.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/avalanche_tests.cpp b/src/test/avalanche_tests.cpp
--- a/src/test/avalanche_tests.cpp
+++ b/src/test/avalanche_tests.cpp
@@ -7,7 +7,7 @@
 #include <config.h>
 #include <net_processing.h> // For PeerLogicValidation
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/base32_tests.cpp b/src/test/base32_tests.cpp
--- a/src/test/base32_tests.cpp
+++ b/src/test/base32_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <util/strencodings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <base58.h>
 #include <test/jsonutil.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 #include <util/strencodings.h>
 
 #include <univalue.h>
diff --git a/src/test/base64_tests.cpp b/src/test/base64_tests.cpp
--- a/src/test/base64_tests.cpp
+++ b/src/test/base64_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <util/strencodings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp
--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@@ -9,7 +9,7 @@
 #include <util/strencodings.h>
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/bitmanip_tests.cpp b/src/test/bitmanip_tests.cpp
--- a/src/test/bitmanip_tests.cpp
+++ b/src/test/bitmanip_tests.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/setup_common.h>
+#include <test/util/setup_common.h>
 #include <util/bitmanip.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/blockchain_tests.cpp b/src/test/blockchain_tests.cpp
--- a/src/test/blockchain_tests.cpp
+++ b/src/test/blockchain_tests.cpp
@@ -2,7 +2,7 @@
 
 #include <chain.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/blockcheck_tests.cpp b/src/test/blockcheck_tests.cpp
--- a/src/test/blockcheck_tests.cpp
+++ b/src/test/blockcheck_tests.cpp
@@ -8,7 +8,7 @@
 #include <consensus/validation.h>
 #include <validation.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
--- a/src/test/blockencodings_tests.cpp
+++ b/src/test/blockencodings_tests.cpp
@@ -11,7 +11,7 @@
 #include <streams.h>
 #include <txmempool.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/blockfilter_index_tests.cpp b/src/test/blockfilter_index_tests.cpp
--- a/src/test/blockfilter_index_tests.cpp
+++ b/src/test/blockfilter_index_tests.cpp
@@ -10,8 +10,8 @@
 #include <miner.h>
 #include <pow.h>
 #include <script/standard.h>
-#include <test/lib/blockfilter.h>
-#include <test/setup_common.h>
+#include <test/util/blockfilter.h>
+#include <test/util/setup_common.h>
 #include <validation.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/blockfilter_tests.cpp b/src/test/blockfilter_tests.cpp
--- a/src/test/blockfilter_tests.cpp
+++ b/src/test/blockfilter_tests.cpp
@@ -10,7 +10,7 @@
 #include <util/strencodings.h>
 
 #include <test/data/blockfilters.json.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <univalue.h>
 
diff --git a/src/test/blockindex_tests.cpp b/src/test/blockindex_tests.cpp
--- a/src/test/blockindex_tests.cpp
+++ b/src/test/blockindex_tests.cpp
@@ -6,7 +6,7 @@
 #include <chain.h>
 #include <uint256.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/blockstatus_tests.cpp b/src/test/blockstatus_tests.cpp
--- a/src/test/blockstatus_tests.cpp
+++ b/src/test/blockstatus_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <blockvalidity.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -17,7 +17,7 @@
 #include <util/strencodings.h>
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/bswap_tests.cpp b/src/test/bswap_tests.cpp
--- a/src/test/bswap_tests.cpp
+++ b/src/test/bswap_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <compat/byteswap.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/cashaddr_tests.cpp b/src/test/cashaddr_tests.cpp
--- a/src/test/cashaddr_tests.cpp
+++ b/src/test/cashaddr_tests.cpp
@@ -5,7 +5,7 @@
 
 #include <cashaddr.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/cashaddrenc_tests.cpp b/src/test/cashaddrenc_tests.cpp
--- a/src/test/cashaddrenc_tests.cpp
+++ b/src/test/cashaddrenc_tests.cpp
@@ -10,7 +10,7 @@
 #include <uint256.h>
 #include <util/strencodings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/checkdatasig_tests.cpp b/src/test/checkdatasig_tests.cpp
--- a/src/test/checkdatasig_tests.cpp
+++ b/src/test/checkdatasig_tests.cpp
@@ -6,7 +6,7 @@
 #include <script/interpreter.h>
 
 #include <test/lcg.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/checkpoints_tests.cpp b/src/test/checkpoints_tests.cpp
--- a/src/test/checkpoints_tests.cpp
+++ b/src/test/checkpoints_tests.cpp
@@ -18,7 +18,7 @@
 #include <util/strencodings.h>
 #include <validation.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
--- a/src/test/checkqueue_tests.cpp
+++ b/src/test/checkqueue_tests.cpp
@@ -10,7 +10,7 @@
 #include <checkqueue.h>
 #include <condition_variable>
 #include <mutex>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 #include <thread>
 #include <vector>
 
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -10,7 +10,7 @@
 #include <undo.h>
 #include <util/strencodings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp
--- a/src/test/compress_tests.cpp
+++ b/src/test/compress_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/config_tests.cpp b/src/test/config_tests.cpp
--- a/src/test/config_tests.cpp
+++ b/src/test/config_tests.cpp
@@ -7,7 +7,7 @@
 #include <chainparams.h>
 #include <consensus/consensus.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/core_io_tests.cpp b/src/test/core_io_tests.cpp
--- a/src/test/core_io_tests.cpp
+++ b/src/test/core_io_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <core_io.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp
--- a/src/test/crypto_tests.cpp
+++ b/src/test/crypto_tests.cpp
@@ -14,7 +14,7 @@
 #include <random.h>
 #include <util/strencodings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp
--- a/src/test/cuckoocache_tests.cpp
+++ b/src/test/cuckoocache_tests.cpp
@@ -7,7 +7,7 @@
 #include <random.h>
 #include <script/sigcache.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/thread/shared_mutex.hpp>
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <uint256.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@@ -17,7 +17,7 @@
 #include <util/time.h>
 #include <validation.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/descriptor_tests.cpp b/src/test/descriptor_tests.cpp
--- a/src/test/descriptor_tests.cpp
+++ b/src/test/descriptor_tests.cpp
@@ -7,7 +7,7 @@
 #include <script/standard.h>
 #include <util/strencodings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/dstencode_tests.cpp b/src/test/dstencode_tests.cpp
--- a/src/test/dstencode_tests.cpp
+++ b/src/test/dstencode_tests.cpp
@@ -7,7 +7,7 @@
 #include <chainparams.h>
 #include <config.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/excessiveblock_tests.cpp b/src/test/excessiveblock_tests.cpp
--- a/src/test/excessiveblock_tests.cpp
+++ b/src/test/excessiveblock_tests.cpp
@@ -5,7 +5,7 @@
 #include <consensus/consensus.h>
 #include <rpc/server.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/feerate_tests.cpp b/src/test/feerate_tests.cpp
--- a/src/test/feerate_tests.cpp
+++ b/src/test/feerate_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <amount.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/finalization_tests.cpp b/src/test/finalization_tests.cpp
--- a/src/test/finalization_tests.cpp
+++ b/src/test/finalization_tests.cpp
@@ -8,7 +8,7 @@
 #include <util/time.h>
 #include <validation.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/flatfile_tests.cpp b/src/test/flatfile_tests.cpp
--- a/src/test/flatfile_tests.cpp
+++ b/src/test/flatfile_tests.cpp
@@ -8,7 +8,7 @@
 #include <streams.h>
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/fs_tests.cpp b/src/test/fs_tests.cpp
--- a/src/test/fs_tests.cpp
+++ b/src/test/fs_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/fuzz/CMakeLists.txt b/src/test/fuzz/CMakeLists.txt
--- a/src/test/fuzz/CMakeLists.txt
+++ b/src/test/fuzz/CMakeLists.txt
@@ -6,7 +6,7 @@
 		fuzz.cpp
 
 		# TODO: make a test library
-		../setup_common.cpp
+		../util/setup_common.cpp
 
 		${ARGN}
 	)
diff --git a/src/test/getarg_tests.cpp b/src/test/getarg_tests.cpp
--- a/src/test/getarg_tests.cpp
+++ b/src/test/getarg_tests.cpp
@@ -5,7 +5,7 @@
 #include <util/strencodings.h>
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <univalue.h>
 
diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp
--- a/src/test/hash_tests.cpp
+++ b/src/test/hash_tests.cpp
@@ -9,7 +9,7 @@
 #include <streams.h>
 #include <util/strencodings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/key_io_tests.cpp b/src/test/key_io_tests.cpp
--- a/src/test/key_io_tests.cpp
+++ b/src/test/key_io_tests.cpp
@@ -9,7 +9,7 @@
 #include <key.h>
 #include <key_io.h>
 #include <script/script.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 #include <util/strencodings.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/key_properties.cpp b/src/test/key_properties.cpp
--- a/src/test/key_properties.cpp
+++ b/src/test/key_properties.cpp
@@ -4,7 +4,7 @@
 #include <key.h>
 
 #include <test/gen/crypto_gen.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp
--- a/src/test/key_tests.cpp
+++ b/src/test/key_tests.cpp
@@ -10,7 +10,7 @@
 #include <util/strencodings.h>
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/limitedmap_tests.cpp b/src/test/limitedmap_tests.cpp
--- a/src/test/limitedmap_tests.cpp
+++ b/src/test/limitedmap_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <limitedmap.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/mempool_policy_tests.cpp b/src/test/mempool_policy_tests.cpp
--- a/src/test/mempool_policy_tests.cpp
+++ b/src/test/mempool_policy_tests.cpp
@@ -8,7 +8,7 @@
 #include <policy/mempool.h>
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -9,7 +9,7 @@
 #include <util/system.h>
 #include <util/time.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp
--- a/src/test/merkle_tests.cpp
+++ b/src/test/merkle_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <util/strencodings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/merkleblock_tests.cpp b/src/test/merkleblock_tests.cpp
--- a/src/test/merkleblock_tests.cpp
+++ b/src/test/merkleblock_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <merkleblock.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 #include <uint256.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -22,7 +22,7 @@
 #include <util/time.h>
 #include <validation.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/monolith_opcodes_tests.cpp b/src/test/monolith_opcodes_tests.cpp
--- a/src/test/monolith_opcodes_tests.cpp
+++ b/src/test/monolith_opcodes_tests.cpp
@@ -5,7 +5,7 @@
 #include <policy/policy.h>
 #include <script/interpreter.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -13,7 +13,7 @@
 #include <tinyformat.h>
 #include <uint256.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -13,7 +13,7 @@
 #include <serialize.h>
 #include <streams.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp
--- a/src/test/netbase_tests.cpp
+++ b/src/test/netbase_tests.cpp
@@ -7,7 +7,7 @@
 #include <net_permissions.h>
 #include <util/strencodings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/op_reversebytes_tests.cpp b/src/test/op_reversebytes_tests.cpp
--- a/src/test/op_reversebytes_tests.cpp
+++ b/src/test/op_reversebytes_tests.cpp
@@ -7,7 +7,7 @@
 #include <script/script.h>
 
 #include <test/lcg.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp
--- a/src/test/pmt_tests.cpp
+++ b/src/test/pmt_tests.cpp
@@ -10,7 +10,7 @@
 #include <uint256.h>
 #include <version.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -10,7 +10,7 @@
 #include <util/system.h>
 #include <util/time.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/pow_tests.cpp b/src/test/pow_tests.cpp
--- a/src/test/pow_tests.cpp
+++ b/src/test/pow_tests.cpp
@@ -9,7 +9,7 @@
 #include <config.h>
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp
--- a/src/test/prevector_tests.cpp
+++ b/src/test/prevector_tests.cpp
@@ -8,7 +8,7 @@
 #include <serialize.h>
 #include <streams.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/radix_tests.cpp b/src/test/radix_tests.cpp
--- a/src/test/radix_tests.cpp
+++ b/src/test/radix_tests.cpp
@@ -5,7 +5,7 @@
 #include <radix.h>
 
 #include <test/lcg.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp
--- a/src/test/raii_event_tests.cpp
+++ b/src/test/raii_event_tests.cpp
@@ -11,7 +11,7 @@
 
 #include <support/events.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/random_tests.cpp b/src/test/random_tests.cpp
--- a/src/test/random_tests.cpp
+++ b/src/test/random_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <random.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/rcu_tests.cpp b/src/test/rcu_tests.cpp
--- a/src/test/rcu_tests.cpp
+++ b/src/test/rcu_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <rcu.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/reverselock_tests.cpp b/src/test/reverselock_tests.cpp
--- a/src/test/reverselock_tests.cpp
+++ b/src/test/reverselock_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <reverselock.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/rpc_server_tests.cpp b/src/test/rpc_server_tests.cpp
--- a/src/test/rpc_server_tests.cpp
+++ b/src/test/rpc_server_tests.cpp
@@ -9,7 +9,7 @@
 #include <config.h>
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -12,7 +12,7 @@
 #include <interfaces/chain.h>
 #include <util/time.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/rwcollection_tests.cpp b/src/test/rwcollection_tests.cpp
--- a/src/test/rwcollection_tests.cpp
+++ b/src/test/rwcollection_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <reverse_iterator.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/sanity_tests.cpp b/src/test/sanity_tests.cpp
--- a/src/test/sanity_tests.cpp
+++ b/src/test/sanity_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <key.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp
--- a/src/test/scheduler_tests.cpp
+++ b/src/test/scheduler_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <random.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/schnorr_tests.cpp b/src/test/schnorr_tests.cpp
--- a/src/test/schnorr_tests.cpp
+++ b/src/test/schnorr_tests.cpp
@@ -5,7 +5,7 @@
 #include <script/interpreter.h>
 
 #include <test/lcg.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/script_bitfield_tests.cpp b/src/test/script_bitfield_tests.cpp
--- a/src/test/script_bitfield_tests.cpp
+++ b/src/test/script_bitfield_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <script/bitfield.h>
 #include <script/script_error.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/script_commitment_tests.cpp b/src/test/script_commitment_tests.cpp
--- a/src/test/script_commitment_tests.cpp
+++ b/src/test/script_commitment_tests.cpp
@@ -9,7 +9,7 @@
 #include <consensus/validation.h>
 #include <validation.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/script_p2sh_tests.cpp b/src/test/script_p2sh_tests.cpp
--- a/src/test/script_p2sh_tests.cpp
+++ b/src/test/script_p2sh_tests.cpp
@@ -14,7 +14,7 @@
 #include <tinyformat.h>
 #include <validation.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/script_standard_tests.cpp b/src/test/script_standard_tests.cpp
--- a/src/test/script_standard_tests.cpp
+++ b/src/test/script_standard_tests.cpp
@@ -7,7 +7,7 @@
 #include <script/ismine.h>
 #include <script/script.h>
 #include <script/standard.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -22,10 +22,10 @@
 
 #include <test/data/script_tests.json.h>
 #include <test/jsonutil.h>
-#include <test/lib/transaction_utils.h>
 #include <test/scriptflags.h>
-#include <test/setup_common.h>
 #include <test/sigutil.h>
+#include <test/util/setup_common.h>
+#include <test/util/transaction_utils.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp
--- a/src/test/scriptnum_tests.cpp
+++ b/src/test/scriptnum_tests.cpp
@@ -5,7 +5,7 @@
 #include <script/script.h>
 
 #include <test/scriptnum10.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -8,7 +8,7 @@
 #include <streams.h>
 #include <util/strencodings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/settings_tests.cpp b/src/test/settings_tests.cpp
--- a/src/test/settings_tests.cpp
+++ b/src/test/settings_tests.cpp
@@ -4,8 +4,8 @@
 
 #include <util/settings.h>
 
-#include <test/setup_common.h>
 #include <test/util.h>
+#include <test/util/setup_common.h>
 #include <util/strencodings.h>
 
 #include <univalue.h>
diff --git a/src/test/sigcache_tests.cpp b/src/test/sigcache_tests.cpp
--- a/src/test/sigcache_tests.cpp
+++ b/src/test/sigcache_tests.cpp
@@ -12,7 +12,7 @@
 #include <tinyformat.h>
 #include <util/strencodings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/sigcheckcount_tests.cpp b/src/test/sigcheckcount_tests.cpp
--- a/src/test/sigcheckcount_tests.cpp
+++ b/src/test/sigcheckcount_tests.cpp
@@ -7,7 +7,7 @@
 #include <script/interpreter.h>
 #include <script/script_error.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/sigencoding_tests.cpp b/src/test/sigencoding_tests.cpp
--- a/src/test/sigencoding_tests.cpp
+++ b/src/test/sigencoding_tests.cpp
@@ -7,7 +7,7 @@
 #include <script/script_flags.h>
 
 #include <test/lcg.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -15,7 +15,7 @@
 
 #include <test/data/sighash.json.h>
 #include <test/jsonutil.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/sighashtype_tests.cpp b/src/test/sighashtype_tests.cpp
--- a/src/test/sighashtype_tests.cpp
+++ b/src/test/sighashtype_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <streams.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp
--- a/src/test/skiplist_tests.cpp
+++ b/src/test/skiplist_tests.cpp
@@ -5,7 +5,7 @@
 #include <chain.h>
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp
--- a/src/test/streams_tests.cpp
+++ b/src/test/streams_tests.cpp
@@ -4,7 +4,7 @@
 
 #include <streams.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/sync_tests.cpp b/src/test/sync_tests.cpp
--- a/src/test/sync_tests.cpp
+++ b/src/test/sync_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <sync.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/timedata_tests.cpp b/src/test/timedata_tests.cpp
--- a/src/test/timedata_tests.cpp
+++ b/src/test/timedata_tests.cpp
@@ -6,10 +6,10 @@
 
 #include <netaddress.h>
 #include <noui.h>
-#include <test/lib/logging.h>
+#include <test/util/logging.h>
 #include <warnings.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/torcontrol_tests.cpp b/src/test/torcontrol_tests.cpp
--- a/src/test/torcontrol_tests.cpp
+++ b/src/test/torcontrol_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 //
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -28,7 +28,7 @@
 #include <test/data/tx_valid.json.h>
 #include <test/jsonutil.h>
 #include <test/scriptflags.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/txindex_tests.cpp b/src/test/txindex_tests.cpp
--- a/src/test/txindex_tests.cpp
+++ b/src/test/txindex_tests.cpp
@@ -9,7 +9,7 @@
 #include <util/system.h>
 #include <util/time.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/txvalidation_tests.cpp b/src/test/txvalidation_tests.cpp
--- a/src/test/txvalidation_tests.cpp
+++ b/src/test/txvalidation_tests.cpp
@@ -9,7 +9,7 @@
 #include <txmempool.h>
 #include <validation.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -15,8 +15,8 @@
 #include <validation.h>
 
 #include <test/lcg.h>
-#include <test/setup_common.h>
 #include <test/sigutil.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp
--- a/src/test/uint256_tests.cpp
+++ b/src/test/uint256_tests.cpp
@@ -7,7 +7,7 @@
 #include <streams.h>
 #include <version.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/undo_tests.cpp b/src/test/undo_tests.cpp
--- a/src/test/undo_tests.cpp
+++ b/src/test/undo_tests.cpp
@@ -9,7 +9,7 @@
 #include <consensus/validation.h>
 #include <validation.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/util/README.md b/src/test/util/README.md
new file mode 100644
--- /dev/null
+++ b/src/test/util/README.md
@@ -0,0 +1,11 @@
+# Test library
+
+This contains files for the test library, which is used by the test binaries (unit tests, benchmarks, fuzzers, gui
+tests).
+
+Generally, the files in this folder should be well-separated modules. New code should be added to existing modules or
+(when in doubt) a new module should be created.
+
+The utilities in here are compiled into a library, which does not hold any state. However, the main file `setup_common`
+defines the common test setup for all test binaries. The test binaries will handle the global state when they
+instantiate the `BasicTestingSetup` (or one of its derived classes).
diff --git a/src/test/lib/blockfilter.h b/src/test/util/blockfilter.h
rename from src/test/lib/blockfilter.h
rename to src/test/util/blockfilter.h
--- a/src/test/lib/blockfilter.h
+++ b/src/test/util/blockfilter.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_LIB_BLOCKFILTER_H
-#define BITCOIN_TEST_LIB_BLOCKFILTER_H
+#ifndef BITCOIN_TEST_UTIL_BLOCKFILTER_H
+#define BITCOIN_TEST_UTIL_BLOCKFILTER_H
 
 #include <blockfilter.h>
 class CBlockIndex;
@@ -11,4 +11,4 @@
 bool ComputeFilter(BlockFilterType filter_type, const CBlockIndex *block_index,
                    BlockFilter &filter);
 
-#endif // BITCOIN_TEST_LIB_BLOCKFILTER_H
+#endif // BITCOIN_TEST_UTIL_BLOCKFILTER_H
diff --git a/src/test/lib/blockfilter.cpp b/src/test/util/blockfilter.cpp
rename from src/test/lib/blockfilter.cpp
rename to src/test/util/blockfilter.cpp
--- a/src/test/lib/blockfilter.cpp
+++ b/src/test/util/blockfilter.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/lib/blockfilter.h>
+#include <test/util/blockfilter.h>
 
 #include <chainparams.h>
 #include <validation.h>
diff --git a/src/test/lib/logging.h b/src/test/util/logging.h
rename from src/test/lib/logging.h
rename to src/test/util/logging.h
--- a/src/test/lib/logging.h
+++ b/src/test/util/logging.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_LIB_LOGGING_H
-#define BITCOIN_TEST_LIB_LOGGING_H
+#ifndef BITCOIN_TEST_UTIL_LOGGING_H
+#define BITCOIN_TEST_UTIL_LOGGING_H
 
 #include <util/macros.h>
 
@@ -27,4 +27,4 @@
 #define ASSERT_DEBUG_LOG(message)                                              \
     DebugLogHelper PASTE2(debugloghelper, __COUNTER__)(message)
 
-#endif // BITCOIN_TEST_LIB_LOGGING_H
+#endif // BITCOIN_TEST_UTIL_LOGGING_H
diff --git a/src/test/lib/logging.cpp b/src/test/util/logging.cpp
rename from src/test/lib/logging.cpp
rename to src/test/util/logging.cpp
--- a/src/test/lib/logging.cpp
+++ b/src/test/util/logging.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/lib/logging.h>
+#include <test/util/logging.h>
 
 #include <logging.h>
 #include <noui.h>
diff --git a/src/test/setup_common.h b/src/test/util/setup_common.h
rename from src/test/setup_common.h
rename to src/test/util/setup_common.h
--- a/src/test/setup_common.h
+++ b/src/test/util/setup_common.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_SETUP_COMMON_H
-#define BITCOIN_TEST_SETUP_COMMON_H
+#ifndef BITCOIN_TEST_UTIL_SETUP_COMMON_H
+#define BITCOIN_TEST_UTIL_SETUP_COMMON_H
 
 #include <amount.h>
 #include <chainparamsbase.h>
@@ -175,4 +175,4 @@
 
 CBlock getBlock13b8a();
 
-#endif // BITCOIN_TEST_SETUP_COMMON_H
+#endif // BITCOIN_TEST_UTIL_SETUP_COMMON_H
diff --git a/src/test/setup_common.cpp b/src/test/util/setup_common.cpp
rename from src/test/setup_common.cpp
rename to src/test/util/setup_common.cpp
--- a/src/test/setup_common.cpp
+++ b/src/test/util/setup_common.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/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <banman.h>
 #include <chainparams.h>
diff --git a/src/test/lib/transaction_utils.h b/src/test/util/transaction_utils.h
rename from src/test/lib/transaction_utils.h
rename to src/test/util/transaction_utils.h
--- a/src/test/lib/transaction_utils.h
+++ b/src/test/util/transaction_utils.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_LIB_TRANSACTION_UTILS_H
-#define BITCOIN_TEST_LIB_TRANSACTION_UTILS_H
+#ifndef BITCOIN_TEST_UTIL_TRANSACTION_UTILS_H
+#define BITCOIN_TEST_UTIL_TRANSACTION_UTILS_H
 
 #include <primitives/transaction.h>
 
@@ -18,4 +18,4 @@
 CMutableTransaction BuildSpendingTransaction(const CScript &scriptSig,
                                              const CTransaction &txCredit);
 
-#endif // BITCOIN_TEST_LIB_TRANSACTION_UTILS_H
+#endif // BITCOIN_TEST_UTIL_TRANSACTION_UTILS_H
diff --git a/src/test/lib/transaction_utils.cpp b/src/test/util/transaction_utils.cpp
rename from src/test/lib/transaction_utils.cpp
rename to src/test/util/transaction_utils.cpp
--- a/src/test/lib/transaction_utils.cpp
+++ b/src/test/util/transaction_utils.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/lib/transaction_utils.h>
+#include <test/util/transaction_utils.h>
 
 CMutableTransaction BuildCreditingTransaction(const CScript &scriptPubKey,
                                               const Amount nValue) {
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -12,7 +12,7 @@
 #include <util/strencodings.h>
 #include <util/time.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <univalue.h>
 
diff --git a/src/test/util_threadnames_tests.cpp b/src/test/util_threadnames_tests.cpp
--- a/src/test/util_threadnames_tests.cpp
+++ b/src/test/util_threadnames_tests.cpp
@@ -8,7 +8,7 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp
--- a/src/test/validation_block_tests.cpp
+++ b/src/test/validation_block_tests.cpp
@@ -12,7 +12,7 @@
 #include <miner.h>
 #include <pow.h>
 #include <random.h>
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 #include <util/time.h>
 #include <validation.h>
 #include <validationinterface.h>
diff --git a/src/test/validation_tests.cpp b/src/test/validation_tests.cpp
--- a/src/test/validation_tests.cpp
+++ b/src/test/validation_tests.cpp
@@ -15,7 +15,7 @@
 #include <util/system.h>
 #include <validation.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/signals2/signal.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp
--- a/src/test/versionbits_tests.cpp
+++ b/src/test/versionbits_tests.cpp
@@ -8,7 +8,7 @@
 #include <validation.h>
 #include <versionbits.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp
--- a/src/wallet/test/coinselector_tests.cpp
+++ b/src/wallet/test/coinselector_tests.cpp
@@ -10,7 +10,7 @@
 #include <wallet/coinselection.h>
 #include <wallet/wallet.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 #include <wallet/test/wallet_test_fixture.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/wallet/test/db_tests.cpp b/src/wallet/test/db_tests.cpp
--- a/src/wallet/test/db_tests.cpp
+++ b/src/wallet/test/db_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <fs.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/wallet/test/init_test_fixture.h b/src/wallet/test/init_test_fixture.h
--- a/src/wallet/test/init_test_fixture.h
+++ b/src/wallet/test/init_test_fixture.h
@@ -7,7 +7,7 @@
 
 #include <interfaces/chain.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 struct InitWalletDirTestingSetup : public BasicTestingSetup {
     explicit InitWalletDirTestingSetup(
diff --git a/src/wallet/test/init_tests.cpp b/src/wallet/test/init_tests.cpp
--- a/src/wallet/test/init_tests.cpp
+++ b/src/wallet/test/init_tests.cpp
@@ -4,10 +4,10 @@
 
 #include <chainparams.h>
 #include <noui.h>
-#include <test/lib/logging.h>
+#include <test/util/logging.h>
 #include <util/system.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 #include <wallet/test/init_test_fixture.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/wallet/test/psbt_wallet_tests.cpp b/src/wallet/test/psbt_wallet_tests.cpp
--- a/src/wallet/test/psbt_wallet_tests.cpp
+++ b/src/wallet/test/psbt_wallet_tests.cpp
@@ -10,7 +10,7 @@
 #include <wallet/test/wallet_test_fixture.h>
 #include <wallet/wallet.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/wallet/test/wallet_crypto_tests.cpp b/src/wallet/test/wallet_crypto_tests.cpp
--- a/src/wallet/test/wallet_crypto_tests.cpp
+++ b/src/wallet/test/wallet_crypto_tests.cpp
@@ -5,7 +5,7 @@
 #include <util/strencodings.h>
 #include <wallet/crypter.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/wallet/test/wallet_test_fixture.h b/src/wallet/test/wallet_test_fixture.h
--- a/src/wallet/test/wallet_test_fixture.h
+++ b/src/wallet/test/wallet_test_fixture.h
@@ -9,7 +9,7 @@
 #include <interfaces/wallet.h>
 #include <wallet/wallet.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 
 #include <memory>
 
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -14,7 +14,7 @@
 #include <wallet/rpcdump.h>
 #include <wallet/wallet.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 #include <wallet/test/wallet_test_fixture.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/wallet/test/walletdb_tests.cpp b/src/wallet/test/walletdb_tests.cpp
--- a/src/wallet/test/walletdb_tests.cpp
+++ b/src/wallet/test/walletdb_tests.cpp
@@ -8,7 +8,7 @@
 #include <interfaces/chain.h>
 #include <wallet/wallet.h>
 
-#include <test/setup_common.h>
+#include <test/util/setup_common.h>
 #include <wallet/test/wallet_test_fixture.h>
 
 #include <boost/test/unit_test.hpp>