diff --git a/tests/auto/wayland/client.pro b/tests/auto/wayland/client.pro
index eaf6c6e9586..916b3abe445 100644
--- a/tests/auto/wayland/client.pro
+++ b/tests/auto/wayland/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/wayland/client/client.pro b/tests/auto/wayland/client/client.pro
new file mode 100644
index 00000000000..006d130a039
--- /dev/null
+++ b/tests/auto/wayland/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/wayland/mockcompositor.cpp b/tests/auto/wayland/client/mockcompositor.cpp
similarity index 100%
rename from tests/auto/wayland/mockcompositor.cpp
rename to tests/auto/wayland/client/mockcompositor.cpp
diff --git a/tests/auto/wayland/mockcompositor.h b/tests/auto/wayland/client/mockcompositor.h
similarity index 100%
rename from tests/auto/wayland/mockcompositor.h
rename to tests/auto/wayland/client/mockcompositor.h
diff --git a/tests/auto/wayland/mockinput.cpp b/tests/auto/wayland/client/mockinput.cpp
similarity index 100%
rename from tests/auto/wayland/mockinput.cpp
rename to tests/auto/wayland/client/mockinput.cpp
diff --git a/tests/auto/wayland/mockinput.h b/tests/auto/wayland/client/mockinput.h
similarity index 100%
rename from tests/auto/wayland/mockinput.h
rename to tests/auto/wayland/client/mockinput.h
diff --git a/tests/auto/wayland/mockoutput.cpp b/tests/auto/wayland/client/mockoutput.cpp
similarity index 100%
rename from tests/auto/wayland/mockoutput.cpp
rename to tests/auto/wayland/client/mockoutput.cpp
diff --git a/tests/auto/wayland/mockshell.cpp b/tests/auto/wayland/client/mockshell.cpp
similarity index 100%
rename from tests/auto/wayland/mockshell.cpp
rename to tests/auto/wayland/client/mockshell.cpp
diff --git a/tests/auto/wayland/mocksurface.cpp b/tests/auto/wayland/client/mocksurface.cpp
similarity index 100%
rename from tests/auto/wayland/mocksurface.cpp
rename to tests/auto/wayland/client/mocksurface.cpp
diff --git a/tests/auto/wayland/mocksurface.h b/tests/auto/wayland/client/mocksurface.h
similarity index 100%
rename from tests/auto/wayland/mocksurface.h
rename to tests/auto/wayland/client/mocksurface.h
diff --git a/tests/auto/wayland/tst_client.cpp b/tests/auto/wayland/client/tst_client.cpp
similarity index 100%
rename from tests/auto/wayland/tst_client.cpp
rename to tests/auto/wayland/client/tst_client.cpp