diff --git a/tests/auto/client/client.pro b/tests/auto/client/client.pro
index eaf6c6e9586d2dc366aa5920acc554612b0a1a3c..916b3abe445bcb974276bb4cfbc754adc75c3637 100644
--- a/tests/auto/client/client.pro
+++ b/tests/auto/client/client.pro
@@ -1,25 +1,3 @@
-CONFIG += testcase link_pkgconfig
-TARGET = tst_client
+TEMPLATE=subdirs
 
-QT += testlib
-QT += core-private gui-private
-
-!contains(QT_CONFIG, no-pkg-config) {
-    PKGCONFIG += wayland-client wayland-server
-} else {
-    LIBS += -lwayland-client -lwayland-server
-}
-
-CONFIG += wayland-scanner
-WAYLANDSERVERSOURCES += \
-    ../../../src/3rdparty/protocol/wayland.xml
-
-SOURCES += tst_client.cpp \
-           mockcompositor.cpp \
-           mockinput.cpp \
-           mockshell.cpp \
-           mocksurface.cpp \
-           mockoutput.cpp
-HEADERS += mockcompositor.h \
-           mockinput.h \
-           mocksurface.h \
+SUBDIRS += client
diff --git a/tests/auto/client/client/client.pro b/tests/auto/client/client/client.pro
new file mode 100644
index 0000000000000000000000000000000000000000..006d130a0398bf0086eb7c075b8b3195e96da05b
--- /dev/null
+++ b/tests/auto/client/client/client.pro
@@ -0,0 +1,28 @@
+CONFIG += testcase link_pkgconfig
+TARGET = tst_client
+
+QT += testlib
+QT += core-private gui-private
+
+!contains(QT_CONFIG, no-pkg-config) {
+    PKGCONFIG += wayland-client wayland-server
+} else {
+    LIBS += -lwayland-client -lwayland-server
+}
+
+CONFIG += wayland-scanner
+WAYLANDSERVERSOURCES += \
+    ../../../../src/3rdparty/protocol/wayland.xml
+
+SOURCES += \
+    tst_client.cpp \
+    mockcompositor.cpp \
+    mockinput.cpp \
+    mockshell.cpp \
+    mocksurface.cpp \
+    mockoutput.cpp
+
+HEADERS += \
+    mockcompositor.h \
+    mockinput.h \
+    mocksurface.h
diff --git a/tests/auto/client/mockcompositor.cpp b/tests/auto/client/client/mockcompositor.cpp
similarity index 100%
rename from tests/auto/client/mockcompositor.cpp
rename to tests/auto/client/client/mockcompositor.cpp
diff --git a/tests/auto/client/mockcompositor.h b/tests/auto/client/client/mockcompositor.h
similarity index 100%
rename from tests/auto/client/mockcompositor.h
rename to tests/auto/client/client/mockcompositor.h
diff --git a/tests/auto/client/mockinput.cpp b/tests/auto/client/client/mockinput.cpp
similarity index 100%
rename from tests/auto/client/mockinput.cpp
rename to tests/auto/client/client/mockinput.cpp
diff --git a/tests/auto/client/mockinput.h b/tests/auto/client/client/mockinput.h
similarity index 100%
rename from tests/auto/client/mockinput.h
rename to tests/auto/client/client/mockinput.h
diff --git a/tests/auto/client/mockoutput.cpp b/tests/auto/client/client/mockoutput.cpp
similarity index 100%
rename from tests/auto/client/mockoutput.cpp
rename to tests/auto/client/client/mockoutput.cpp
diff --git a/tests/auto/client/mockshell.cpp b/tests/auto/client/client/mockshell.cpp
similarity index 100%
rename from tests/auto/client/mockshell.cpp
rename to tests/auto/client/client/mockshell.cpp
diff --git a/tests/auto/client/mocksurface.cpp b/tests/auto/client/client/mocksurface.cpp
similarity index 100%
rename from tests/auto/client/mocksurface.cpp
rename to tests/auto/client/client/mocksurface.cpp
diff --git a/tests/auto/client/mocksurface.h b/tests/auto/client/client/mocksurface.h
similarity index 100%
rename from tests/auto/client/mocksurface.h
rename to tests/auto/client/client/mocksurface.h
diff --git a/tests/auto/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
similarity index 100%
rename from tests/auto/client/tst_client.cpp
rename to tests/auto/client/client/tst_client.cpp
diff --git a/tests/auto/compositor/compositor.pro b/tests/auto/compositor/compositor.pro
index 9f9044fdfb79d1847c260aaf24bf94e4bec1b303..6bf2aef6cfcee4d21388cd6b700f399796b5b7e1 100644
--- a/tests/auto/compositor/compositor.pro
+++ b/tests/auto/compositor/compositor.pro
@@ -1,38 +1,3 @@
-CONFIG += testcase link_pkgconfig
-CONFIG += wayland-scanner
-TARGET = tst_compositor
+TEMPLATE=subdirs
 
