diff --git a/libnymea-remoteproxy/engine.cpp b/libnymea-remoteproxy/engine.cpp
index 3573b0c..a6b092f 100644
--- a/libnymea-remoteproxy/engine.cpp
+++ b/libnymea-remoteproxy/engine.cpp
@@ -34,7 +34,6 @@ void Engine::start(ProxyConfiguration *configuration)
 {
     // Make sure an authenticator was registered
     Q_ASSERT_X(m_authenticator != nullptr, "Engine", "There is no authenticator registerd.");
-    Q_ASSERT_X(m_configuration != nullptr, "Engine", "There is no configuration set.");
 
     if (!m_running)
         qCDebug(dcEngine()) << "Start server engine";
@@ -43,6 +42,8 @@ void Engine::start(ProxyConfiguration *configuration)
     clean();
 
     m_configuration = configuration;
+    Q_ASSERT_X(configuration != nullptr, "Engine", "There is no configuration set.");
+
     m_proxyServer = new ProxyServer(this);
     m_webSocketServer = new WebSocketServer(m_sslConfiguration, this);
 
@@ -50,7 +51,7 @@ void Engine::start(ProxyConfiguration *configuration)
     websocketServerUrl.setScheme("wss");
     websocketServerUrl.setHost(m_configuration->webSocketServerHost().toString());
     websocketServerUrl.setPort(m_configuration->webSocketServerPort());
-    qDebug() << "WSS url is:" << websocketServerUrl;
+
     m_webSocketServer->setServerUrl(websocketServerUrl);
 
     m_proxyServer->registerTransportInterface(m_webSocketServer);
diff --git a/tests/offline/nymea-remoteproxy-tests-offline.cpp b/tests/offline/nymea-remoteproxy-tests-offline.cpp
index 5b927bc..99c8fe6 100644
--- a/tests/offline/nymea-remoteproxy-tests-offline.cpp
+++ b/tests/offline/nymea-remoteproxy-tests-offline.cpp
@@ -28,12 +28,11 @@ void RemoteProxyTests::dummyAuthenticator()
     DummyAuthenticator *dummyAuthenticator = new DummyAuthenticator(this);
 
     // Start proxy webserver
-    Engine::instance()->setConfiguration(m_configuration);
     Engine::instance()->setAuthenticator(dummyAuthenticator);
     Engine::instance()->setSslConfiguration(m_sslConfiguration);
 
     QSignalSpy runningSpy(Engine::instance(), &Engine::runningChanged);
-    Engine::instance()->start();
+    Engine::instance()->start(m_configuration);
     runningSpy.wait();
 
     QVERIFY(runningSpy.count() == 1);
diff --git a/tests/testbase/basetest.cpp b/tests/testbase/basetest.cpp
index 740c3b7..a0d21f4 100644
--- a/tests/testbase/basetest.cpp
+++ b/tests/testbase/basetest.cpp
@@ -92,7 +92,7 @@ void BaseTest::startServer()
         QSignalSpy runningSpy(Engine::instance(), &Engine::runningChanged);
         Engine::instance()->setConfiguration(m_configuration);
         Engine::instance()->setDeveloperModeEnabled(true);
-        Engine::instance()->start();
+        Engine::instance()->start(m_configuration);
         runningSpy.wait();
         QVERIFY(runningSpy.count() == 1);
     }