diff --git a/tests/server/sws.c b/tests/server/sws.c
index bb29a3dc8f..0157d9e5c7 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -604,7 +604,7 @@ int main(int argc, char *argv[])
       if(open)
         logmsg("persistant connection, awaits new request");
       /* if we got a CONNECT, loop and get another request as well! */
-    } while(open);
+    } while(open || (doc == DOCNUMBER_CONNECT));
 
     logmsg("Closing client connection");
     close(msgsock);