diff --git a/debian/guh-tests.install b/debian/guh-tests.install
index 5a369d63..f70e50f4 100644
--- a/debian/guh-tests.install
+++ b/debian/guh-tests.install
@@ -1,2 +1,3 @@
 usr/tests/* usr/lib/guh/tests
 usr/lib/guh/plugins/libguh_devicepluginmock.so
+ust/lib/libguh-core.so
diff --git a/tests/auto/autotests.pri b/tests/auto/autotests.pri
index 572776ce..e0d31424 100644
--- a/tests/auto/autotests.pri
+++ b/tests/auto/autotests.pri
@@ -2,7 +2,12 @@ QT += testlib network sql
 CONFIG += testcase
 
 DEFINES += TESTING_ENABLED
-INCLUDEPATH += $$top_srcdir/server/ $$top_srcdir/server/jsonrpc $$top_srcdir/libguh $$top_srcdir/tests/auto/
+
+INCLUDEPATH += $$top_srcdir/server/ \
+               $$top_srcdir/server/jsonrpc \
+               $$top_srcdir/libguh \
+               $$top_srcdir/tests/auto/
+
 LIBS += -L$$top_builddir/libguh/ -lguh -L$$top_builddir/plugins/deviceplugins/mock/ \
         -L$$top_builddir/tests/libguh-core -lguh-core
 
diff --git a/tests/auto/guhtestbase.cpp b/tests/auto/guhtestbase.cpp
index 28725f0b..1c652337 100644
--- a/tests/auto/guhtestbase.cpp
+++ b/tests/auto/guhtestbase.cpp
@@ -31,6 +31,7 @@
 #include <QJsonParseError>
 #include <QSignalSpy>
 #include <QtTest>
+#include <QDebug>
 #include <QMetaType>
 #include <QNetworkReply>
 
@@ -81,6 +82,11 @@ void GuhTestBase::initTestCase()
     QVERIFY(spy.isValid());
     QVERIFY(spy.wait());
 
+    if (MockTcpServer::servers().isEmpty()) {
+        qWarning() << "no mock tcp server found";
+        exit(-1);
+    }
+
     m_mockTcpServer = MockTcpServer::servers().first();
     m_clientId = QUuid::createUuid();
 
diff --git a/tests/libguh-core/libguh-core.pro b/tests/libguh-core/libguh-core.pro
index a1f11269..65bee647 100644
--- a/tests/libguh-core/libguh-core.pro
+++ b/tests/libguh-core/libguh-core.pro
@@ -4,6 +4,8 @@ include(../../server/server.pri)
 TARGET = guh-core
 TEMPLATE = lib
 
+DEFINES += TESTING_ENABLED
+
 INCLUDEPATH += $$top_srcdir/server/ $$top_srcdir/server/jsonrpc $$top_srcdir/libguh $$top_srcdir/tests/auto/
 LIBS += -L$$top_builddir/libguh/ -lguh
 
diff --git a/tests/tests.pro b/tests/tests.pro
index e25aa8ff..8ecc454e 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,5 +1,4 @@
 TEMPLATE = subdirs
 
 SUBDIRS = auto libguh-core
-
 auto.depends = libguh-core