diff --git a/src/tests/meson.build b/src/tests/meson.build
index d4eddc0bf..ebf22bf5e 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -123,6 +123,7 @@ if have_clutter_tests
   subdir('clutter')
 endif
 
+subdir('protocol')
 subdir('wayland-test-clients')
 
 if have_installed_tests
diff --git a/src/tests/protocol/meson.build b/src/tests/protocol/meson.build
new file mode 100644
index 000000000..640b8ac8f
--- /dev/null
+++ b/src/tests/protocol/meson.build
@@ -0,0 +1,32 @@
+test_driver_server_header = custom_target(
+  'test-driver server header',
+  input: 'test-driver.xml',
+  output: 'test-driver-server-protocol.h',
+  command: [
+    wayland_scanner,
+    'server-header',
+    '@INPUT@', '@OUTPUT@',
+  ]
+)
+
+test_driver_client_header = custom_target(
+  'test-driver client header',
+  input: 'test-driver.xml',
+  output: 'test-driver-client-protocol.h',
+  command: [
+    wayland_scanner,
+    'client-header',
+    '@INPUT@', '@OUTPUT@',
+  ]
+)
+
+test_driver_protocol_code = custom_target(
+  'test-driver source',
+  input: 'test-driver.xml',
+  output: 'test-driver-protocol.c',
+  command: [
+    wayland_scanner,
+    'private-code',
+    '@INPUT@', '@OUTPUT@',
+  ]
+)
diff --git a/src/tests/wayland-test-clients/test-driver.xml b/src/tests/protocol/test-driver.xml
similarity index 100%
rename from src/tests/wayland-test-clients/test-driver.xml
rename to src/tests/protocol/test-driver.xml
diff --git a/src/tests/wayland-test-clients/meson.build b/src/tests/wayland-test-clients/meson.build
index ce24c3fc8..a0d548346 100644
--- a/src/tests/wayland-test-clients/meson.build
+++ b/src/tests/wayland-test-clients/meson.build
@@ -3,38 +3,6 @@ wayland_test_client_installed_tests_libexecdir = join_paths(
   'wayland-test-clients',
 )
 
-test_driver_server_header = custom_target(
-  'test-driver server header',
-  input: 'test-driver.xml',
-  output: 'test-driver-server-protocol.h',
-  command: [
-    wayland_scanner,
-    'server-header',
-    '@INPUT@', '@OUTPUT@',
-  ]
-)
-
-test_driver_client_header = custom_target(
-  'test-driver client header',
-  input: 'test-driver.xml',
-  output: 'test-driver-client-protocol.h',
-  command: [
-    wayland_scanner,
-    'client-header',
-    '@INPUT@', '@OUTPUT@',
-  ]
-)
-
-test_driver_protocol_code = custom_target(
-  'test-driver source',
-  input: 'test-driver.xml',
-  output: 'test-driver-protocol.c',
-  command: [
-    wayland_scanner,
-    'private-code',
-    '@INPUT@', '@OUTPUT@',
-  ]
-)
 
 common_sources = [
   'wayland-test-client-utils.c',