diff --git i/src/test/sync_tests.cpp w/src/test/sync_tests.cpp
index 3ea8714f3..4d6b81c3e 100644
--- i/src/test/sync_tests.cpp
+++ w/src/test/sync_tests.cpp
@@ -9,17 +9,19 @@
 
 namespace {
 template <typename MutexType>
 void TestPotentialDeadLockDetected(MutexType& mutex1, MutexType& mutex2)
 {
     {
-        LOCK2(mutex1, mutex2);
+        LOCK(mutex1);
+        LOCK(mutex2);
     }
     bool error_thrown = false;
     try {
-        LOCK2(mutex2, mutex1);
+        LOCK(mutex2);
+        LOCK(mutex1);
     } catch (const std::logic_error& e) {
         BOOST_CHECK_EQUAL(e.what(), "potential deadlock detected: mutex1 -> mutex2 -> mutex1");
         error_thrown = true;
     }
     #ifdef DEBUG_LOCKORDER
     BOOST_CHECK(error_thrown);
@@ -32,13 +34,13 @@ void TestPotentialDeadLockDetected(MutexType& mutex1, MutexType& mutex2)
 BOOST_FIXTURE_TEST_SUITE(sync_tests, BasicTestingSetup)
 
 BOOST_AUTO_TEST_CASE(potential_deadlock_detected)
 {
     #ifdef DEBUG_LOCKORDER
     bool prev = g_debug_lockorder_abort;
-    g_debug_lockorder_abort = false;
+    g_debug_lockorder_abort = true;
     #endif
 
     RecursiveMutex rmutex1, rmutex2;
     TestPotentialDeadLockDetected(rmutex1, rmutex2);
 
     Mutex mutex1, mutex2;
diff --git i/src/test/util/setup_common.cpp w/src/test/util/setup_common.cpp
index 3b7a7c8d1..e80597d40 100644
--- i/src/test/util/setup_common.cpp
+++ w/src/test/util/setup_common.cpp
@@ -69,13 +69,13 @@ std::ostream& operator<<(std::ostream& os, const uint256& num)
 BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::vector<const char*>& extra_args)
     : m_path_root{fs::temp_directory_path() / "test_common_" PACKAGE_NAME / g_insecure_rand_ctx_temp_path.rand256().ToString()}
 {
     const std::vector<const char*> arguments = Cat(
         {
             "dummy",
-            "-printtoconsole=0",
+            "-printtoconsole=1",
             "-logtimemicros",
             "-debug",
             "-debugexclude=libevent",
             "-debugexclude=leveldb",
         },
         extra_args);

diff --git i/src/sync.cpp w/src/sync.cpp
index 260e9994d..b2a48fb0f 100644
--- i/src/sync.cpp
+++ w/src/sync.cpp
@@ -99,13 +99,13 @@ LockData& GetLockData() {
     // its subclasses must have implicitly-defined destructors.
     static LockData& lock_data = *new LockData();
     return lock_data;
 }
 
 namespace {
-void potential_deadlock_detected(const LockPair& mismatch, const LockStack& s1, const LockStack& s2, const CLockLocation& lock_location)
+void potential_deadlock_detected(const LockPair& mismatch, const LockStack& s1, const LockStack& s2)
 {
     LogPrintf("POTENTIAL DEADLOCK DETECTED\n");
     LogPrintf("Previous lock order was:\n");
     for (const LockStackItem& i : s1) {
         if (i.first == mismatch.first) {
             LogPrintf(" (1)"); /* Continued */
@@ -127,13 +127,13 @@ void potential_deadlock_detected(const LockPair& mismatch, const LockStack& s1,
             LogPrintf(" (2)"); /* Continued */
             mutex_b = i.second.Name();
         }
         LogPrintf(" %s\n", i.second.ToString());
     }
     if (g_debug_lockorder_abort) {
-        tfm::format(std::cerr, "Assertion failed: detected inconsistent lock order for %s, details in debug log.\n", lock_location.ToString());
+        tfm::format(std::cerr, "Assertion failed: detected inconsistent lock order for %s, details in debug log.\n", s2.back().second.ToString());
         abort();
     }
     throw std::logic_error(strprintf("potential deadlock detected: %s -> %s -> %s", mutex_b, mutex_a, mutex_b));
 }
 
 void push_lock(void* c, const CLockLocation& locklocation)
@@ -152,13 +152,13 @@ void push_lock(void* c, const CLockLocation& locklocation)
             continue;
         lockdata.lockorders.emplace(p1, lock_stack);
 
         const LockPair p2 = std::make_pair(c, i.first);
         lockdata.invlockorders.insert(p2);
         if (lockdata.lockorders.count(p2))
-            potential_deadlock_detected(p1, lockdata.lockorders[p2], lockdata.lockorders[p1], locklocation);
+            potential_deadlock_detected(p1, lockdata.lockorders[p2], lockdata.lockorders[p1]);
     }
 }
 
 void pop_lock()
 {
     LockData& lockdata = GetLockData();