diff --git a/src/ipc/test/ipc_tests.cpp b/src/ipc/test/ipc_tests.cpp
index cc03904e28b..ebe4b397afa 100644
--- a/src/ipc/test/ipc_tests.cpp
+++ b/src/ipc/test/ipc_tests.cpp
@@ -5,6 +5,7 @@
 #include <ipc/process.h>
 #include <ipc/test/ipc_test.h>
 
+#include <test/util/common.h>
 #include <test/util/setup_common.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/httpserver_tests.cpp b/src/test/httpserver_tests.cpp
index 2770c0c3729..030d48db4ab 100644
--- a/src/test/httpserver_tests.cpp
+++ b/src/test/httpserver_tests.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <httpserver.h>
+#include <test/util/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
index defec028f74..1fc8d526944 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -15,6 +15,7 @@
 #include <serialize.h>
 #include <span.h>
 #include <streams.h>
+#include <test/util/common.h>
 #include <test/util/net.h>
 #include <test/util/random.h>
 #include <test/util/setup_common.h>
diff --git a/src/test/reverselock_tests.cpp b/src/test/reverselock_tests.cpp
index b792dbe49d3..20edb22ab64 100644
--- a/src/test/reverselock_tests.cpp
+++ b/src/test/reverselock_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <sync.h>
-#include <test/util/setup_common.h>
+#include <test/util/common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/script_parse_tests.cpp b/src/test/script_parse_tests.cpp
index a4e0112036b..9f67215e90d 100644
--- a/src/test/script_parse_tests.cpp
+++ b/src/test/script_parse_tests.cpp
@@ -5,7 +5,7 @@
 #include <core_io.h>
 #include <script/script.h>
 #include <util/strencodings.h>
-#include <test/util/setup_common.h>
+#include <test/util/common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/sock_tests.cpp b/src/test/sock_tests.cpp
index 98f252790f3..2b7e4a784af 100644
--- a/src/test/sock_tests.cpp
+++ b/src/test/sock_tests.cpp
@@ -4,6 +4,7 @@
 
 #include <common/system.h>
 #include <compat/compat.h>
+#include <test/util/common.h>
 #include <test/util/setup_common.h>
 #include <util/sock.h>
 #include <util/threadinterrupt.h>
diff --git a/src/test/sync_tests.cpp b/src/test/sync_tests.cpp
index 9240691b6a6..09a96be9590 100644
--- 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/util/setup_common.h>
+#include <test/util/common.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
index f4490dec0a5..f960a3d85ca 100644
--- a/src/test/system_tests.cpp
+++ b/src/test/system_tests.cpp
@@ -6,6 +6,7 @@
 #include <bitcoin-build-config.h> // IWYU pragma: keep
 
 #include <common/run_command.h>
+#include <test/util/common.h>
 #include <test/util/setup_common.h>
 #include <univalue.h>
 #include <util/string.h>
diff --git a/src/test/util/common.h b/src/test/util/common.h
index c19c0888eaa..591f651fbaf 100644
--- a/src/test/util/common.h
+++ b/src/test/util/common.h
@@ -9,6 +9,22 @@
 #include <optional>
 #include <string>
 
+/**
+ * BOOST_CHECK_EXCEPTION predicates to check the specific validation error.
+ * Use as
+ * BOOST_CHECK_EXCEPTION(code that throws, exception type, HasReason("foo"));
+ */
+class HasReason
+{
+public:
+    explicit HasReason(std::string_view reason) : m_reason(reason) {}
+    bool operator()(std::string_view s) const { return s.find(m_reason) != std::string_view::npos; }
+    bool operator()(const std::exception& e) const { return (*this)(e.what()); }
+
+private:
+    const std::string m_reason;
+};
+
 // Make types usable in BOOST_CHECK_* @{
 namespace std {
 template <typename T> requires std::is_enum_v<T>
diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h
index cc0d7ffd516..c02a4fd3315 100644
--- a/src/test/util/setup_common.h
+++ b/src/test/util/setup_common.h
@@ -261,20 +261,4 @@ std::unique_ptr<T> MakeNoLogFileContext(const ChainType chain_type = ChainType::
 
 CBlock getBlock13b8a();
 
-/**
- * BOOST_CHECK_EXCEPTION predicates to check the specific validation error.
- * Use as
- * BOOST_CHECK_EXCEPTION(code that throws, exception type, HasReason("foo"));
- */
-class HasReason
-{
-public:
-    explicit HasReason(std::string_view reason) : m_reason(reason) {}
-    bool operator()(std::string_view s) const { return s.find(m_reason) != std::string_view::npos; }
-    bool operator()(const std::exception& e) const { return (*this)(e.what()); }
-
-private:
-    const std::string m_reason;
-};
-
 #endif // BITCOIN_TEST_UTIL_SETUP_COMMON_H
diff --git a/src/test/util_check_tests.cpp b/src/test/util_check_tests.cpp
index 93ac9194604..0053f9bd1cc 100644
--- a/src/test/util_check_tests.cpp
+++ b/src/test/util_check_tests.cpp
@@ -5,7 +5,7 @@
 #include <util/check.h>
 
 #include <boost/test/unit_test.hpp>
-#include <test/util/setup_common.h>
+#include <test/util/common.h>
 
 BOOST_AUTO_TEST_SUITE(util_check_tests)
 
diff --git a/src/test/util_string_tests.cpp b/src/test/util_string_tests.cpp
index ad737ce9cd1..77576950854 100644
--- a/src/test/util_string_tests.cpp
+++ b/src/test/util_string_tests.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include <test/util/common.h>
-#include <test/util/setup_common.h>
+#include <tinyformat.h>
 
 using namespace util;
 using util::detail::CheckNumFormatSpecifiers;