diff --git a/tests/nymea-remoteproxy-tests.cpp b/tests/nymea-remoteproxy-tests.cpp
index 987d98f..e5b828d 100644
--- a/tests/nymea-remoteproxy-tests.cpp
+++ b/tests/nymea-remoteproxy-tests.cpp
@@ -230,9 +230,13 @@ void RemoteProxyTests::webserverConnectionBlocked()
     // Make sure the websocket server is not running
     QVERIFY(!Engine::instance()->webSocketServer()->running());
 
+    QSignalSpy closedSpy(&dummyServer, &QWebSocketServer::closed);
     dummyServer.close();
+    closedSpy.wait();
+    QVERIFY(closedSpy.count() == 1);
 
     // Try again
+    cleanUpEngine();
     startServer();
 
     // Clean up