diff --git a/tests/auto/cplusplus/codeformatter/codeformatter.pro b/tests/auto/cplusplus/codeformatter/codeformatter.pro
index 892db0c693b..e97b551231b 100644
--- a/tests/auto/cplusplus/codeformatter/codeformatter.pro
+++ b/tests/auto/cplusplus/codeformatter/codeformatter.pro
@@ -3,13 +3,6 @@ include(../shared/shared.pri)
 
 SRCDIR = ../../../../src
 
-SOURCES += \
-    tst_codeformatter.cpp \
-    $$SRCDIR/plugins/cpptools/cppcodeformatter.cpp \
-    $$SRCDIR/plugins/texteditor/basetextdocumentlayout.cpp
-
-HEADERS += \
-    $$SRCDIR/plugins/cpptools/cppcodeformatter.h \
-    $$SRCDIR/plugins/texteditor/basetextdocumentlayout.h
+SOURCES += tst_codeformatter.cpp
 
 INCLUDEPATH += $$SRCDIR/plugins $$SRCDIR/libs
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp
index 1beff8072c7..c2f4b7c3076 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp
@@ -30,6 +30,7 @@
 #include "plugin1.h"
 
 #include <QtCore/qplugin.h>
+#include <QStringList>
 
 using namespace Plugin1;
 
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro
index 859bfe586e7..05e50cf8d47 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro
@@ -14,3 +14,6 @@ COPYFILES = $$OTHER_FILES
 include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin1)
+
+DESTDIR = $$OUT_PWD/../lib
+LIBS += -L$$OUT_PWD/../lib
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro
index 01942c2ec23..cafef0b1975 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro
@@ -14,3 +14,6 @@ COPYFILES = $$OTHER_FILES
 include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin2)
+
+DESTDIR = $$OUT_PWD/../lib
+LIBS += -L$$OUT_PWD/../lib
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro
index d3534184e8e..1cb438ddc9b 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro
@@ -14,3 +14,6 @@ COPYFILES = $$OTHER_FILES
 include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin3)
+
+DESTDIR = $$OUT_PWD/../lib
+LIBS += -L$$OUT_PWD/../lib
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro
index cc61cfd690f..30d319b29d7 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro
@@ -15,10 +15,12 @@ include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin1)
 
-LIBS += -L$${OUT_PWD}/../plugin2 -L$${OUT_PWD}/../plugin3 -l$$qtLibraryName(plugin2) -l$$qtLibraryName(plugin3)
+DESTDIR = $$OUT_PWD/../lib
+LIBS += -L$$OUT_PWD/../lib
+
+LIBS += -l$$qtLibraryName(plugin2) -l$$qtLibraryName(plugin3)
 
 macx {
 } else:unix {
-    QMAKE_RPATHDIR += $${OUT_PWD}/../plugin2
-    QMAKE_RPATHDIR += $${OUT_PWD}/../plugin3
+    QMAKE_RPATHDIR += $$OUT_PWD/../lib
 }
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro
index a56a05066a5..f264f9dd28d 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro
@@ -15,6 +15,9 @@ include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin2)
 
+DESTDIR = $$OUT_PWD/../lib
+LIBS += -L$$OUT_PWD/../lib
+
 macx {
     QMAKE_LFLAGS_SONAME = -Wl,-install_name,$${OUT_PWD}/
 }
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro
index 43c1149573b..5dfa14fd5c8 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro
@@ -15,10 +15,12 @@ include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin3)
 
-LIBS += -L$${OUT_PWD}/../plugin2 -l$$qtLibraryName(plugin2)
+DESTDIR = $$OUT_PWD/../lib
+LIBS += -L$$OUT_PWD/../lib
+LIBS += -l$$qtLibraryName(plugin2)
 
 macx {
     QMAKE_LFLAGS_SONAME = -Wl,-install_name,$${OUT_PWD}/
 } else:unix {
-    QMAKE_RPATHDIR += $${OUT_PWD}/../plugin2
+    QMAKE_RPATHDIR += $OUT_PWD/../lib
 }
diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index 35b9e32fe09..b01b54f4683 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -3,7 +3,7 @@ include(../qttest.pri)
 # Defines import symbol as empty
 DEFINES+=QTCREATOR_UTILS_STATIC_LIB
 
-include(../../../src/libs/utils/utils-lib.pri)
+include(../../../src/libs/utils/utils.pri)
 
 FAKEVIMDIR = ../../../src/plugins/fakevim
 UTILSDIR = ../../../src/libs
diff --git a/tests/manual/cplusplus-frontend/cplusplus-frontend.pro b/tests/manual/cplusplus-frontend/cplusplus-frontend.pro
index 4964d9c5ea7..a054ad99806 100644
--- a/tests/manual/cplusplus-frontend/cplusplus-frontend.pro
+++ b/tests/manual/cplusplus-frontend/cplusplus-frontend.pro
@@ -2,7 +2,7 @@ QT = core gui
 macx:CONFIG -= app_bundle
 TARGET = cplusplus0
 
-include(../../../src/libs/cplusplus/cplusplus-lib.pri)
+include(../../../src/libs/cplusplus/cplusplus.pri)
 
 # Input
 SOURCES += main.cpp
