diff --git a/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java b/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java
index 0cf6e3419..6d9aeb9cc 100644
--- a/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java
+++ b/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java
@@ -627,6 +627,13 @@ public void run() {
             throw new RuntimeException(throwRef.get());
         
         assertFalse(conn.isOpen());
+        // Give the server a bit of time to accept the connection, but
+        // ensure that it can accept it.
+        for(int i = 0; i < 10; i++) {
+            if(localServer.getAcceptedConnectionCount() == 1)
+                break;
+            Thread.sleep(100);
+        }
         assertEquals(1, localServer.getAcceptedConnectionCount());
         
         // check that there are no connections available