diff --git a/client/tests/testAdminSelfHostedExport.cpp b/client/tests/testAdminSelfHostedExport.cpp
index 9cd8a6976..439a93b27 100644
--- a/client/tests/testAdminSelfHostedExport.cpp
+++ b/client/tests/testAdminSelfHostedExport.cpp
@@ -1,4 +1,3 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -7,6 +6,12 @@
 #include <QUuid>
 #include <QSignalSpy>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "vpnConnection.h"
diff --git a/client/tests/testComplexOperations.cpp b/client/tests/testComplexOperations.cpp
index 878a12510..931f6a51b 100644
--- a/client/tests/testComplexOperations.cpp
+++ b/client/tests/testComplexOperations.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "vpnConnection.h"
diff --git a/client/tests/testDefaultServerChange.cpp b/client/tests/testDefaultServerChange.cpp
index adffde62f..675a8fa1e 100644
--- a/client/tests/testDefaultServerChange.cpp
+++ b/client/tests/testDefaultServerChange.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "ui/models/serversModel.h"
diff --git a/client/tests/testGatewayStacks.cpp b/client/tests/testGatewayStacks.cpp
index acffe39bb..2271f07f1 100644
--- a/client/tests/testGatewayStacks.cpp
+++ b/client/tests/testGatewayStacks.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "vpnConnection.h"
diff --git a/client/tests/testMultipleExports.cpp b/client/tests/testMultipleExports.cpp
index e84708b9d..c88af391e 100644
--- a/client/tests/testMultipleExports.cpp
+++ b/client/tests/testMultipleExports.cpp
@@ -2,10 +2,15 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QSignalSpy>
-#include <QTest>
 #include <QUuid>
 #include <QProcessEnvironment>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "secureQSettings.h"
diff --git a/client/tests/testMultipleImports.cpp b/client/tests/testMultipleImports.cpp
index 44a0acd3c..e4ad96d3c 100644
--- a/client/tests/testMultipleImports.cpp
+++ b/client/tests/testMultipleImports.cpp
@@ -1,10 +1,15 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QDebug>
 #include <QUuid>
 #include <QSignalSpy>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "vpnConnection.h"
diff --git a/client/tests/testSelfHostedServerSetup.cpp b/client/tests/testSelfHostedServerSetup.cpp
index a44725556..184b40e32 100644
--- a/client/tests/testSelfHostedServerSetup.cpp
+++ b/client/tests/testSelfHostedServerSetup.cpp
@@ -1,4 +1,3 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
@@ -6,6 +5,12 @@
 #include <QProcessEnvironment>
 #include <QDebug>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "core/models/selfhosted/selfHostedServerConfig.h"
diff --git a/client/tests/testSerialization.cpp b/client/tests/testSerialization.cpp
index 1a32b5a23..edd8b74f3 100644
--- a/client/tests/testSerialization.cpp
+++ b/client/tests/testSerialization.cpp
@@ -3,9 +3,14 @@
 #include <QJsonObject>
 #include <QProcessEnvironment>
 #include <QSignalSpy>
-#include <QTest>
 #include <QUuid>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "core/utils/serialization/serialization.h"
diff --git a/client/tests/testServerEdgeCases.cpp b/client/tests/testServerEdgeCases.cpp
index 53c358d20..82e0b6ee6 100644
--- a/client/tests/testServerEdgeCases.cpp
+++ b/client/tests/testServerEdgeCases.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "vpnConnection.h"
diff --git a/client/tests/testServerEdit.cpp b/client/tests/testServerEdit.cpp
index 57f18ef12..45009dc1c 100644
--- a/client/tests/testServerEdit.cpp
+++ b/client/tests/testServerEdit.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "ui/models/serversModel.h"
diff --git a/client/tests/testServersModelSync.cpp b/client/tests/testServersModelSync.cpp
index a1e63ccce..773d720b9 100644
--- a/client/tests/testServersModelSync.cpp
+++ b/client/tests/testServersModelSync.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "ui/models/serversModel.h"
diff --git a/client/tests/testSettingsSignals.cpp b/client/tests/testSettingsSignals.cpp
index e0308a56c..eef42b54c 100644
--- a/client/tests/testSettingsSignals.cpp
+++ b/client/tests/testSettingsSignals.cpp
@@ -1,10 +1,15 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
 #include <QLocale>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "ui/controllers/settingsUiController.h"
diff --git a/client/tests/testSignalOrder.cpp b/client/tests/testSignalOrder.cpp
index 97b7cb29e..61304dd19 100644
--- a/client/tests/testSignalOrder.cpp
+++ b/client/tests/testSignalOrder.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "vpnConnection.h"
diff --git a/client/tests/testUiAllowedDnsModelAndController.cpp b/client/tests/testUiAllowedDnsModelAndController.cpp
index 8e600b042..07ee6ce2c 100644
--- a/client/tests/testUiAllowedDnsModelAndController.cpp
+++ b/client/tests/testUiAllowedDnsModelAndController.cpp
@@ -3,9 +3,14 @@
 #include <QJsonObject>
 #include <QProcessEnvironment>
 #include <QSignalSpy>
-#include <QTest>
 #include <QUuid>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "secureQSettings.h"
diff --git a/client/tests/testUiAppSTModelAndController.cpp b/client/tests/testUiAppSTModelAndController.cpp
index 761d11806..26c1f2aef 100644
--- a/client/tests/testUiAppSTModelAndController.cpp
+++ b/client/tests/testUiAppSTModelAndController.cpp
@@ -3,9 +3,14 @@
 #include <QJsonObject>
 #include <QProcessEnvironment>
 #include <QSignalSpy>
-#include <QTest>
 #include <QUuid>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "secureQSettings.h"
diff --git a/client/tests/testUiLanguageModelAndController.cpp b/client/tests/testUiLanguageModelAndController.cpp
index 521c68b54..699e14902 100644
--- a/client/tests/testUiLanguageModelAndController.cpp
+++ b/client/tests/testUiLanguageModelAndController.cpp
@@ -3,9 +3,14 @@
 #include <QJsonObject>
 #include <QProcessEnvironment>
 #include <QSignalSpy>
-#include <QTest>
 #include <QUuid>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "secureQSettings.h"
diff --git a/client/tests/testUiServersModelAndController.cpp b/client/tests/testUiServersModelAndController.cpp
index 16039e988..9cb500e93 100644
--- a/client/tests/testUiServersModelAndController.cpp
+++ b/client/tests/testUiServersModelAndController.cpp
@@ -1,4 +1,3 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -7,6 +6,12 @@
 #include <QSignalSpy>
 #include <QModelIndex>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "core/controllers/selfhosted/importController.h"
diff --git a/client/tests/testUiSitesModelAndController.cpp b/client/tests/testUiSitesModelAndController.cpp
index aa815aff8..4734e0f52 100644
--- a/client/tests/testUiSitesModelAndController.cpp
+++ b/client/tests/testUiSitesModelAndController.cpp
@@ -3,9 +3,14 @@
 #include <QJsonObject>
 #include <QProcessEnvironment>
 #include <QSignalSpy>
-#include <QTest>
 #include <QUuid>
 
+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "secureQSettings.h"