diff --git a/tests/manual/fakevim/fakevim.pro b/tests/manual/fakevim/fakevim.pro
index 3bfb4a3e524..df177d3a710 100644
--- a/tests/manual/fakevim/fakevim.pro
+++ b/tests/manual/fakevim/fakevim.pro
@@ -1,24 +1,17 @@
-FAKEVIMHOME = ../../../src/plugins/fakevim
-LIBSDIR = ../../../src/libs
+include(../../../qtcreator.pri)
+include(../../../src/libs/utils/utils.pri)
 
-SOURCES += \
-	main.cpp \
-	$$FAKEVIMHOME/fakevimhandler.cpp \
-	$$FAKEVIMHOME/fakevimactions.cpp \
-        $$FAKEVIMHOME/fakevimsyntax.cpp \
-        $$LIBSDIR/utils/basevalidatinglineedit.cpp \
-        $$LIBSDIR/utils/environment.cpp \
-        $$LIBSDIR/utils/pathchooser.cpp \
-        $$LIBSDIR/utils/savedaction.cpp
+FAKEVIMDIR = $$IDE_SOURCE_TREE/src/plugins/fakevim
+LIBSDIR = $$IDE_SOURCE_TREE/src/libs
 
-HEADERS += \
-	$$FAKEVIMHOME/fakevimhandler.h \
-	$$FAKEVIMHOME/fakevimactions.h \
-        $$FAKEVIMHOME/fakevimsyntax.h \
-        $$LIBSDIR/utils/basevalidatinglineedit.h \
-        $$LIBSDIR/utils/environment.h \
-        $$LIBSDIR/utils/pathchooser.h \
-        $$LIBSDIR/utils/savedaction.h
+SOURCES += main.cpp \
+            $$FAKEVIMDIR/fakevimhandler.cpp \
+            $$FAKEVIMDIR/fakevimactions.cpp \
+            $$FAKEVIMDIR/fakevimsyntax.cpp \
 
-INCLUDEPATH += $$FAKEVIMHOME $$LIBSDIR
+HEADERS += $$FAKEVIMDIR/fakevimhandler.h \
+            $$FAKEVIMDIR/fakevimactions.h \
+            $$FAKEVIMDIR/fakevimsyntax.h \
+
+INCLUDEPATH += $$FAKEVIMDIR $$LIBSDIR
 
diff --git a/tests/manual/preprocessor/preprocessor.pro b/tests/manual/preprocessor/preprocessor.pro
index b01a09bd49e..4f2ad5b6d32 100644
--- a/tests/manual/preprocessor/preprocessor.pro
+++ b/tests/manual/preprocessor/preprocessor.pro
@@ -2,7 +2,7 @@ QT = core
 macx:CONFIG -= app_bundle
 TARGET = pp
 
-include(../../../src/libs/cplusplus/cplusplus-lib.pri)
+include(../../../src/libs/cplusplus/cplusplus.pri)
 
 # Input
 SOURCES += main.cpp
diff --git a/tests/tools/cplusplus-dump/cplusplus-dump.pro b/tests/tools/cplusplus-dump/cplusplus-dump.pro
index 4964d9c5ea7..a054ad99806 100644
--- a/tests/tools/cplusplus-dump/cplusplus-dump.pro
+++ b/tests/tools/cplusplus-dump/cplusplus-dump.pro
@@ -2,7 +2,7 @@ QT = core gui
 macx:CONFIG -= app_bundle
 TARGET = cplusplus0
 
-include(../../../src/libs/cplusplus/cplusplus-lib.pri)
+include(../../../src/libs/cplusplus/cplusplus.pri)
 
 # Input
 SOURCES += main.cpp
diff --git a/tests/tools/qml-ast2dot/main.cpp b/tests/tools/qml-ast2dot/main.cpp
index 72eb584cb61..cf3aa29d570 100644
--- a/tests/tools/qml-ast2dot/main.cpp
+++ b/tests/tools/qml-ast2dot/main.cpp
@@ -113,7 +113,7 @@ protected:
         QByteArray t;
         t.append(id);
         t.append(" [label = \"");
-        t.append(spell(token));
+        t.append(spell(token).toUtf8());
         t.append("\" shape=rect]");
         _terminalShapes.append(t);
     }
diff --git a/tests/tools/qml-ast2dot/qml-ast2dot.pro b/tests/tools/qml-ast2dot/qml-ast2dot.pro
index 7ee4c66f623..074d1e95a57 100644
--- a/tests/tools/qml-ast2dot/qml-ast2dot.pro
+++ b/tests/tools/qml-ast2dot/qml-ast2dot.pro
@@ -1,11 +1,10 @@
+include(../../../qtcreator.pri)
 QT = core gui
 macx:CONFIG -= app_bundle
 TARGET = qml-ast2dot
 
-include(../../../src/libs/qmljs/qmljs-lib.pri)
-
-SOURCES += ../../../src/libs/utils/changeset.cpp
-HEADERS += ../../../src/libs/utils/changeset.h
+include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri)
+include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
 # Input
 SOURCES += main.cpp