diff --git a/tests/graphics.c b/tests/graphics.c
index 556fc6ebca9f483b351b69bf6cdfea7836551588..2ea2482476d15f146d030a9ed724e7a0a5c8fc89 100644
--- a/tests/graphics.c
+++ b/tests/graphics.c
@@ -1379,45 +1379,45 @@ main (int argc,
   argv0 = argv[0];
 
   g_test_init (&argc, &argv, NULL);
-  g_test_add ("/object", Fixture, NULL,
+  g_test_add ("/graphics/object", Fixture, NULL,
               setup, test_object, teardown);
-  g_test_add ("/good", Fixture, NULL,
+  g_test_add ("/graphics/good", Fixture, NULL,
               setup, test_good_graphics, teardown);
-  g_test_add ("/bad", Fixture, NULL,
+  g_test_add ("/graphics/bad", Fixture, NULL,
               setup, test_bad_graphics, teardown);
-  g_test_add ("/hanging", Fixture, NULL,
+  g_test_add ("/graphics/hanging", Fixture, NULL,
               setup, test_timeout_graphics, teardown);
-  g_test_add ("/software", Fixture, NULL,
+  g_test_add ("/graphics/software", Fixture, NULL,
               setup, test_software_rendering, teardown);
 
-  g_test_add ("/vulkan", Fixture, NULL,
+  g_test_add ("/graphics/vulkan", Fixture, NULL,
               setup, test_good_vulkan, teardown);
-  g_test_add ("/vulkan-bad", Fixture, NULL,
+  g_test_add ("/graphics/vulkan-bad", Fixture, NULL,
               setup, test_bad_vulkan, teardown);
-  g_test_add ("/vulkan-mixed", Fixture, NULL,
+  g_test_add ("/graphics/vulkan-mixed", Fixture, NULL,
               setup, test_mixed_vulkan, teardown);
 
-  g_test_add ("/icd/egl/basic", Fixture, NULL,
+  g_test_add ("/graphics/icd/egl/basic", Fixture, NULL,
               setup, test_icd_egl, teardown);
-  g_test_add ("/icd/egl/dirs", Fixture, &dir_config,
+  g_test_add ("/graphics/icd/egl/dirs", Fixture, &dir_config,
               setup, test_icd_egl, teardown);
-  g_test_add ("/icd/egl/filenames", Fixture, &filename_config,
+  g_test_add ("/graphics/icd/egl/filenames", Fixture, &filename_config,
               setup, test_icd_egl, teardown);
-  g_test_add ("/icd/egl/flatpak", Fixture, &flatpak_config,
+  g_test_add ("/graphics/icd/egl/flatpak", Fixture, &flatpak_config,
               setup, test_icd_egl, teardown);
-  g_test_add ("/icd/egl/relative", Fixture, &relative_config,
+  g_test_add ("/graphics/icd/egl/relative", Fixture, &relative_config,
               setup, test_icd_egl, teardown);
-  g_test_add ("/icd/egl/xdg", Fixture, &xdg_config,
+  g_test_add ("/graphics/icd/egl/xdg", Fixture, &xdg_config,
               setup, test_icd_egl, teardown);
-  g_test_add ("/icd/vulkan/basic", Fixture, NULL,
+  g_test_add ("/graphics/icd/vulkan/basic", Fixture, NULL,
               setup, test_icd_vulkan, teardown);
-  g_test_add ("/icd/vulkan/filenames", Fixture, &filename_config,
+  g_test_add ("/graphics/icd/vulkan/filenames", Fixture, &filename_config,
               setup, test_icd_vulkan, teardown);
-  g_test_add ("/icd/vulkan/flatpak", Fixture, &flatpak_config,
+  g_test_add ("/graphics/icd/vulkan/flatpak", Fixture, &flatpak_config,
               setup, test_icd_vulkan, teardown);
-  g_test_add ("/icd/vulkan/relative", Fixture, &relative_config,
+  g_test_add ("/graphics/icd/vulkan/relative", Fixture, &relative_config,
               setup, test_icd_vulkan, teardown);
-  g_test_add ("/icd/vulkan/xdg", Fixture, &xdg_config,
+  g_test_add ("/graphics/icd/vulkan/xdg", Fixture, &xdg_config,
               setup, test_icd_vulkan, teardown);
 
   return g_test_run ();
diff --git a/tests/library.c b/tests/library.c
index c625d63bef6a6442203fc2038f0c6cab4526f85b..dc1b6d7a084974207b1ca56bff6b73ff6df9a03b 100644
--- a/tests/library.c
+++ b/tests/library.c
@@ -755,23 +755,23 @@ main (int argc,
       char **argv)
 {
   g_test_init (&argc, &argv, NULL);
-  g_test_add ("/object", Fixture, NULL,
+  g_test_add ("/library/object", Fixture, NULL,
               setup, test_object, teardown);
-  g_test_add ("/presence", Fixture, NULL, setup, test_presence,
+  g_test_add ("/library/presence", Fixture, NULL, setup, test_presence,
               teardown);
-  g_test_add ("/deb_symbols", Fixture, NULL, setup, test_deb_symbols,
+  g_test_add ("/library/deb_symbols", Fixture, NULL, setup, test_deb_symbols,
               teardown);
-  g_test_add ("/empty_line", Fixture, NULL, setup, test_empty_line,
+  g_test_add ("/library/empty_line", Fixture, NULL, setup, test_empty_line,
               teardown);
-  g_test_add ("/missing_symbol", Fixture, NULL, setup,
+  g_test_add ("/library/missing_symbol", Fixture, NULL, setup,
               test_missing_symbols, teardown);
-  g_test_add ("/misversioned_symbol_version", Fixture, NULL, setup,
+  g_test_add ("/library/misversioned_symbol_version", Fixture, NULL, setup,
               test_misversioned_symbols, teardown);
-  g_test_add ("/missing_symbol_and_version", Fixture, NULL, setup,
+  g_test_add ("/library/missing_symbol_and_version", Fixture, NULL, setup,
               test_missing_symbols_and_versions, teardown);
-  g_test_add ("/missing_library", Fixture, NULL, setup,
+  g_test_add ("/library/missing_library", Fixture, NULL, setup,
               test_missing_library, teardown);
-  g_test_add ("/missing_arch", Fixture, NULL, setup,
+  g_test_add ("/library/missing_arch", Fixture, NULL, setup,
               test_missing_arch, teardown);
 
   return g_test_run ();