diff --git a/tests/manual/gdbdebugger/boost/boost.pro b/tests/manual/debugger/boost/boost.pro
similarity index 100%
rename from tests/manual/gdbdebugger/boost/boost.pro
rename to tests/manual/debugger/boost/boost.pro
diff --git a/tests/manual/gdbdebugger/boost/main.cpp b/tests/manual/debugger/boost/main.cpp
similarity index 100%
rename from tests/manual/gdbdebugger/boost/main.cpp
rename to tests/manual/debugger/boost/main.cpp
diff --git a/tests/manual/gdbdebugger/gdbdebugger.pro b/tests/manual/debugger/gdbdebugger.pro
similarity index 100%
rename from tests/manual/gdbdebugger/gdbdebugger.pro
rename to tests/manual/debugger/gdbdebugger.pro
diff --git a/tests/manual/gdbdebugger/gui/gui.pro b/tests/manual/debugger/gui/gui.pro
similarity index 100%
rename from tests/manual/gdbdebugger/gui/gui.pro
rename to tests/manual/debugger/gui/gui.pro
diff --git a/tests/manual/gdbdebugger/gui/mainwindow.cpp b/tests/manual/debugger/gui/mainwindow.cpp
similarity index 100%
rename from tests/manual/gdbdebugger/gui/mainwindow.cpp
rename to tests/manual/debugger/gui/mainwindow.cpp
diff --git a/tests/manual/gdbdebugger/gui/mainwindow.h b/tests/manual/debugger/gui/mainwindow.h
similarity index 100%
rename from tests/manual/gdbdebugger/gui/mainwindow.h
rename to tests/manual/debugger/gui/mainwindow.h
diff --git a/tests/manual/gdbdebugger/gui/mainwindow.ui b/tests/manual/debugger/gui/mainwindow.ui
similarity index 100%
rename from tests/manual/gdbdebugger/gui/mainwindow.ui
rename to tests/manual/debugger/gui/mainwindow.ui
diff --git a/tests/manual/gdbdebugger/gui/tst_gui.cpp b/tests/manual/debugger/gui/tst_gui.cpp
similarity index 100%
rename from tests/manual/gdbdebugger/gui/tst_gui.cpp
rename to tests/manual/debugger/gui/tst_gui.cpp
diff --git a/tests/manual/gdbdebugger/helper/helper.pro b/tests/manual/debugger/helper/helper.pro
similarity index 100%
rename from tests/manual/gdbdebugger/helper/helper.pro
rename to tests/manual/debugger/helper/helper.pro
diff --git a/tests/manual/gdbdebugger/helper/main.cpp b/tests/manual/debugger/helper/main.cpp
similarity index 100%
rename from tests/manual/gdbdebugger/helper/main.cpp
rename to tests/manual/debugger/helper/main.cpp
diff --git a/tests/manual/gdbdebugger/python/math.py b/tests/manual/debugger/python/math.py
similarity index 100%
rename from tests/manual/gdbdebugger/python/math.py
rename to tests/manual/debugger/python/math.py
diff --git a/tests/manual/gdbdebugger/python/python.pro b/tests/manual/debugger/python/python.pro
similarity index 100%
rename from tests/manual/gdbdebugger/python/python.pro
rename to tests/manual/debugger/python/python.pro
diff --git a/tests/manual/gdbdebugger/script/math.js b/tests/manual/debugger/script/math.js
similarity index 100%
rename from tests/manual/gdbdebugger/script/math.js
rename to tests/manual/debugger/script/math.js
diff --git a/tests/manual/gdbdebugger/script/script.pro b/tests/manual/debugger/script/script.pro
similarity index 100%
rename from tests/manual/gdbdebugger/script/script.pro
rename to tests/manual/debugger/script/script.pro
diff --git a/tests/manual/gdbdebugger/simple/README b/tests/manual/debugger/simple/README
similarity index 100%
rename from tests/manual/gdbdebugger/simple/README
rename to tests/manual/debugger/simple/README
diff --git a/tests/manual/gdbdebugger/simple/deep/deep/simple_gdbtest_app.h b/tests/manual/debugger/simple/deep/deep/simple_test_app.h
similarity index 100%
rename from tests/manual/gdbdebugger/simple/deep/deep/simple_gdbtest_app.h
rename to tests/manual/debugger/simple/deep/deep/simple_test_app.h
diff --git a/tests/manual/debugger/simple/simple.pro b/tests/manual/debugger/simple/simple.pro
new file mode 100644
index 00000000000..e6dbd0c35cd
--- /dev/null
+++ b/tests/manual/debugger/simple/simple.pro
@@ -0,0 +1,4 @@
+
+TEMPLATE = subdirs
+
+SUBDIRS += simple_test_app.pro simple_test_plugin.pro
diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp
similarity index 99%
rename from tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
rename to tests/manual/debugger/simple/simple_test_app.cpp
index 3818315b9f6..3ea43159466 100644
--- a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
+++ b/tests/manual/debugger/simple/simple_test_app.cpp
@@ -36,7 +36,7 @@
 
 void dummyStatement(...) {}
 
