4 files changed, 10 insertions, 9 deletions
diff --git a/tests/auto/tools/moc/moc.pro b/tests/auto/tools/moc/moc.pro
index 78f9aeed9a..37e33a12d1 100644
--- a/tests/auto/tools/moc/moc.pro
+++ b/tests/auto/tools/moc/moc.pro
@@ -1,4 +1,5 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_moc
 
 #exists(/usr/include/boost/spirit.hpp) {
 #    message("including boost headers in test")
@@ -21,7 +22,7 @@ if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win
 SOURCES += tst_moc.cpp
 
 QT -= gui
-QT += sql network
+QT += sql network testlib
 contains(QT_CONFIG, dbus){
     DEFINES += WITH_DBUS
     QT += dbus
diff --git a/tests/auto/tools/qmake/qmake.pro b/tests/auto/tools/qmake/qmake.pro
index 02f7e56d11..d535c9c0b8 100644
--- a/tests/auto/tools/qmake/qmake.pro
+++ b/tests/auto/tools/qmake/qmake.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmake
 HEADERS += testcompiler.h
 SOURCES += tst_qmake.cpp testcompiler.cpp
-QT -= gui
+QT = core testlib
 
 cross_compile: DEFINES += QMAKE_CROSS_COMPILED
diff --git a/tests/auto/tools/rcc/rcc.pro b/tests/auto/tools/rcc/rcc.pro
index 1b85ff586a..ebe36cfaff 100644
--- a/tests/auto/tools/rcc/rcc.pro
+++ b/tests/auto/tools/rcc/rcc.pro
@@ -1,6 +1,5 @@
-CONFIG += qttest_p4
-
-QT = core
+CONFIG += testcase
+QT = core testlib
 TARGET = tst_rcc
 
 SOURCES += tst_rcc.cpp
diff --git a/tests/auto/tools/uic/uic.pro b/tests/auto/tools/uic/uic.pro
index 401c47770a..98463c3944 100644
--- a/tests/auto/tools/uic/uic.pro
+++ b/tests/auto/tools/uic/uic.pro
@@ -1,6 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
 
-QT = core
+QT = core testlib
 SOURCES += tst_uic.cpp
 TARGET = tst_uic