diff --git a/tests/meson.build b/tests/meson.build
index 655092e19e36aa4e67c979f56c6d70e0f318878c..8f7c83298c45acc82278dd1c5470f22cf296e2bc 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,17 +1 @@
-common_deps = [gobject_dep, gio_dep, wp_dep, pipewire_dep]
-common_env = [
-  'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
-  'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
-]
-
-test(
-  'test-properties',
-  executable('test-properties', 'properties.c', dependencies: common_deps),
-  env: common_env,
-)
-
-test(
-  'test-proxy',
-  executable('test-proxy', 'proxy.c', dependencies: common_deps),
-  env: common_env,
-)
+subdir('wp')
diff --git a/tests/wp/meson.build b/tests/wp/meson.build
new file mode 100644
index 0000000000000000000000000000000000000000..655092e19e36aa4e67c979f56c6d70e0f318878c
--- /dev/null
+++ b/tests/wp/meson.build
@@ -0,0 +1,17 @@
+common_deps = [gobject_dep, gio_dep, wp_dep, pipewire_dep]
+common_env = [
+  'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
+  'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+]
+
+test(
+  'test-properties',
+  executable('test-properties', 'properties.c', dependencies: common_deps),
+  env: common_env,
+)
+
+test(
+  'test-proxy',
+  executable('test-proxy', 'proxy.c', dependencies: common_deps),
+  env: common_env,
+)
diff --git a/tests/properties.c b/tests/wp/properties.c
similarity index 100%
rename from tests/properties.c
rename to tests/wp/properties.c
diff --git a/tests/proxy.c b/tests/wp/proxy.c
similarity index 100%
rename from tests/proxy.c
rename to tests/wp/proxy.c
diff --git a/tests/test-server.h b/tests/wp/test-server.h
similarity index 100%
rename from tests/test-server.h
rename to tests/wp/test-server.h