diff --git a/src/tests/meson.build b/src/tests/meson.build
index e2d59b99c..21b2df3d0 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -86,19 +86,6 @@ subdir('wayland-test-clients')
 
 if have_installed_tests
   stacking_files_datadir = join_paths(pkgdatadir, 'tests')
-
-  installed_tests_cdata = configuration_data()
-  installed_tests_cdata.set('libexecdir', libexecdir)
-  installed_tests_cdata.set('apiversion', libmutter_api_version)
-
-  configure_file(
-    input: 'mutter-all.test.in',
-    output: 'mutter-all.test',
-    configuration: installed_tests_cdata,
-    install: true,
-    install_dir: mutter_installed_tests_datadir,
-  )
-
   install_subdir('stacking', install_dir: stacking_files_datadir)
 endif
 
@@ -471,6 +458,22 @@ foreach stacking_test: stacking_tests
     is_parallel: false,
     timeout: 60,
   )
+
+  if have_installed_tests
+    installed_tests_cdata = configuration_data()
+    installed_tests_cdata.set('apiversion', libmutter_api_version)
+    installed_tests_cdata.set('libexecdir', libexecdir)
+    installed_tests_cdata.set('tests_datadir', tests_datadir)
+    installed_tests_cdata.set('stacking_test', stacking_test)
+
+    configure_file(
+      input: 'stacking.test.in',
+      output: stacking_test + '.test',
+      configuration: installed_tests_cdata,
+      install: true,
+      install_dir: mutter_installed_tests_datadir,
+    )
+  endif
 endforeach
 
 if have_kvm_tests or have_tty_tests
diff --git a/src/tests/mutter-all.test.in b/src/tests/mutter-all.test.in
deleted file mode 100644
index 12536c11b..000000000
--- a/src/tests/mutter-all.test.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Test]
-Description=All Mutter tests
-# Can't use TestEnvironment for GSETTINGS_BACKEND=memory until there's
-# a solution for
-# https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/issues/1,
-# and anyway that wouldn't be sufficient to handle XDG_RUNTIME_DIR
-Exec=sh -ec 'env GSETTINGS_BACKEND=memory XDG_RUNTIME_DIR="$(mktemp -d -t mutter-@apiversion@-all-tests-XXXXXX)" @libexecdir@/installed-tests/mutter-@apiversion@/mutter-installed-dbus-session.py xvfb-run -a -s "+iglx -noreset" -- @libexecdir@/installed-tests/mutter-@apiversion@/mutter-test-runner --all'
-Type=session
-Output=TAP
diff --git a/src/tests/stacking.test.in b/src/tests/stacking.test.in
new file mode 100644
index 000000000..c26ec7478
--- /dev/null
+++ b/src/tests/stacking.test.in
@@ -0,0 +1,9 @@
+[Test]
+Description=Mutter stacking test: @stacking_test@
+# Can't use TestEnvironment for GSETTINGS_BACKEND=memory until there's
+# a solution for
+# https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/issues/1,
+# and anyway that wouldn't be sufficient to handle XDG_RUNTIME_DIR
+Exec=sh -ec 'env GSETTINGS_BACKEND=memory XDG_RUNTIME_DIR="$(mktemp -d -t mutter-@apiversion@-@stacking_test@-XXXXXX)" @libexecdir@/installed-tests/mutter-@apiversion@/mutter-installed-dbus-session.py xvfb-run -a -s "+iglx -noreset" -- @libexecdir@/installed-tests/mutter-@apiversion@/mutter-test-runner @tests_datadir@/stacking/@stacking_test@.metatest'
+Type=session
+Output=TAP