diff --git a/test/helpers.hpp b/test/helpers.hpp
index 333c63055d..de87a2af74 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -11,6 +11,7 @@
 
 #pragma once
 
+#include "Unit.hpp"
 #include <test/lokassert.hpp>
 #include <test/testlog.hpp>
 
@@ -572,6 +573,12 @@ connectLOKit(const std::shared_ptr<SocketPoll>& socketPoll, const Poco::URI& uri
                 break;
             }
 
+            if (UnitBase::get().isFinished())
+            {
+                TST_LOG("The test has finished, giving up connectLOKit");
+                break;
+            }
+
             TST_LOG("ERROR: Reconnecting (retry #" << (max_retries - retries) << ") to "
                                                    << uri.toString());
         }