diff --git a/tests/auto/autotests.pri b/tests/auto/autotests.pri
index c9dc941b..572776ce 100644
--- a/tests/auto/autotests.pri
+++ b/tests/auto/autotests.pri
@@ -1,11 +1,10 @@
 QT += testlib network sql
 CONFIG += testcase
 
-include($$top_srcdir/server/server.pri)
-
 DEFINES += TESTING_ENABLED
 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/
+LIBS += -L$$top_builddir/libguh/ -lguh -L$$top_builddir/plugins/deviceplugins/mock/ \
+        -L$$top_builddir/tests/libguh-core -lguh-core
 
 SOURCES += ../guhtestbase.cpp \
     ../mocktcpserver.cpp \
diff --git a/tests/libguh-core/libguh-core.pro b/tests/libguh-core/libguh-core.pro
new file mode 100644
index 00000000..a1f11269
--- /dev/null
+++ b/tests/libguh-core/libguh-core.pro
@@ -0,0 +1,13 @@
+include(../../guh.pri)
+include(../../server/server.pri)
+
+TARGET = guh-core
+TEMPLATE = lib
+
+INCLUDEPATH += $$top_srcdir/server/ $$top_srcdir/server/jsonrpc $$top_srcdir/libguh $$top_srcdir/tests/auto/
+LIBS += -L$$top_builddir/libguh/ -lguh
+
+QT += sql
+
+target.path = /usr/lib
+INSTALLS += target
diff --git a/tests/tests.pro b/tests/tests.pro
index 7fbc8a94..e25aa8ff 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,5 @@
 TEMPLATE = subdirs
-SUBDIRS = auto
+
+SUBDIRS = auto libguh-core
+
+auto.depends = libguh-core