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
@@ -16,19 +16,21 @@
         CScript() << ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
     CBlock block;
 
-    LOCK(cs_main);
-
-    // We should have no finalized block because the 100 blocks generated by the
-    // test setup are too close to "now";
-    BOOST_CHECK_MESSAGE(GetFinalizedBlock() == nullptr,
-                        "No block finalized (tip at height "
-                            << chainActive.Tip()->nHeight << ")");
+    {
+        LOCK(cs_main);
+        // We should have no finalized block because the 100 blocks generated by
+        // the test setup are too close to "now";
+        BOOST_CHECK_MESSAGE(GetFinalizedBlock() == nullptr,
+                            "No block finalized (tip at height "
+                                << chainActive.Tip()->nHeight << ")");
+    }
 
     // Create maxreorgdepth blocks. Auto-finalization will not occur because
     // the delay is not expired
     int64_t mockedTime = GetTime();
     for (uint32_t i = 0; i < DEFAULT_MAX_REORG_DEPTH; i++) {
         block = CreateAndProcessBlock({}, p2pk_scriptPubKey);
+        LOCK(cs_main);
         // These blocks are too recent.
         BOOST_CHECK_MESSAGE(GetFinalizedBlock() == nullptr,
                             "No block finalized (tip at height "
@@ -46,6 +48,7 @@
     for (uint32_t i = 0; i < DEFAULT_MAX_REORG_DEPTH; i++) {
         blockToFinalize = chainActive.Next(blockToFinalize);
         block = CreateAndProcessBlock({}, p2pk_scriptPubKey);
+        LOCK(cs_main);
         BOOST_CHECK_MESSAGE(GetFinalizedBlock() == blockToFinalize,
                             "Block finalized at height "
                                 << blockToFinalize->nHeight
@@ -57,6 +60,7 @@
     // expired
     for (uint32_t i = 0; i < DEFAULT_MAX_REORG_DEPTH; i++) {
         block = CreateAndProcessBlock({}, p2pk_scriptPubKey);
+        LOCK(cs_main);
         // These blocks are finalized.
         BOOST_CHECK_MESSAGE(GetFinalizedBlock() == blockToFinalize,
                             "Finalized block remains unchanged at height "
@@ -77,6 +81,7 @@
     for (uint32_t i = 0; i < DEFAULT_MAX_REORG_DEPTH; i++) {
         blockToFinalize = chainActive.Next(blockToFinalize);
         block = CreateAndProcessBlock({}, p2pk_scriptPubKey);
+        LOCK(cs_main);
         BOOST_CHECK_MESSAGE(GetFinalizedBlock() == blockToFinalize,
                             "Block finalized at height "
                                 << blockToFinalize->nHeight
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
@@ -198,7 +198,6 @@
     const CTransaction funding_tx = CTransaction(mutableFunding_tx);
     // Spend the funding transaction by mining it into a block
     {
-        LOCK(cs_main);
         CBlock block = CreateAndProcessBlock({funding_tx}, p2pk_scriptPubKey);
         BOOST_CHECK(chainActive.Tip()->GetBlockHash() == block.GetHash());
         BOOST_CHECK(pcoinsTip->GetBestBlock() == block.GetHash());