diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index 89ac3c1f19538fe4e717ebab7cfc355138ea13b0..42275908ea90f6c0ba58e1cd42a9d942ad689373 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -6,8 +6,7 @@ cplusplus-dump \
 fakevim \
 gdbdebugger \
 preprocessor \
-subdir_proparser \
-trklauncher
+subdir_proparser
 
 unix {
 #   Uses popen
diff --git a/tests/tests.pro b/tests/tests.pro
index 465f192eca86af9bed3a2f9f0bf5f85fca2fc467..78b78c84526b8965615c0bff7a75dde353b3ea57 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,3 +1,2 @@
 TEMPLATE=subdirs
-SUBDIRS += auto \
-            manual
+SUBDIRS += auto manual tools
diff --git a/tests/manual/ccdb/README b/tests/tools/ccdb/README
similarity index 100%
rename from tests/manual/ccdb/README
rename to tests/tools/ccdb/README
diff --git a/tests/manual/ccdb/ccdb.pro b/tests/tools/ccdb/ccdb.pro
similarity index 100%
rename from tests/manual/ccdb/ccdb.pro
rename to tests/tools/ccdb/ccdb.pro
diff --git a/tests/manual/ccdb/cdbapplication.cpp b/tests/tools/ccdb/cdbapplication.cpp
similarity index 100%
rename from tests/manual/ccdb/cdbapplication.cpp
rename to tests/tools/ccdb/cdbapplication.cpp
diff --git a/tests/manual/ccdb/cdbapplication.h b/tests/tools/ccdb/cdbapplication.h
similarity index 100%
rename from tests/manual/ccdb/cdbapplication.h
rename to tests/tools/ccdb/cdbapplication.h
diff --git a/tests/manual/ccdb/cdbpromptthread.cpp b/tests/tools/ccdb/cdbpromptthread.cpp
similarity index 100%
rename from tests/manual/ccdb/cdbpromptthread.cpp
rename to tests/tools/ccdb/cdbpromptthread.cpp
diff --git a/tests/manual/ccdb/cdbpromptthread.h b/tests/tools/ccdb/cdbpromptthread.h
similarity index 100%
rename from tests/manual/ccdb/cdbpromptthread.h
rename to tests/tools/ccdb/cdbpromptthread.h
diff --git a/tests/manual/ccdb/debugeventcallback.cpp b/tests/tools/ccdb/debugeventcallback.cpp
similarity index 100%
rename from tests/manual/ccdb/debugeventcallback.cpp
rename to tests/tools/ccdb/debugeventcallback.cpp
diff --git a/tests/manual/ccdb/debugeventcallback.h b/tests/tools/ccdb/debugeventcallback.h
similarity index 100%
rename from tests/manual/ccdb/debugeventcallback.h
rename to tests/tools/ccdb/debugeventcallback.h
diff --git a/tests/manual/ccdb/main.cpp b/tests/tools/ccdb/main.cpp
similarity index 100%
rename from tests/manual/ccdb/main.cpp
rename to tests/tools/ccdb/main.cpp
diff --git a/tests/tools/tools.pro b/tests/tools/tools.pro
new file mode 100644
index 0000000000000000000000000000000000000000..f6f7bc72930c5d4949ed64457cb0b74e7010ca39
--- /dev/null
+++ b/tests/tools/tools.pro
@@ -0,0 +1,4 @@
+TEMPLATE=subdirs
+
+SUBDIRS= \
+trklauncher
diff --git a/tests/manual/trklauncher/main.cpp b/tests/tools/trklauncher/main.cpp
similarity index 100%
rename from tests/manual/trklauncher/main.cpp
rename to tests/tools/trklauncher/main.cpp
diff --git a/tests/manual/trklauncher/trklauncher.pro b/tests/tools/trklauncher/trklauncher.pro
similarity index 100%
rename from tests/manual/trklauncher/trklauncher.pro
rename to tests/tools/trklauncher/trklauncher.pro