-QT += testlib
-QT += core-private gui-private waylandcompositor waylandcompositor-private
-
-!contains(QT_CONFIG, no-pkg-config) {
-    PKGCONFIG += wayland-client wayland-server
-} else {
-    LIBS += -lwayland-client -lwayland-server
-}
-
-config_xkbcommon {
-    !contains(QT_CONFIG, no-pkg-config) {
-        PKGCONFIG_PRIVATE += xkbcommon
-    } else {
-        LIBS_PRIVATE += -lxkbcommon
-    }
-} else {
-    DEFINES += QT_NO_WAYLAND_XKB
-}
-
-WAYLANDCLIENTSOURCES += \
-            ../../../src/3rdparty/protocol/xdg-shell.xml \
-
-SOURCES += tst_compositor.cpp \
-           testcompositor.cpp \
-           testkeyboardgrabber.cpp \
-           mockclient.cpp \
-           mockseat.cpp \
-           testinputdevice.cpp
-
-HEADERS += testcompositor.h \
-           testkeyboardgrabber.h \
-           mockclient.h \
-           mockseat.h \
-           testinputdevice.h
+SUBDIRS += compositor
diff --git a/tests/auto/compositor/BLACKLIST b/tests/auto/compositor/compositor/BLACKLIST
similarity index 100%
rename from tests/auto/compositor/BLACKLIST
rename to tests/auto/compositor/compositor/BLACKLIST
diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro
new file mode 100644
index 0000000000000000000000000000000000000000..d85c30483b2cad86900bf73bc441f059b400cdca
--- /dev/null
+++ b/tests/auto/compositor/compositor/compositor.pro
@@ -0,0 +1,40 @@
+CONFIG += testcase link_pkgconfig
+CONFIG += wayland-scanner
+TARGET = tst_compositor
+
+QT += testlib
+QT += core-private gui-private waylandcompositor waylandcompositor-private
+
+!contains(QT_CONFIG, no-pkg-config) {
+    PKGCONFIG += wayland-client wayland-server
+} else {
+    LIBS += -lwayland-client -lwayland-server
+}
+
+config_xkbcommon {
+    !contains(QT_CONFIG, no-pkg-config) {
+        PKGCONFIG_PRIVATE += xkbcommon
+    } else {
+        LIBS_PRIVATE += -lxkbcommon
+    }
+} else {
+    DEFINES += QT_NO_WAYLAND_XKB
+}
+
+WAYLANDCLIENTSOURCES += \
+            ../../../../src/3rdparty/protocol/xdg-shell.xml \
+
+SOURCES += \
+    tst_compositor.cpp \
+    testcompositor.cpp \
+    testkeyboardgrabber.cpp \
+    mockclient.cpp \
+    mockseat.cpp \
+    testinputdevice.cpp
+
+HEADERS += \
+    testcompositor.h \
+    testkeyboardgrabber.h \
+    mockclient.h \
+    mockseat.h \
+    testinputdevice.h
diff --git a/tests/auto/compositor/mockclient.cpp b/tests/auto/compositor/compositor/mockclient.cpp
similarity index 100%
rename from tests/auto/compositor/mockclient.cpp
rename to tests/auto/compositor/compositor/mockclient.cpp
diff --git a/tests/auto/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h
similarity index 100%
rename from tests/auto/compositor/mockclient.h
rename to tests/auto/compositor/compositor/mockclient.h
diff --git a/tests/auto/compositor/mockseat.cpp b/tests/auto/compositor/compositor/mockseat.cpp
similarity index 100%
rename from tests/auto/compositor/mockseat.cpp
rename to tests/auto/compositor/compositor/mockseat.cpp
diff --git a/tests/auto/compositor/mockseat.h b/tests/auto/compositor/compositor/mockseat.h
similarity index 100%
rename from tests/auto/compositor/mockseat.h
rename to tests/auto/compositor/compositor/mockseat.h
diff --git a/tests/auto/compositor/testcompositor.cpp b/tests/auto/compositor/compositor/testcompositor.cpp
similarity index 100%
rename from tests/auto/compositor/testcompositor.cpp
rename to tests/auto/compositor/compositor/testcompositor.cpp
diff --git a/tests/auto/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h
similarity index 100%
rename from tests/auto/compositor/testcompositor.h
rename to tests/auto/compositor/compositor/testcompositor.h
diff --git a/tests/auto/compositor/testinputdevice.cpp b/tests/auto/compositor/compositor/testinputdevice.cpp
similarity index 100%
rename from tests/auto/compositor/testinputdevice.cpp
rename to tests/auto/compositor/compositor/testinputdevice.cpp
diff --git a/tests/auto/compositor/testinputdevice.h b/tests/auto/compositor/compositor/testinputdevice.h
similarity index 100%
rename from tests/auto/compositor/testinputdevice.h
rename to tests/auto/compositor/compositor/testinputdevice.h
diff --git a/tests/auto/compositor/testkeyboardgrabber.cpp b/tests/auto/compositor/compositor/testkeyboardgrabber.cpp
similarity index 100%
rename from tests/auto/compositor/testkeyboardgrabber.cpp
rename to tests/auto/compositor/compositor/testkeyboardgrabber.cpp
diff --git a/tests/auto/compositor/testkeyboardgrabber.h b/tests/auto/compositor/compositor/testkeyboardgrabber.h
similarity index 100%
rename from tests/auto/compositor/testkeyboardgrabber.h
rename to tests/auto/compositor/compositor/testkeyboardgrabber.h
diff --git a/tests/auto/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
similarity index 100%
rename from tests/auto/compositor/tst_compositor.cpp
rename to tests/auto/compositor/compositor/tst_compositor.cpp
diff --git a/tests/global/.gitignore b/tests/global/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..7407af1a54da14bc2b9510f1778bcc909b011335
--- /dev/null
+++ b/tests/global/.gitignore
@@ -0,0 +1 @@
+global.pro