-#include "../simple/deep/deep/simple_gdbtest_app.h"
+#include "../simple/deep/deep/simple_test_app.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QDateTime>
@@ -1197,17 +1197,17 @@ void testPlugin()
 {
     QString dir = QDir::currentPath();
 #ifdef Q_OS_LINUX
-    QLibrary lib(dir + "/libsimple_gdbtest_plugin.so");
+    QLibrary lib(dir + "/libsimple_test_plugin.so");
 #endif
 #ifdef Q_OS_MAC
     dir = QFileInfo(dir + "/../..").canonicalPath();
-    QLibrary lib(dir + "/libsimple_gdbtest_plugin.dylib");
+    QLibrary lib(dir + "/libsimple_test_plugin.dylib");
 #endif
 #ifdef Q_OS_WIN
-    QLibrary lib(dir + "/debug/simple_gdbtest_plugin.dll");
+    QLibrary lib(dir + "/debug/simple_test_plugin.dll");
 #endif
 #ifdef Q_OS_SYMBIAN
-    QLibrary lib(dir + "/libsimple_gdbtest_plugin.dll");
+    QLibrary lib(dir + "/libsimple_test_plugin.dll");
 #endif
     int (*foo)() = (int(*)()) lib.resolve("pluginTest");
     qDebug() << "library resolve: " << foo << lib.fileName();
@@ -3629,4 +3629,4 @@ int main(int argc, char *argv[])
     return 0;
 }
 
-#include "simple_gdbtest_app.moc"
+#include "simple_test_app.moc"
diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.pro b/tests/manual/debugger/simple/simple_test_app.pro
similarity index 80%
rename from tests/manual/gdbdebugger/simple/simple_gdbtest_app.pro
rename to tests/manual/debugger/simple/simple_test_app.pro
index 5215b43b6d6..303163e8c0d 100644
--- a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.pro
+++ b/tests/manual/debugger/simple/simple_test_app.pro
@@ -1,10 +1,10 @@
 TEMPLATE = app
-TARGET = simple_gdbtest_app
+TARGET = simple_test_app
 DEPENDPATH += .
 INCLUDEPATH += .
 DESTDIR = .
 
-SOURCES +=  simple_gdbtest_app.cpp
+SOURCES +=  simple_test_app.cpp
 
 QT += network
 QT += script
diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp b/tests/manual/debugger/simple/simple_test_plugin.cpp
similarity index 100%
rename from tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp
rename to tests/manual/debugger/simple/simple_test_plugin.cpp
diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.pro b/tests/manual/debugger/simple/simple_test_plugin.pro
similarity index 86%
rename from tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.pro
rename to tests/manual/debugger/simple/simple_test_plugin.pro
index a727dbb570f..79f68a60c6b 100644
--- a/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.pro
+++ b/tests/manual/debugger/simple/simple_test_plugin.pro
@@ -1,9 +1,8 @@
 TEMPLATE = lib
