diff --git a/libnymea-core/cloud/awsconnector.h b/libnymea-core/cloud/awsconnector.h
index 7c9c6fc2..ce1272e3 100644
--- a/libnymea-core/cloud/awsconnector.h
+++ b/libnymea-core/cloud/awsconnector.h
@@ -36,7 +36,7 @@
 #include <QDateTime>
 #include <QTimer>
 
-#include <nymea-mqtt/mqttclient.h>
+#include <mqttclient.h>
 
 class AWSConnector : public QObject
 {
diff --git a/libnymea-core/cloud/cloudmanager.cpp b/libnymea-core/cloud/cloudmanager.cpp
index ce1c99b5..85c290d0 100644
--- a/libnymea-core/cloud/cloudmanager.cpp
+++ b/libnymea-core/cloud/cloudmanager.cpp
@@ -39,7 +39,7 @@
 
 #include <networkmanager.h>
 
-#include "nymea-remoteproxyclient/remoteproxyconnection.h"
+#include <remoteproxyconnection.h>
 #include <QDir>
 
 using namespace remoteproxyclient;
diff --git a/libnymea-core/cloud/cloudtransport.h b/libnymea-core/cloud/cloudtransport.h
index 58f5617e..a33fb4c1 100644
--- a/libnymea-core/cloud/cloudtransport.h
+++ b/libnymea-core/cloud/cloudtransport.h
@@ -33,7 +33,7 @@
 
 #include <QObject>
 #include "../transportinterface.h"
-#include "remoteproxyconnection.h"
+#include <remoteproxyconnection.h>
 
 namespace nymeaserver {
 
diff --git a/libnymea-core/servers/mqttbroker.cpp b/libnymea-core/servers/mqttbroker.cpp
index 0cc82c32..0e6c0973 100644
--- a/libnymea-core/servers/mqttbroker.cpp
+++ b/libnymea-core/servers/mqttbroker.cpp
@@ -31,7 +31,7 @@
 #include "mqttbroker.h"
 #include "loggingcategories.h"
 
-#include "nymea-mqtt/mqttserver.h"
+#include <mqttserver.h>
 
 namespace nymeaserver {
 
diff --git a/libnymea-core/servers/mqttbroker.h b/libnymea-core/servers/mqttbroker.h
index 378922c6..6a98c397 100644
--- a/libnymea-core/servers/mqttbroker.h
+++ b/libnymea-core/servers/mqttbroker.h
@@ -35,7 +35,7 @@
 #include <QHostAddress>
 #include <QSslConfiguration>
 
-#include "nymea-mqtt/mqtt.h"
+#include <mqtt.h>
 #include "nymeaconfiguration.h"
 
 class MqttServer;
diff --git a/tests/auto/autotests.pri b/tests/auto/autotests.pri
index 6b3a86b6..e2572913 100644
--- a/tests/auto/autotests.pri
+++ b/tests/auto/autotests.pri
@@ -1,5 +1,6 @@
 QT += dbus testlib network sql websockets
 CONFIG += testcase
+CONFIG += link_pkgconfig
 
 INCLUDEPATH += $$top_srcdir/libnymea \
                $$top_srcdir/libnymea-core \
diff --git a/tests/auto/mqttbroker/mqttbroker.pro b/tests/auto/mqttbroker/mqttbroker.pro
index 1faef37b..3d1e2e7b 100644
--- a/tests/auto/mqttbroker/mqttbroker.pro
+++ b/tests/auto/mqttbroker/mqttbroker.pro
@@ -2,7 +2,8 @@ include(../../../nymea.pri)
 include(../autotests.pri)
 
 QT += xml
+PKGCONFIG += nymea-mqtt
 
-LIBS += -lnymea-mqtt
 TARGET = mqttbroker
 SOURCES += testmqttbroker.cpp
+
diff --git a/tests/auto/mqttbroker/testmqttbroker.cpp b/tests/auto/mqttbroker/testmqttbroker.cpp
index 29723e0b..0af354b2 100644
--- a/tests/auto/mqttbroker/testmqttbroker.cpp
+++ b/tests/auto/mqttbroker/testmqttbroker.cpp
@@ -33,7 +33,7 @@
 #include "servers/mqttbroker.h"
 #include "servers/mocktcpserver.h"
 
-#include "nymea-mqtt/mqttclient.h"
+#include <mqttclient.h>
 
 #include <QXmlReader>