diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index 42275908ea9..67725f96630 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -2,7 +2,6 @@ TEMPLATE=subdirs
 
 SUBDIRS= \
 cplusplus-frontend \
-cplusplus-dump \
 fakevim \
 gdbdebugger \
 preprocessor \
diff --git a/tests/manual/cplusplus-dump/c++ b/tests/tools/cplusplus-dump/c++
similarity index 100%
rename from tests/manual/cplusplus-dump/c++
rename to tests/tools/cplusplus-dump/c++
diff --git a/tests/manual/cplusplus-dump/conf.c++ b/tests/tools/cplusplus-dump/conf.c++
similarity index 100%
rename from tests/manual/cplusplus-dump/conf.c++
rename to tests/tools/cplusplus-dump/conf.c++
diff --git a/tests/manual/cplusplus-dump/cplusplus-dump.pro b/tests/tools/cplusplus-dump/cplusplus-dump.pro
similarity index 100%
rename from tests/manual/cplusplus-dump/cplusplus-dump.pro
rename to tests/tools/cplusplus-dump/cplusplus-dump.pro
diff --git a/tests/manual/cplusplus-dump/dumpers.inc b/tests/tools/cplusplus-dump/dumpers.inc
similarity index 100%
rename from tests/manual/cplusplus-dump/dumpers.inc
rename to tests/tools/cplusplus-dump/dumpers.inc
diff --git a/tests/manual/cplusplus-dump/main.cpp b/tests/tools/cplusplus-dump/main.cpp
similarity index 100%
rename from tests/manual/cplusplus-dump/main.cpp
rename to tests/tools/cplusplus-dump/main.cpp
diff --git a/tests/manual/cplusplus-dump/tests/templ01.cpp b/tests/tools/cplusplus-dump/tests/templ01.cpp
similarity index 100%
rename from tests/manual/cplusplus-dump/tests/templ01.cpp
rename to tests/tools/cplusplus-dump/tests/templ01.cpp
diff --git a/tests/manual/qml-ast2dot/main.cpp b/tests/tools/qml-ast2dot/main.cpp
similarity index 100%
rename from tests/manual/qml-ast2dot/main.cpp
rename to tests/tools/qml-ast2dot/main.cpp
diff --git a/tests/manual/qml-ast2dot/qml-ast2dot.pro b/tests/tools/qml-ast2dot/qml-ast2dot.pro
similarity index 100%
rename from tests/manual/qml-ast2dot/qml-ast2dot.pro
rename to tests/tools/qml-ast2dot/qml-ast2dot.pro
diff --git a/tests/tools/tools.pro b/tests/tools/tools.pro
index f6f7bc72930..f3040fe923c 100644
--- a/tests/tools/tools.pro
+++ b/tests/tools/tools.pro
@@ -1,4 +1,6 @@
 TEMPLATE=subdirs
 
 SUBDIRS= \
-trklauncher
+trklauncher \
+cplusplus-dump \
+qml-ast2dot