diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index d07cccf6..2630aad4 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -14,8 +14,6 @@ SUBDIRS = versioning \
         restplugins \
         restvendors \
         restrules \
+        websocketserver \
 
-contains(DEFINES, WEBSOCKET){
-    SUBDIRS += websocketserver
-}
 
diff --git a/tests/auto/websocketserver/testwebsocketserver.cpp b/tests/auto/websocketserver/testwebsocketserver.cpp
index 3e5ff6bb..e543baa8 100644
--- a/tests/auto/websocketserver/testwebsocketserver.cpp
+++ b/tests/auto/websocketserver/testwebsocketserver.cpp
@@ -29,9 +29,12 @@
 #include <QMetaType>
 #include <QByteArray>
 #include <QSignalSpy>
-#include <QWebSocket>
 #include <QJsonDocument>
 
+#ifdef WEBSOCKET
+#include <QWebSocket>
+#endif
+
 using namespace guhserver;
 
 class TestWebSocketServer: public GuhTestBase
@@ -39,16 +42,19 @@ class TestWebSocketServer: public GuhTestBase
     Q_OBJECT
 
 private slots:
+#ifdef WEBSOCKET
+
     void testHandshake();
 
     void pingTest();
 
     void introspect();
-
+#endif
 private:
 
 };
 
+#ifdef WEBSOCKET
 
 void TestWebSocketServer::testHandshake()
 {
@@ -89,5 +95,7 @@ void TestWebSocketServer::introspect()
 
 }
 
+#endif
+
 #include "testwebsocketserver.moc"
 QTEST_MAIN(TestWebSocketServer)
diff --git a/tests/auto/websocketserver/websocketserver.pro b/tests/auto/websocketserver/websocketserver.pro
index 281a146d..9fdccde3 100644
--- a/tests/auto/websocketserver/websocketserver.pro
+++ b/tests/auto/websocketserver/websocketserver.pro
@@ -1,7 +1,9 @@
 include(../../../guh.pri)
 include(../autotests.pri)
 
-QT += websockets
+contains(DEFINES, WEBSOCKET){
+    QT += websockets
+}
 
 TARGET = websocketserver
 SOURCES += testwebsocketserver.cpp