--- a/RegressionTests__WebSocketTest.st	Tue Feb 25 17:19:49 2020 +0100
+++ b/RegressionTests__WebSocketTest.st	Tue Mar 03 16:37:35 2020 +0100
@@ -384,11 +384,14 @@
 !WebSocketTest methodsFor:'initialization & release'!
 
 setUp
-    |response|   
+    |response waitForServerSema|  
+
+    waitForServerSema := Semaphore new.
 
     DemoWebSocketService start
         webSocketCreationCallback:[:newWebSocket |
             ServerWebSocket := newWebSocket.
+            waitForServerSema signal.
         ].
 
     OperatingSystem isUNIXlike ifTrue:[
@@ -408,8 +411,10 @@
     ]. 
 
     ClientWebSocket := response webSocket.
+    waitForServerSema wait.
 
     "Created: / 05-02-2020 / 13:54:35 / Stefan Reise"
+    "Modified: / 03-03-2020 / 16:31:11 / Stefan Reise"
 !
 
 tearDown
@@ -438,23 +443,17 @@
 !WebSocketTest methodsFor:'queries'!
 
 clientWebSocket
-    ClientWebSocket isNil ifTrue:[
-        self setUp.
-    ].
-
     ^ ClientWebSocket
 
     "Created: / 17-01-2020 / 13:23:11 / Stefan Reise"
+    "Modified: / 03-03-2020 / 16:08:23 / Stefan Reise"
 !
 
 serverWebSocket
-    ServerWebSocket isNil ifTrue:[
-        self setUp.
-    ].
-
     ^ ServerWebSocket
 
     "Created: / 17-01-2020 / 13:23:15 / Stefan Reise"
+    "Modified: / 03-03-2020 / 16:10:16 / Stefan Reise"
 ! !
 
 !WebSocketTest methodsFor:'tests'!
@@ -1053,10 +1052,13 @@
 
 !WebSocketTest::DemoWebSocketService methodsFor:'processing'!
 
-acceptsWebSocket:webSocket
+acceptsWebSocket:aWebSocket
+    "subclasses should redefine this, to check for a concrete webSocket request
+     to be valid and allowed at this time"
+
     ^ true
 
-    "Created: / 13-11-2019 / 13:57:03 / Stefan Reise"
+    "Created: / 03-03-2020 / 16:17:08 / Stefan Reise"
 !
 
 startServingWebSocket:webSocket