diff --git a/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs b/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs
index 1aed3032a88..dad3d25762d 100644
--- a/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs
+++ b/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs
@@ -35,13 +35,13 @@ import           Control.Monad.Class.MonadTimer
 import           Control.Tracer (Tracer, contramap, traceWith)
 import           Data.Foldable (foldMap', traverse_)
 import           Data.Function (on)
-import           Data.Functor (void, ($>))
+import           Data.Functor (($>))
 import           Data.Maybe (maybeToList)
 import           Data.Proxy (Proxy (..))
 import           Data.Typeable (Typeable)
 import           GHC.Stack (CallStack, HasCallStack, callStack)
 
-import           Data.Map (Map, traverseWithKey)
+import           Data.Map (Map)
 import qualified Data.Map as Map
 import qualified Data.Set as Set
 
@@ -652,12 +652,17 @@ withConnectionManager ConnectionManagerArguments {
               }
 
     k connectionManager
-      `finally` do
+      -- Since this exception handler is blocking it might receive exceptions during its
+      -- execution, which we wan't to avoid, so we wrap it around uninterruptibleMask_.
+      `finally` uninterruptibleMask_ (do
         traceWith tracer TrShutdown
 
         state <- atomically $ readTMVar stateVar
-        void $ traverseWithKey
-          (\peerAddr MutableConnState { connVar } -> do
+        -- Spawning one thread for each connection cleanup avoids spending time waiting
+        -- for locks and cleanup logic that could delay closing the connections and making
+        -- us not respecting certain timeouts.
+        forConcurrently_ (Map.assocs state)
+          (\(peerAddr, MutableConnState { connVar }) -> do
             -- cleanup handler for that thread will close socket associated
             -- with the thread.  We put each connection in 'TerminatedState' to
             -- try that none of the connection threads will enter
@@ -682,8 +687,7 @@ withConnectionManager ConnectionManagerArguments {
             -- using 'cancel' here, since we want to block until connection
             -- handler thread terminates.
             traverse_ cancel (getConnThread connState)
-          )
-          state
+          ))
   where
     traceCounters :: StrictTMVar m (ConnectionManagerState peerAddr handle handleError version m) -> m ()
     traceCounters stateVar = do
diff --git a/ouroboros-network-framework/test/Test/Ouroboros/Network/Server2.hs b/ouroboros-network-framework/test/Test/Ouroboros/Network/Server2.hs
index 22f60a13220..ba4637badb8 100644
--- a/ouroboros-network-framework/test/Test/Ouroboros/Network/Server2.hs
+++ b/ouroboros-network-framework/test/Test/Ouroboros/Network/Server2.hs
@@ -1677,7 +1677,7 @@ multinodeExperiment inboundTrTracer trTracer cmTracer inboundTracer
                           timeLimitsHandshake
                           acceptedConnLimit
                           ( \ connectionManager _ serverAsync -> do
-                            link serverAsync
+                            linkOnly (const True) serverAsync
                             connectionLoop SingInitiatorResponderMode localAddr cc connectionManager Map.empty connVar
                             return Nothing
                           )
@@ -2475,7 +2475,8 @@ prop_timeouts_enforced serverAcc (ArbDataFlow dataFlow)
                        . getTraceEvents
                        $ trace
 
-  in verifyAllTimeouts transitionSignal
+  in counterexample (ppTrace trace)
+   $ verifyAllTimeouts transitionSignal
   where
     verifyAllTimeouts :: [[(Time , AbstractTransitionTrace SimAddr)]]
                       -> Property