diff --git a/tests/meson.build b/tests/meson.build
index c84b885d..5ae110de 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -208,7 +208,10 @@ if get_option('xwayland')
 	if not d.found()
 		error('Xwayland tests require libX11 which was not found. Or, you can use \'-Dxwayland=false\'.')
 	endif
-	tests_weston += [ [ 'xwayland', [], d ] ]
+	tests += {
+		'name': 'xwayland',
+		'dep_objs': d,
+	}
 endif
 
 # Manual test plugin, not used in the automatic suite
diff --git a/tests/xwayland-test.c b/tests/xwayland-test.c
index af0b5bae..665f6ea7 100644
--- a/tests/xwayland-test.c
+++ b/tests/xwayland-test.c
@@ -42,6 +42,19 @@
 #include <string.h>
 
 #include "weston-test-runner.h"
+#include "weston-test-fixture-compositor.h"
+
+static enum test_result_code
+fixture_setup(struct weston_test_harness *harness)
+{
+	struct compositor_setup setup;
+
+	compositor_setup_defaults(&setup);
+	setup.xwayland = true;
+
+	return weston_test_harness_execute_as_client(harness, &setup);
+}
+DECLARE_FIXTURE_SETUP(fixture_setup);
 
 TEST(xwayland_client_test)
 {