diff --git a/tests/auto/aggregation/aggregation.pro b/tests/auto/aggregation/aggregation.pro
index ca1d1205a35ac31fa43968e3a987bd141519f4e9..ae45e5f9d6874927559c8b1fcfb862334744c959 100644
--- a/tests/auto/aggregation/aggregation.pro
+++ b/tests/auto/aggregation/aggregation.pro
@@ -1,4 +1,4 @@
-CONFIG += qtestlib
+CONFIG += qtestlib testcase
 TEMPLATE = app
 CONFIG -= app_bundle
 DEFINES += AGGREGATION_LIBRARY
diff --git a/tests/auto/changeset/changeset.pro b/tests/auto/changeset/changeset.pro
index 5aa2358a65b7fd4ad0fa50488d254d86a47fdf3a..0d2522e88041dab53093e5bfb49c1c54d4f55b60 100644
--- a/tests/auto/changeset/changeset.pro
+++ b/tests/auto/changeset/changeset.pro
@@ -1,5 +1,4 @@
-
-QT += testlib
+CONFIG += qtestlib testcase
 
 # Defines import symbol as empty
 DEFINES+=QTCREATOR_UTILS_STATIC_LIB
diff --git a/tests/auto/cplusplus/ast/ast.pro b/tests/auto/cplusplus/ast/ast.pro
index 05435839c6c96b7acd03efcd4f8c491d6f6d65a3..13f11c7e2e274f04891f83771e4be9bbfeffa26e 100644
--- a/tests/auto/cplusplus/ast/ast.pro
+++ b/tests/auto/cplusplus/ast/ast.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
 include(../shared/shared.pri)
 SOURCES += tst_ast.cpp
 TARGET=tst_$$TARGET
diff --git a/tests/auto/cplusplus/codeformatter/codeformatter.pro b/tests/auto/cplusplus/codeformatter/codeformatter.pro
index de80180f9f67b70aa54f31bec59e5d9482e0e551..6ebd7722237301d05b857eeff461e8e5d9e01644 100644
--- a/tests/auto/cplusplus/codeformatter/codeformatter.pro
+++ b/tests/auto/cplusplus/codeformatter/codeformatter.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
 
 include(../shared/shared.pri)
 
diff --git a/tests/auto/cplusplus/findusages/findusages.pro b/tests/auto/cplusplus/findusages/findusages.pro
index c3e38b6674ac52951591729e936b7591539b7cdd..c61766178846151562d80f343a9c12083afe7cb0 100644
--- a/tests/auto/cplusplus/findusages/findusages.pro
+++ b/tests/auto/cplusplus/findusages/findusages.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
 include(../shared/shared.pri)
 SOURCES += tst_findusages.cpp
 TARGET=tst_$$TARGET
diff --git a/tests/auto/cplusplus/lookup/lookup.pro b/tests/auto/cplusplus/lookup/lookup.pro
index 9011a33f612d0a6014c6baaf4fdb720532849333..60aadad47e65b9d5c15d8782068d911a0d0eb158 100644
--- a/tests/auto/cplusplus/lookup/lookup.pro
+++ b/tests/auto/cplusplus/lookup/lookup.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
 include(../shared/shared.pri)
 SOURCES += tst_lookup.cpp
 TARGET=tst_$$TARGET
diff --git a/tests/auto/cplusplus/preprocessor/preprocessor.pro b/tests/auto/cplusplus/preprocessor/preprocessor.pro
index bc7c98ea4eaf0f6392b582865335f14a85956161..6e4af547bb4e40fded21e9f6fc9382510bc063fa 100644
--- a/tests/auto/cplusplus/preprocessor/preprocessor.pro
+++ b/tests/auto/cplusplus/preprocessor/preprocessor.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
 TARGET = tst_$$TARGET
 include(../shared/shared.pri)
 SOURCES += tst_preprocessor.cpp
diff --git a/tests/auto/cplusplus/semantic/semantic.pro b/tests/auto/cplusplus/semantic/semantic.pro
index 2198ab78c736fff168af5e92e7a55018f6c8d617..23a18cf37b9bbabc7fcb03eb562b12b6a927fde1 100644
--- a/tests/auto/cplusplus/semantic/semantic.pro
+++ b/tests/auto/cplusplus/semantic/semantic.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
 include(../shared/shared.pri)
 
 SOURCES += tst_semantic.cpp
diff --git a/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro b/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro
index f9b35bba719457a338d05d7386cd58a44ae06341..2e884365c1f41a76b005721176b8b7432597b96b 100644
--- a/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro
+++ b/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG += qt warn_on console depend_includepath
-QT += testlib
+CONFIG += qtestlib testcase
 include(../shared/shared.pri)
 SOURCES += tst_typeprettyprinter.cpp
 TARGET=tst_$$TARGET
diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro
index 201c36cb436661b3c2d92aaafed17eeced9efe4b..8ba21aa01720973723a06a26bdb32a7393609a89 100644
--- a/tests/auto/debugger/dumpers.pro
+++ b/tests/auto/debugger/dumpers.pro
@@ -1,4 +1,4 @@
-QT += testlib
+CONFIG += qtestlib testcase
 
 DEBUGGERDIR = ../../../src/plugins/debugger
 UTILSDIR    = ../../../src/libs
diff --git a/tests/auto/debugger/gdb.pro b/tests/auto/debugger/gdb.pro
index d455843aa7373c6917112f0ce4c0ec1a8aaeeb95..d4b7503a789af1bf0b88c1594f7b14a47f9fd6b5 100644
--- a/tests/auto/debugger/gdb.pro
+++ b/tests/auto/debugger/gdb.pro
@@ -1,4 +1,4 @@
-QT += testlib
+CONFIG += qtestlib testcase
 
 QT -= gui
 
diff --git a/tests/auto/debugger/plugin.pro b/tests/auto/debugger/plugin.pro
index 7cc42dac75082c2cf96e852fdef06612beae565f..53936e2349feea641cd0546a0b088b66413acd0d 100644
--- a/tests/auto/debugger/plugin.pro
+++ b/tests/auto/debugger/plugin.pro
@@ -1,5 +1,4 @@
-QT += testlib
-
+CONFIG += qtestlib testcase
 
 DEBUGGERDIR = ../../../src/plugins/debugger
 UTILSDIR    = ../../../src/libs
diff --git a/tests/auto/debugger/version.pro b/tests/auto/debugger/version.pro
index 78d3f0f77c545655efaf16b6eadd9659dfbe4780..9e8069c07db897e65c640d93e9552c29bb09667e 100644
--- a/tests/auto/debugger/version.pro
+++ b/tests/auto/debugger/version.pro
@@ -1,4 +1,4 @@
-QT += testlib
+CONFIG += qtestlib testcase
 QT -= gui
 
 UTILSDIR    = ../../../src/libs
diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index aef6b9ce30da2128d2ca8b2b0bb87dc37858eb26..6d119a9703447d09e6b27253a9b996d0fd1265b3 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -1,5 +1,4 @@
-
-QT += testlib
+CONFIG += qtestlib testcase
 
 # Defines import symbol as empty
 DEFINES+=QTCREATOR_UTILS_STATIC_LIB
diff --git a/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro b/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
index e8e65085daa85591f978f2bc193314b60b548144..1342b49e6e04943d86acfcb29a3facd4ecdc5635 100644
--- a/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
+++ b/tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
@@ -1,4 +1,5 @@
-QT += gui testlib
+QT += gui
+CONFIG += qtestlib testcase
 
 PLUGINSDIR = ../../../../src/plugins
 TEXTEDITORDIR = $$PLUGINSDIR/texteditor
diff --git a/tests/auto/generichighlighter/specificrules/specificrules.pro b/tests/auto/generichighlighter/specificrules/specificrules.pro
index 889ff8a7376725e2af867590766d7ffa1aee69d8..374456b33cc1dd532c6993bafc2f4d692f3ceeb6 100644
--- a/tests/auto/generichighlighter/specificrules/specificrules.pro
+++ b/tests/auto/generichighlighter/specificrules/specificrules.pro
@@ -1,4 +1,4 @@
-QT += testlib
+CONFIG += qtestlib testcase
 
 PLUGINSDIR = ../../../../src/plugins
 
diff --git a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
index 713ef373b63ce70e8ae3213015d991c905c52932..886207cc6913415449a012ec6c224c8662eca609 100644
--- a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
+++ b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
@@ -1,6 +1,6 @@
 include(../../../../../qtcreator.pri)
 #include(../../../../../src/plugins/qmldesigner/config.pri)
-QT += testlib
+CONFIG += qtestlib testcase
 
 ##DEFINES += DONT_MESS_WITH_QDEBUG
 
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index 2aa0380e74c9d4f091a6051246f0e88efa1378ef..45e6cbf35b0a48f495fb2c94073f84daaf8ee07b 100644
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -2,10 +2,11 @@ include(../../../../../qtcreator.pri)
 
 include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
 
-QT += testlib \
-    script \
+QT += script \
     declarative
 
+CONFIG += qtestlib testcase
+
 # DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
 DEFINES+=QTCREATORDIR=\\\"$$CREATORDIR\\\"
 DEFINES+=QT_CREATOR QTCREATOR_TEST
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro
index b4b4577d86b1bc269d8a99fc6998ee0d429a3a17..650c12a68a1f05d7ff44f53eb3f474ae5765505a 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.pro
@@ -2,9 +2,9 @@ TEMPLATE = app
 
 CONFIG += qt warn_on console depend_includepath
 CONFIG -= app_bundle
+CONFIG += qtestlib testcase
 
-QT += testlib \
-    script \
+QT += script \
     declarative
 
 PLUGIN_DIR=../../../../../src/plugins/qmlprojectmanager