diff --git a/gui/test/benchmark/simple/benchmarksimple.cpp b/gui/test/benchmark/simple/benchmarksimple.cpp
index 435d28e0b..22bcb268e 100644
--- a/gui/test/benchmark/simple/benchmarksimple.cpp
+++ b/gui/test/benchmark/simple/benchmarksimple.cpp
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest>
 #include <QObject>
 #include <QFile>
 #include <QString>
diff --git a/gui/test/benchmark/simple/benchmarksimple.h b/gui/test/benchmark/simple/benchmarksimple.h
index df1f75421..04ff61155 100644
--- a/gui/test/benchmark/simple/benchmarksimple.h
+++ b/gui/test/benchmark/simple/benchmarksimple.h
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest>
+#include <QtTest/QtTest>
 #include <QObject>
 #include "errorlogger.h"
 
diff --git a/gui/test/benchmark/simple/simple.pro b/gui/test/benchmark/simple/simple.pro
index ef25b2ce5..895f8ebc2 100644
--- a/gui/test/benchmark/simple/simple.pro
+++ b/gui/test/benchmark/simple/simple.pro
@@ -5,6 +5,8 @@ INCLUDEPATH += .
 OBJECTS_DIR = ../../build
 MOC_DIR = ../../build
 
+QT += testlib
+
 include(../../common.pri)
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/gui/test/filelist/filelist.pro b/gui/test/filelist/filelist.pro
index 75fedadd7..c5e29cd71 100644
--- a/gui/test/filelist/filelist.pro
+++ b/gui/test/filelist/filelist.pro
@@ -4,6 +4,7 @@ DEPENDPATH += .
 INCLUDEPATH += .
 OBJECTS_DIR = ../build
 MOC_DIR = ../build
+QT += testlib
 
 include(../common.pri)
 
diff --git a/gui/test/filelist/testfilelist.cpp b/gui/test/filelist/testfilelist.cpp
index 5a8d5c483..2117e7375 100644
--- a/gui/test/filelist/testfilelist.cpp
+++ b/gui/test/filelist/testfilelist.cpp
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest>
 #include <QObject>
 #include <QDir>
 #include <QString>
