diff --git a/tests/auto/cplusplus/codegen/codegen.pro b/tests/auto/cplusplus/codegen/codegen.pro
index fa736489c729caca0796c74e25586f200f5cc35e..e4a3e13167cab34ce9749d4e77a430236aabfd61 100644
--- a/tests/auto/cplusplus/codegen/codegen.pro
+++ b/tests/auto/cplusplus/codegen/codegen.pro
@@ -3,5 +3,6 @@ CONFIG += qt warn_on console depend_includepath
 CONFIG += qtestlib testcase
 CONFIG -= app_bundle
 include(../shared/shared.pri)
+INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins
 SOURCES += tst_codegen.cpp
-TARGET=tst_$$TARGET
+
diff --git a/tests/auto/cplusplus/codegen/tst_codegen.cpp b/tests/auto/cplusplus/codegen/tst_codegen.cpp
index 336cf780624f244132cd013666d51910032f1107..43cbbb6ffbea1d9551c37b9194d3f02ef100e418 100644
--- a/tests/auto/cplusplus/codegen/tst_codegen.cpp
+++ b/tests/auto/cplusplus/codegen/tst_codegen.cpp
@@ -2,12 +2,13 @@
 #include <Control.h>
 #include <CppDocument.h>
 #include <DiagnosticClient.h>
-#include <InsertionPointLocator.h>
 #include <Scope.h>
 #include <TranslationUnit.h>
 #include <Literals.h>
 #include <Bind.h>
 #include <Symbols.h>
+#include <cpptools/insertionpointlocator.h>
+#include <cpptools/cpprefactoringchanges.h>
 
 #include <QtTest>
 #include <QtDebug>
@@ -20,6 +21,7 @@
     tests the InsertionPointLocator.
  */
 using namespace CPlusPlus;
+using namespace CppTools;
 
 class tst_Codegen: public QObject
 {
@@ -61,7 +63,8 @@ void tst_Codegen::public_in_empty_class()
 
     Snapshot snapshot;
     snapshot.insert(doc);
-    InsertionPointLocator find(snapshot);
+    CppRefactoringChanges changes(snapshot);
+    InsertionPointLocator find(&changes);
     InsertionLocation loc = find.methodDeclarationInClass(
                 doc->fileName(),
                 foo,
@@ -100,7 +103,8 @@ void tst_Codegen::public_in_nonempty_class()
 
     Snapshot snapshot;
     snapshot.insert(doc);
-    InsertionPointLocator find(snapshot);
+    CppRefactoringChanges changes(snapshot);
+    InsertionPointLocator find(&changes);
     InsertionLocation loc = find.methodDeclarationInClass(
                 doc->fileName(),
                 foo,
@@ -139,7 +143,8 @@ void tst_Codegen::public_before_protected()
 
     Snapshot snapshot;
     snapshot.insert(doc);
-    InsertionPointLocator find(snapshot);
+    CppRefactoringChanges changes(snapshot);
+    InsertionPointLocator find(&changes);
     InsertionLocation loc = find.methodDeclarationInClass(
                 doc->fileName(),
                 foo,
@@ -179,7 +184,8 @@ void tst_Codegen::private_after_protected()
 
     Snapshot snapshot;
     snapshot.insert(doc);
-    InsertionPointLocator find(snapshot);
+    CppRefactoringChanges changes(snapshot);
+    InsertionPointLocator find(&changes);
     InsertionLocation loc = find.methodDeclarationInClass(
                 doc->fileName(),
                 foo,
@@ -219,7 +225,8 @@ void tst_Codegen::protected_in_nonempty_class()
 
     Snapshot snapshot;
     snapshot.insert(doc);
-    InsertionPointLocator find(snapshot);
+    CppRefactoringChanges changes(snapshot);
+    InsertionPointLocator find(&changes);
     InsertionLocation loc = find.methodDeclarationInClass(
                 doc->fileName(),
                 foo,
@@ -259,7 +266,8 @@ void tst_Codegen::protected_betwee_public_and_private()
 
     Snapshot snapshot;
     snapshot.insert(doc);
-    InsertionPointLocator find(snapshot);
+    CppRefactoringChanges changes(snapshot);
+    InsertionPointLocator find(&changes);
     InsertionLocation loc = find.methodDeclarationInClass(
                 doc->fileName(),
                 foo,
@@ -319,7 +327,8 @@ void tst_Codegen::qtdesigner_integration()
 
     Snapshot snapshot;
     snapshot.insert(doc);
-    InsertionPointLocator find(snapshot);
+    CppRefactoringChanges changes(snapshot);
+    InsertionPointLocator find(&changes);
     InsertionLocation loc = find.methodDeclarationInClass(
                 doc->fileName(),
                 foo,
diff --git a/tests/auto/cplusplus/findusages/findusages.pro b/tests/auto/cplusplus/findusages/findusages.pro
index c61766178846151562d80f343a9c12083afe7cb0..f3f280a3e07a4006ede8b4586c8c27b2809d64c6 100644
--- a/tests/auto/cplusplus/findusages/findusages.pro
+++ b/tests/auto/cplusplus/findusages/findusages.pro
@@ -3,4 +3,3 @@ CONFIG += qt warn_on console depend_includepath
 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 60aadad47e65b9d5c15d8782068d911a0d0eb158..aed1edd2e29aa4cd21ed5ad40f405760cabd3d85 100644
--- a/tests/auto/cplusplus/lookup/lookup.pro
+++ b/tests/auto/cplusplus/lookup/lookup.pro
@@ -3,4 +3,3 @@ CONFIG += qt warn_on console depend_includepath
 CONFIG += qtestlib testcase
 include(../shared/shared.pri)
 SOURCES += tst_lookup.cpp
-TARGET=tst_$$TARGET
diff --git a/tests/auto/cplusplus/semantic/semantic.pro b/tests/auto/cplusplus/semantic/semantic.pro
index 23a18cf37b9bbabc7fcb03eb562b12b6a927fde1..84f613d5ab4585df9899b7c5969b401597ac0a89 100644
--- a/tests/auto/cplusplus/semantic/semantic.pro
+++ b/tests/auto/cplusplus/semantic/semantic.pro
@@ -2,6 +2,4 @@ TEMPLATE = app
 CONFIG += qt warn_on console depend_includepath
 CONFIG += qtestlib testcase
 include(../shared/shared.pri)
-
 SOURCES += tst_semantic.cpp
-TARGET=tst_$$TARGET
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index f662f2cb55533311d04544e6375958102e0c90a0..c1542e68dd58e2cb01af29cf716b0c008a3d95b3 100644
--- a/tests/auto/cplusplus/shared/shared.pri
+++ b/tests/auto/cplusplus/shared/shared.pri
@@ -2,5 +2,5 @@ DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
 include(../../../../qtcreator.pri)
 INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
 INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
-include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus-lib.pri)
-include($$IDE_SOURCE_TREE/src/libs/utils/utils-lib.pri)
+include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
+LIBS += -L$$IDE_PLUGIN_PATH/Nokia
diff --git a/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro b/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro
index 2e884365c1f41a76b005721176b8b7432597b96b..e28e54e991a49c453c014b0d8b22e60452b0c326 100644
--- a/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro
+++ b/tests/auto/cplusplus/typeprettyprinter/typeprettyprinter.pro
@@ -3,4 +3,3 @@ CONFIG += qt warn_on console depend_includepath
 CONFIG += qtestlib testcase
 include(../shared/shared.pri)
 SOURCES += tst_typeprettyprinter.cpp
-TARGET=tst_$$TARGET
diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index 616fba90fc769c1edf795d745bfb0896ec46e519..012f472d4a457013ee7148ac057e63003538a133 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -9,22 +9,14 @@ FAKEVIMDIR = ../../../src/plugins/fakevim
 UTILSDIR = ../../../src/libs
 
 SOURCES += \
-	$$FAKEVIMDIR/fakevimhandler.cpp \
-	$$FAKEVIMDIR/fakevimactions.cpp \
-	$$FAKEVIMDIR/fakevimsyntax.cpp \
-	$$UTILSDIR/utils/environment.cpp \
-	$$UTILSDIR/utils/savedaction.cpp \
-	$$UTILSDIR/utils/pathchooser.cpp \
-	$$UTILSDIR/utils/basevalidatinglineedit.cpp \
+        $$FAKEVIMDIR/fakevimhandler.cpp \
+        $$FAKEVIMDIR/fakevimactions.cpp \
+        $$FAKEVIMDIR/fakevimsyntax.cpp \
         tst_fakevim.cpp
 
 HEADERS += \
-	$$FAKEVIMDIR/fakevimhandler.h \
-	$$FAKEVIMDIR/fakevimactions.h \
-	$$FAKEVIMDIR/fakevimsyntax.h \
-	$$UTILSDIR/utils/environment.h \
-	$$UTILSDIR/utils/savedaction.h \
-	$$UTILSDIR/utils/pathchooser.h \
-	$$UTILSDIR/utils/basevalidatinglineedit.h \
+        $$FAKEVIMDIR/fakevimhandler.h \
+        $$FAKEVIMDIR/fakevimactions.h \
+        $$FAKEVIMDIR/fakevimsyntax.h \
 
 INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR
diff --git a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h
index d8ce7728705729c45d44903d6dc7543ca3a4d63c..926cb67be7af2aa0d931a08c847c5c9f3b2162f4 100644
--- a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h
+++ b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h
@@ -45,7 +45,7 @@ public:
     virtual ~SyntaxHighlighter() {}
 
 protected:
-    void SyntaxHighlighter::applyFormatToSpaces(const QString &, const QTextCharFormat &)
+    void applyFormatToSpaces(const QString &, const QTextCharFormat &)
     {}
 };
 
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index 0b323b24baa72f1316a13d9ab13277109dcf6864..2352c5200c65ae1a8b0c040dd88ba0196bf540bd 100644
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -3,7 +3,8 @@ include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
 
 QT += script \
     network \
-    declarative
+    declarative \
+    webkit
 
 CONFIG += qtestlib testcase