diff --git a/src/test/main.cpp b/src/test/main.cpp
index f32243d1d3..9bccbef805 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -13,14 +13,19 @@
 
 #include <iostream>
 
-/** Redirect debug log to unit_test.log files */
-const std::function<void(const std::string&)> G_TEST_LOG_FUN = [](const std::string& s) {
+bool IsTestLoggingEnabled()
+{
     static const bool should_log{std::any_of(
         &boost::unit_test::framework::master_test_suite().argv[1],
         &boost::unit_test::framework::master_test_suite().argv[boost::unit_test::framework::master_test_suite().argc],
         [](const char* arg) {
             return std::string{"DEBUG_LOG_OUT"} == arg;
         })};
-    if (!should_log) return;
+    return should_log;
+}
+
+/** Redirect debug log to unit_test.cpp.log files */
+const std::function<void(const std::string&)> G_TEST_LOG_FUN = [](const std::string& s) {
+    if (!IsTestLoggingEnabled()) return;
     std::cout << s;
 };
diff --git a/src/test/util/logging.h b/src/test/util/logging.h
index 45ec44173c..f4ad232c6e 100644
--- a/src/test/util/logging.h
+++ b/src/test/util/logging.h
@@ -11,6 +11,13 @@
 #include <list>
 #include <string>
 
+bool IsTestLoggingEnabled();
+
+#define TEST_MESSAGE(blob)              \
+    if (IsTestLoggingEnabled()) {       \
+        std::cout << blob << std::endl; \
+    }
+
 class DebugLogHelper
 {
     const std::string m_message;