-TARGET = simple_gdbtest_plugin
+TARGET = simple_test_plugin
 CONFIG += shared
 
-SOURCES += \
-    simple_gdbtest_plugin.cpp
+SOURCES += simple_test_plugin.cpp
 
 macx {
    QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/
diff --git a/tests/manual/gdbdebugger/spacy path/app with space.cpp b/tests/manual/debugger/spacy path/app with space.cpp
similarity index 100%
rename from tests/manual/gdbdebugger/spacy path/app with space.cpp
rename to tests/manual/debugger/spacy path/app with space.cpp
diff --git a/tests/manual/gdbdebugger/spacy path/plugin with space.cpp b/tests/manual/debugger/spacy path/plugin with space.cpp
similarity index 100%
rename from tests/manual/gdbdebugger/spacy path/plugin with space.cpp
rename to tests/manual/debugger/spacy path/plugin with space.cpp
diff --git a/tests/manual/gdbdebugger/spacy path/spacy app/spacy app.pro b/tests/manual/debugger/spacy path/spacy app/spacy app.pro
similarity index 100%
rename from tests/manual/gdbdebugger/spacy path/spacy app/spacy app.pro
rename to tests/manual/debugger/spacy path/spacy app/spacy app.pro
diff --git a/tests/manual/gdbdebugger/spacy path/spacy path.pro b/tests/manual/debugger/spacy path/spacy path.pro
similarity index 100%
rename from tests/manual/gdbdebugger/spacy path/spacy path.pro
rename to tests/manual/debugger/spacy path/spacy path.pro
diff --git a/tests/manual/gdbdebugger/spacy path/spacy plugin/spacy plugin.pro b/tests/manual/debugger/spacy path/spacy plugin/spacy plugin.pro
similarity index 100%
rename from tests/manual/gdbdebugger/spacy path/spacy plugin/spacy plugin.pro
rename to tests/manual/debugger/spacy path/spacy plugin/spacy plugin.pro
diff --git a/tests/manual/gdbdebugger/spacy-file/app with space.cpp b/tests/manual/debugger/spacy-file/app with space.cpp
similarity index 100%
rename from tests/manual/gdbdebugger/spacy-file/app with space.cpp
rename to tests/manual/debugger/spacy-file/app with space.cpp
diff --git a/tests/manual/gdbdebugger/spacy-file/app/app.pro b/tests/manual/debugger/spacy-file/app/app.pro
similarity index 100%
rename from tests/manual/gdbdebugger/spacy-file/app/app.pro
rename to tests/manual/debugger/spacy-file/app/app.pro
diff --git a/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp b/tests/manual/debugger/spacy-file/plugin with space.cpp
similarity index 100%
rename from tests/manual/gdbdebugger/spacy-file/plugin with space.cpp
rename to tests/manual/debugger/spacy-file/plugin with space.cpp
diff --git a/tests/manual/gdbdebugger/spacy-file/plugin/plugin.pro b/tests/manual/debugger/spacy-file/plugin/plugin.pro
similarity index 100%
rename from tests/manual/gdbdebugger/spacy-file/plugin/plugin.pro
rename to tests/manual/debugger/spacy-file/plugin/plugin.pro
diff --git a/tests/manual/gdbdebugger/spacy-file/spacy-file.pro b/tests/manual/debugger/spacy-file/spacy-file.pro
similarity index 100%
rename from tests/manual/gdbdebugger/spacy-file/spacy-file.pro
rename to tests/manual/debugger/spacy-file/spacy-file.pro
diff --git a/tests/manual/gdbdebugger/simple/simple.pro b/tests/manual/gdbdebugger/simple/simple.pro
deleted file mode 100644
index 91ae291a466..00000000000
--- a/tests/manual/gdbdebugger/simple/simple.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-
-TEMPLATE = subdirs
-
-SUBDIRS += simple_gdbtest_app.pro simple_gdbtest_plugin.pro