diff --git a/clutter/tests/conform/meson.build b/clutter/tests/conform/meson.build
index a9f2d7e20..05893947b 100644
--- a/clutter/tests/conform/meson.build
+++ b/clutter/tests/conform/meson.build
@@ -74,7 +74,8 @@ foreach test : clutter_conform_tests
     install: false,
   )
 
-  test('clutter/conform/@0@'.format(test), test_executable,
+  test(test, test_executable,
+    suite: ['clutter', 'clutter/conform'],
     env: test_env
   )
 endforeach
diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index e499b526f..de2d2fa4b 100644
--- a/cogl/tests/conform/meson.build
+++ b/cogl/tests/conform/meson.build
@@ -107,7 +107,8 @@ cogl_conform_unit_tests = custom_target('cogl-tests-conform-unit-tests',
   install_dir: cogl_installed_tests_libexecdir,
 )
 
-test('cogl/conform', cogl_run_tests,
+test('conform', cogl_run_tests,
+  suite: ['cogl'],
   args: [
     cogl_config_env,
     libmutter_cogl_test_conformance,
diff --git a/cogl/tests/unit/meson.build b/cogl/tests/unit/meson.build
index d5951f627..39693443d 100644
--- a/cogl/tests/unit/meson.build
+++ b/cogl/tests/unit/meson.build
@@ -31,7 +31,8 @@ cogl_unit_unit_tests = custom_target('cogl-tests-unit-unit-tests',
   install: false,
 )
 
-test('cogl/unit', cogl_run_tests,
+test('unit', cogl_run_tests,
+  suite: ['cogl'],
   args: [
     cogl_config_env,
     libmutter_cogl_test_unit,
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 20d70f8b2..f380e5b22 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -125,13 +125,15 @@ foreach stacking_test: stacking_tests
   )
 endforeach
 
-test('mutter/unit', unit_tests,
+test('normal', unit_tests,
+  suite: ['core', 'mutter/unit'],
   env: test_env,
   is_parallel: false,
   timeout: 60,
 )
 
-test('mutter/unit/headless-start', headless_start_test,
+test('headless-start', headless_start_test,
+  suite: ['core', 'mutter/unit'],
   env: test_env,
   is_parallel: false,
   timeout: 60,