diff --git a/gui/test/filelist/testfilelist.h b/gui/test/filelist/testfilelist.h
index 8251c84c2..e6494f0eb 100644
--- a/gui/test/filelist/testfilelist.h
+++ b/gui/test/filelist/testfilelist.h
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest>
+#include <QtTest/QtTest>
 #include <QObject>
 
 class TestFileList: public QObject {
diff --git a/gui/test/projectfile/projectfile.pro b/gui/test/projectfile/projectfile.pro
index 054ade280..bc6b6c2d6 100644
--- a/gui/test/projectfile/projectfile.pro
+++ b/gui/test/projectfile/projectfile.pro
@@ -4,6 +4,7 @@ DEPENDPATH += .
 INCLUDEPATH += .
 OBJECTS_DIR = ../build
 MOC_DIR = ../build
+QT += widgets testlib
 
 include(../common.pri)
 
diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
index f96642c23..4fd0c14b7 100644
--- a/gui/test/projectfile/testprojectfile.cpp
+++ b/gui/test/projectfile/testprojectfile.cpp
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest>
 #include <QObject>
 #include "testprojectfile.h"
 #include "projectfile.h"
diff --git a/gui/test/projectfile/testprojectfile.h b/gui/test/projectfile/testprojectfile.h
index 6275de38b..56a321761 100644
--- a/gui/test/projectfile/testprojectfile.h
+++ b/gui/test/projectfile/testprojectfile.h
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest>
+#include <QtTest/QtTest>
 #include <QObject>
 
 class TestProjectFile: public QObject {
diff --git a/gui/test/translationhandler/testtranslationhandler.cpp b/gui/test/translationhandler/testtranslationhandler.cpp
index 5878407c3..594641c10 100644
--- a/gui/test/translationhandler/testtranslationhandler.cpp
+++ b/gui/test/translationhandler/testtranslationhandler.cpp
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest>
 #include <QObject>
 #include "testtranslationhandler.h"
 #include "translationhandler.h"
diff --git a/gui/test/translationhandler/testtranslationhandler.h b/gui/test/translationhandler/testtranslationhandler.h
index 0b55f0c3c..60dbde94c 100644
--- a/gui/test/translationhandler/testtranslationhandler.h
+++ b/gui/test/translationhandler/testtranslationhandler.h
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest>
+#include <QtTest/QtTest>
 #include <QObject>
 
 class TestTranslationHandler: public QObject {
diff --git a/gui/test/translationhandler/translationhandler.pro b/gui/test/translationhandler/translationhandler.pro
index 58880ef63..f653eb5f6 100644
--- a/gui/test/translationhandler/translationhandler.pro
+++ b/gui/test/translationhandler/translationhandler.pro
@@ -4,6 +4,7 @@ DEPENDPATH += .
 INCLUDEPATH += .
 OBJECTS_DIR = ../build
 MOC_DIR = ../build
+QT += widgets testlib
 
 include(../common.pri)
 
diff --git a/gui/test/xmlreport/testxmlreport.cpp b/gui/test/xmlreport/testxmlreport.cpp
index 2c597dd91..de16797a7 100644
--- a/gui/test/xmlreport/testxmlreport.cpp
+++ b/gui/test/xmlreport/testxmlreport.cpp
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest>
 #include <QObject>
 #include "testxmlreport.h"
 #include "xmlreport.h"
diff --git a/gui/test/xmlreport/testxmlreport.h b/gui/test/xmlreport/testxmlreport.h
index f7591bf02..88b3ed206 100644
--- a/gui/test/xmlreport/testxmlreport.h
+++ b/gui/test/xmlreport/testxmlreport.h
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest>
+#include <QtTest/QtTest>
 #include <QObject>
 
 class TestXmlReport: public QObject {
diff --git a/gui/test/xmlreport/xmlreport.pro b/gui/test/xmlreport/xmlreport.pro
index 6e1bcc4a6..22e8176b5 100644
--- a/gui/test/xmlreport/xmlreport.pro
+++ b/gui/test/xmlreport/xmlreport.pro
@@ -4,6 +4,7 @@ DEPENDPATH += .
 INCLUDEPATH += .
 OBJECTS_DIR = ../build
 MOC_DIR = ../build
+QT += testlib
 
 include(../common.pri)
 
diff --git a/gui/test/xmlreportv2/testxmlreportv2.cpp b/gui/test/xmlreportv2/testxmlreportv2.cpp
index 1e4732db6..b0ae02f63 100644
--- a/gui/test/xmlreportv2/testxmlreportv2.cpp
+++ b/gui/test/xmlreportv2/testxmlreportv2.cpp
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest>
 #include <QObject>
 #include "testxmlreportv2.h"
 #include "xmlreportv2.h"
diff --git a/gui/test/xmlreportv2/testxmlreportv2.h b/gui/test/xmlreportv2/testxmlreportv2.h
index 0454deee6..e95bcb0f1 100644
--- a/gui/test/xmlreportv2/testxmlreportv2.h
+++ b/gui/test/xmlreportv2/testxmlreportv2.h
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest>
+#include <QtTest/QtTest>
 #include <QObject>
 
 class TestXmlReportV2: public QObject {
diff --git a/gui/test/xmlreportv2/xmlreportv2.pro b/gui/test/xmlreportv2/xmlreportv2.pro
index fb1539a74..d55af30eb 100644
--- a/gui/test/xmlreportv2/xmlreportv2.pro
+++ b/gui/test/xmlreportv2/xmlreportv2.pro
@@ -4,6 +4,7 @@ DEPENDPATH += .
 INCLUDEPATH += .
 OBJECTS_DIR = ../build
 MOC_DIR = ../build
+QT += testlib
 
 include(../common.pri)