diff --git a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro
index d67d81e4bf..1b35019f94 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro
+++ b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro
@@ -3,4 +3,4 @@ TARGET = tst_qdbusabstractadaptor
 QT = core core-private testlib
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS = qmyserver test
+SUBDIRS = qmyserver qdbusabstractadaptor
diff --git a/tests/auto/dbus/qdbusabstractadaptor/test/test.pro b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor/qdbusabstractadaptor.pro
similarity index 100%
rename from tests/auto/dbus/qdbusabstractadaptor/test/test.pro
rename to tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor/qdbusabstractadaptor.pro
diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro
index 623b07fcbd..99462b1b36 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro
+++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro
@@ -2,5 +2,5 @@ CONFIG += testcase
 TARGET = tst_qdbusabstractinterface
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS = qpinger test
+SUBDIRS = qpinger qdbusabstractinterface
 OTHER_FILES += org.qtproject.QtDBus.Pinger.xml
diff --git a/tests/auto/dbus/qdbusabstractinterface/test/test.pro b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/qdbusabstractinterface.pro
similarity index 100%
rename from tests/auto/dbus/qdbusabstractinterface/test/test.pro
rename to tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/qdbusabstractinterface.pro
diff --git a/tests/auto/dbus/qdbusinterface/qdbusinterface.pro b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro
index 093a888765..c8861cb2a4 100644
--- a/tests/auto/dbus/qdbusinterface/qdbusinterface.pro
+++ b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro
@@ -3,4 +3,4 @@ TARGET = tst_qdbusinterface
 QT = core testlib
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS = qmyserver test
+SUBDIRS = qmyserver qdbusinterface
diff --git a/tests/auto/dbus/qdbusinterface/test/test.pro b/tests/auto/dbus/qdbusinterface/qdbusinterface/qdbusinterface.pro
similarity index 100%
rename from tests/auto/dbus/qdbusinterface/test/test.pro
rename to tests/auto/dbus/qdbusinterface/qdbusinterface/qdbusinterface.pro
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro
index dfbb206324..e9a41c0fb4 100644
--- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro
+++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro
@@ -2,7 +2,7 @@ CONFIG += testcase
 TARGET = tst_qdbusmarshall
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS = qpong test
+SUBDIRS = qpong qdbusmarshall
 
 QT = core-private testlib
 
diff --git a/tests/auto/dbus/qdbusmarshall/test/test.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro
similarity index 100%
rename from tests/auto/dbus/qdbusmarshall/test/test.pro
rename to tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro