diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index fc51280c356..5fb6757648a 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -10,5 +10,5 @@ SUBDIRS += \
 
 !cross_compile:                             SUBDIRS += host.pro
 contains(QT_CONFIG, opengl):                SUBDIRS += opengl.pro
-unix:!embedded:contains(QT_CONFIG, dbus):   SUBDIRS += dbus.pro
+unix:!embedded:contains(QT_CONFIG, dbus):   SUBDIRS += dbus
 contains(QT_CONFIG, v8):                    SUBDIRS += v8.pro
diff --git a/tests/auto/dbus.pro b/tests/auto/dbus/dbus.pro
similarity index 100%
rename from tests/auto/dbus.pro
rename to tests/auto/dbus/dbus.pro
diff --git a/tests/auto/qdbusabstractadaptor/.gitignore b/tests/auto/dbus/qdbusabstractadaptor/.gitignore
similarity index 100%
rename from tests/auto/qdbusabstractadaptor/.gitignore
rename to tests/auto/dbus/qdbusabstractadaptor/.gitignore
diff --git a/tests/auto/qdbusabstractadaptor/myobject.h b/tests/auto/dbus/qdbusabstractadaptor/myobject.h
similarity index 100%
rename from tests/auto/qdbusabstractadaptor/myobject.h
rename to tests/auto/dbus/qdbusabstractadaptor/myobject.h
diff --git a/tests/auto/qdbusabstractadaptor/qdbusabstractadaptor.pro b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro
similarity index 100%
rename from tests/auto/qdbusabstractadaptor/qdbusabstractadaptor.pro
rename to tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro
diff --git a/tests/auto/qdbusabstractadaptor/qmyserver/qmyserver.cpp b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp
similarity index 100%
rename from tests/auto/qdbusabstractadaptor/qmyserver/qmyserver.cpp
rename to tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp
diff --git a/tests/auto/qdbusabstractadaptor/qmyserver/qmyserver.pro b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.pro
similarity index 100%
rename from tests/auto/qdbusabstractadaptor/qmyserver/qmyserver.pro
rename to tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.pro
diff --git a/tests/auto/qdbusabstractadaptor/test/test.pro b/tests/auto/dbus/qdbusabstractadaptor/test/test.pro
similarity index 100%
rename from tests/auto/qdbusabstractadaptor/test/test.pro
rename to tests/auto/dbus/qdbusabstractadaptor/test/test.pro
diff --git a/tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp
similarity index 100%
rename from tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp
rename to tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp
diff --git a/tests/auto/qdbusabstractinterface/com.trolltech.QtDBus.Pinger.xml b/tests/auto/dbus/qdbusabstractinterface/com.trolltech.QtDBus.Pinger.xml
similarity index 100%
rename from tests/auto/qdbusabstractinterface/com.trolltech.QtDBus.Pinger.xml
rename to tests/auto/dbus/qdbusabstractinterface/com.trolltech.QtDBus.Pinger.xml
diff --git a/tests/auto/qdbusabstractinterface/interface.cpp b/tests/auto/dbus/qdbusabstractinterface/interface.cpp
similarity index 100%
rename from tests/auto/qdbusabstractinterface/interface.cpp
rename to tests/auto/dbus/qdbusabstractinterface/interface.cpp
diff --git a/tests/auto/qdbusabstractinterface/interface.h b/tests/auto/dbus/qdbusabstractinterface/interface.h
similarity index 100%
rename from tests/auto/qdbusabstractinterface/interface.h
rename to tests/auto/dbus/qdbusabstractinterface/interface.h
diff --git a/tests/auto/qdbusabstractinterface/pinger.cpp b/tests/auto/dbus/qdbusabstractinterface/pinger.cpp
similarity index 100%
rename from tests/auto/qdbusabstractinterface/pinger.cpp
rename to tests/auto/dbus/qdbusabstractinterface/pinger.cpp
diff --git a/tests/auto/qdbusabstractinterface/pinger.h b/tests/auto/dbus/qdbusabstractinterface/pinger.h
similarity index 100%
rename from tests/auto/qdbusabstractinterface/pinger.h
rename to tests/auto/dbus/qdbusabstractinterface/pinger.h
diff --git a/tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro
similarity index 100%
rename from tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro
rename to tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro
diff --git a/tests/auto/qdbusabstractinterface/qpinger/qpinger.cpp b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp
similarity index 100%
rename from tests/auto/qdbusabstractinterface/qpinger/qpinger.cpp
rename to tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp
diff --git a/tests/auto/qdbusabstractinterface/qpinger/qpinger.pro b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.pro
similarity index 100%
rename from tests/auto/qdbusabstractinterface/qpinger/qpinger.pro
rename to tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.pro
diff --git a/tests/auto/qdbusabstractinterface/test/test.pro b/tests/auto/dbus/qdbusabstractinterface/test/test.pro
similarity index 100%
rename from tests/auto/qdbusabstractinterface/test/test.pro
rename to tests/auto/dbus/qdbusabstractinterface/test/test.pro
diff --git a/tests/auto/qdbusabstractinterface/tst_qdbusabstractinterface.cpp b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
similarity index 100%
rename from tests/auto/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
rename to tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
diff --git a/tests/auto/qdbusconnection/.gitignore b/tests/auto/dbus/qdbusconnection/.gitignore
similarity index 100%
rename from tests/auto/qdbusconnection/.gitignore
rename to tests/auto/dbus/qdbusconnection/.gitignore
diff --git a/tests/auto/qdbusconnection/qdbusconnection.pro b/tests/auto/dbus/qdbusconnection/qdbusconnection.pro
similarity index 100%
rename from tests/auto/qdbusconnection/qdbusconnection.pro
rename to tests/auto/dbus/qdbusconnection/qdbusconnection.pro
diff --git a/tests/auto/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
similarity index 100%
rename from tests/auto/qdbusconnection/tst_qdbusconnection.cpp
rename to tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
diff --git a/tests/auto/qdbusconnection_no_bus/qdbusconnection_no_bus.pro b/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro
similarity index 100%
rename from tests/auto/qdbusconnection_no_bus/qdbusconnection_no_bus.pro
rename to tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro
diff --git a/tests/auto/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp b/tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp
similarity index 100%
rename from tests/auto/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp
rename to tests/auto/dbus/qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp
diff --git a/tests/auto/qdbuscontext/.gitignore b/tests/auto/dbus/qdbuscontext/.gitignore
similarity index 100%
rename from tests/auto/qdbuscontext/.gitignore
rename to tests/auto/dbus/qdbuscontext/.gitignore
diff --git a/tests/auto/qdbuscontext/qdbuscontext.pro b/tests/auto/dbus/qdbuscontext/qdbuscontext.pro
similarity index 100%
rename from tests/auto/qdbuscontext/qdbuscontext.pro
rename to tests/auto/dbus/qdbuscontext/qdbuscontext.pro
diff --git a/tests/auto/qdbuscontext/tst_qdbuscontext.cpp b/tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp
similarity index 100%
rename from tests/auto/qdbuscontext/tst_qdbuscontext.cpp
rename to tests/auto/dbus/qdbuscontext/tst_qdbuscontext.cpp
diff --git a/tests/auto/qdbusinterface/.gitignore b/tests/auto/dbus/qdbusinterface/.gitignore
similarity index 100%
rename from tests/auto/qdbusinterface/.gitignore
rename to tests/auto/dbus/qdbusinterface/.gitignore
diff --git a/tests/auto/qdbusinterface/myobject.h b/tests/auto/dbus/qdbusinterface/myobject.h
similarity index 100%
rename from tests/auto/qdbusinterface/myobject.h
rename to tests/auto/dbus/qdbusinterface/myobject.h
diff --git a/tests/auto/qdbusinterface/qdbusinterface.pro b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro
similarity index 100%
rename from tests/auto/qdbusinterface/qdbusinterface.pro
rename to tests/auto/dbus/qdbusinterface/qdbusinterface.pro
diff --git a/tests/auto/qdbusinterface/qmyserver/qmyserver.cpp b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp
similarity index 100%
rename from tests/auto/qdbusinterface/qmyserver/qmyserver.cpp
rename to tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp
diff --git a/tests/auto/qdbusinterface/qmyserver/qmyserver.pro b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro
similarity index 100%
rename from tests/auto/qdbusinterface/qmyserver/qmyserver.pro
rename to tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro
diff --git a/tests/auto/qdbusinterface/test/test.pro b/tests/auto/dbus/qdbusinterface/test/test.pro
similarity index 100%
rename from tests/auto/qdbusinterface/test/test.pro
rename to tests/auto/dbus/qdbusinterface/test/test.pro
diff --git a/tests/auto/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
similarity index 100%
rename from tests/auto/qdbusinterface/tst_qdbusinterface.cpp
rename to tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
diff --git a/tests/auto/qdbuslocalcalls/.gitignore b/tests/auto/dbus/qdbuslocalcalls/.gitignore
similarity index 100%
rename from tests/auto/qdbuslocalcalls/.gitignore
rename to tests/auto/dbus/qdbuslocalcalls/.gitignore
diff --git a/tests/auto/qdbuslocalcalls/qdbuslocalcalls.pro b/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro
similarity index 100%
rename from tests/auto/qdbuslocalcalls/qdbuslocalcalls.pro
rename to tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro
diff --git a/tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls.cpp b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
similarity index 100%
rename from tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
rename to tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp
diff --git a/tests/auto/qdbusmarshall/.gitignore b/tests/auto/dbus/qdbusmarshall/.gitignore
similarity index 100%
rename from tests/auto/qdbusmarshall/.gitignore
rename to tests/auto/dbus/qdbusmarshall/.gitignore
diff --git a/tests/auto/qdbusmarshall/common.h b/tests/auto/dbus/qdbusmarshall/common.h
similarity index 100%
rename from tests/auto/qdbusmarshall/common.h
rename to tests/auto/dbus/qdbusmarshall/common.h
diff --git a/tests/auto/qdbusmarshall/dummy.cpp b/tests/auto/dbus/qdbusmarshall/dummy.cpp
similarity index 100%
rename from tests/auto/qdbusmarshall/dummy.cpp
rename to tests/auto/dbus/qdbusmarshall/dummy.cpp
diff --git a/tests/auto/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro
similarity index 100%
rename from tests/auto/qdbusmarshall/qdbusmarshall.pro
rename to tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro
diff --git a/tests/auto/qdbusmarshall/qpong/qpong.cpp b/tests/auto/dbus/qdbusmarshall/qpong/qpong.cpp
similarity index 100%
rename from tests/auto/qdbusmarshall/qpong/qpong.cpp
rename to tests/auto/dbus/qdbusmarshall/qpong/qpong.cpp
diff --git a/tests/auto/qdbusmarshall/qpong/qpong.pro b/tests/auto/dbus/qdbusmarshall/qpong/qpong.pro
similarity index 100%
rename from tests/auto/qdbusmarshall/qpong/qpong.pro
rename to tests/auto/dbus/qdbusmarshall/qpong/qpong.pro
diff --git a/tests/auto/qdbusmarshall/test/test.pro b/tests/auto/dbus/qdbusmarshall/test/test.pro
similarity index 100%
rename from tests/auto/qdbusmarshall/test/test.pro
rename to tests/auto/dbus/qdbusmarshall/test/test.pro
diff --git a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
similarity index 100%
rename from tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
rename to tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
diff --git a/tests/auto/qdbusmetaobject/.gitignore b/tests/auto/dbus/qdbusmetaobject/.gitignore
similarity index 100%
rename from tests/auto/qdbusmetaobject/.gitignore
rename to tests/auto/dbus/qdbusmetaobject/.gitignore
diff --git a/tests/auto/qdbusmetaobject/qdbusmetaobject.pro b/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro
similarity index 100%
rename from tests/auto/qdbusmetaobject/qdbusmetaobject.pro
rename to tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro
diff --git a/tests/auto/qdbusmetaobject/tst_qdbusmetaobject.cpp b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp
similarity index 100%
rename from tests/auto/qdbusmetaobject/tst_qdbusmetaobject.cpp
rename to tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp
diff --git a/tests/auto/qdbusmetatype/.gitignore b/tests/auto/dbus/qdbusmetatype/.gitignore
similarity index 100%
rename from tests/auto/qdbusmetatype/.gitignore
rename to tests/auto/dbus/qdbusmetatype/.gitignore
diff --git a/tests/auto/qdbusmetatype/qdbusmetatype.pro b/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro
similarity index 100%
rename from tests/auto/qdbusmetatype/qdbusmetatype.pro
rename to tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro
diff --git a/tests/auto/qdbusmetatype/tst_qdbusmetatype.cpp b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp
similarity index 100%
rename from tests/auto/qdbusmetatype/tst_qdbusmetatype.cpp
rename to tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp
diff --git a/tests/auto/qdbuspendingcall/.gitignore b/tests/auto/dbus/qdbuspendingcall/.gitignore
similarity index 100%
rename from tests/auto/qdbuspendingcall/.gitignore
rename to tests/auto/dbus/qdbuspendingcall/.gitignore
diff --git a/tests/auto/qdbuspendingcall/qdbuspendingcall.pro b/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro
similarity index 100%
rename from tests/auto/qdbuspendingcall/qdbuspendingcall.pro
rename to tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro
diff --git a/tests/auto/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
similarity index 100%
rename from tests/auto/qdbuspendingcall/tst_qdbuspendingcall.cpp
rename to tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
diff --git a/tests/auto/qdbuspendingreply/.gitignore b/tests/auto/dbus/qdbuspendingreply/.gitignore
similarity index 100%
rename from tests/auto/qdbuspendingreply/.gitignore
rename to tests/auto/dbus/qdbuspendingreply/.gitignore
diff --git a/tests/auto/qdbuspendingreply/qdbuspendingreply.pro b/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro
similarity index 100%
rename from tests/auto/qdbuspendingreply/qdbuspendingreply.pro
rename to tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro
diff --git a/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp b/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp
similarity index 100%
rename from tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp
rename to tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp
diff --git a/tests/auto/qdbusreply/.gitignore b/tests/auto/dbus/qdbusreply/.gitignore
similarity index 100%
rename from tests/auto/qdbusreply/.gitignore
rename to tests/auto/dbus/qdbusreply/.gitignore
diff --git a/tests/auto/qdbusreply/qdbusreply.pro b/tests/auto/dbus/qdbusreply/qdbusreply.pro
similarity index 100%
rename from tests/auto/qdbusreply/qdbusreply.pro
rename to tests/auto/dbus/qdbusreply/qdbusreply.pro
diff --git a/tests/auto/qdbusreply/tst_qdbusreply.cpp b/tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp
similarity index 100%
rename from tests/auto/qdbusreply/tst_qdbusreply.cpp
rename to tests/auto/dbus/qdbusreply/tst_qdbusreply.cpp
diff --git a/tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro b/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro
similarity index 100%
rename from tests/auto/qdbusservicewatcher/qdbusservicewatcher.pro
rename to tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro
diff --git a/tests/auto/qdbusservicewatcher/tst_qdbusservicewatcher.cpp b/tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp
similarity index 100%
rename from tests/auto/qdbusservicewatcher/tst_qdbusservicewatcher.cpp
rename to tests/auto/dbus/qdbusservicewatcher/tst_qdbusservicewatcher.cpp
diff --git a/tests/auto/qdbusthreading/.gitignore b/tests/auto/dbus/qdbusthreading/.gitignore
similarity index 100%
rename from tests/auto/qdbusthreading/.gitignore
rename to tests/auto/dbus/qdbusthreading/.gitignore
diff --git a/tests/auto/qdbusthreading/qdbusthreading.pro b/tests/auto/dbus/qdbusthreading/qdbusthreading.pro
similarity index 100%
rename from tests/auto/qdbusthreading/qdbusthreading.pro
rename to tests/auto/dbus/qdbusthreading/qdbusthreading.pro
diff --git a/tests/auto/qdbusthreading/tst_qdbusthreading.cpp b/tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp
similarity index 100%
rename from tests/auto/qdbusthreading/tst_qdbusthreading.cpp
rename to tests/auto/dbus/qdbusthreading/tst_qdbusthreading.cpp
diff --git a/tests/auto/qdbustype/qdbustype.pro b/tests/auto/dbus/qdbustype/qdbustype.pro
similarity index 100%
rename from tests/auto/qdbustype/qdbustype.pro
rename to tests/auto/dbus/qdbustype/qdbustype.pro
diff --git a/tests/auto/qdbustype/tst_qdbustype.cpp b/tests/auto/dbus/qdbustype/tst_qdbustype.cpp
similarity index 100%
rename from tests/auto/qdbustype/tst_qdbustype.cpp
rename to tests/auto/dbus/qdbustype/tst_qdbustype.cpp
diff --git a/tests/auto/qdbusxmlparser/.gitignore b/tests/auto/dbus/qdbusxmlparser/.gitignore
similarity index 100%
rename from tests/auto/qdbusxmlparser/.gitignore
rename to tests/auto/dbus/qdbusxmlparser/.gitignore
diff --git a/tests/auto/qdbusxmlparser/qdbusxmlparser.pro b/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro
similarity index 100%
rename from tests/auto/qdbusxmlparser/qdbusxmlparser.pro
rename to tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro
diff --git a/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
similarity index 100%
rename from tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp
rename to tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp