diff --git a/tests/guecs.cpp b/tests/guecs.cpp
index ecb6ce7..c4d3fb9 100644
--- a/tests/guecs.cpp
+++ b/tests/guecs.cpp
@@ -12,7 +12,7 @@ namespace guecs_tests {
   }
 
   fuc2::Set TESTS{
-    .name="GUECS tests (empty!)",
+    .name="guecs",
     .tests={
       TEST(test_prototype),
     }
diff --git a/tests/lel.cpp b/tests/lel.cpp
index fd0b183..273d988 100644
--- a/tests/lel.cpp
+++ b/tests/lel.cpp
@@ -64,7 +64,7 @@ namespace lel_tests {
   }
 
   fuc2::Set TESTS{
-    .name="lel parser tests",
+    .name="lel",
     .tests={
       TEST(test_basic_ops),
     }
diff --git a/tests/main.cpp b/tests/main.cpp
index 02811e1..1207005 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -9,9 +9,13 @@ TEST_SET(sound_tests);
 TEST_SET(texture_tests);
 
 int main(int argc, char* argv[]) {
-  run(lel_tests::TESTS);
-  run(guecs_tests::TESTS);
-  run(shader_tests::TESTS);
-  run(sound_tests::TESTS);
-  run(texture_tests::TESTS);
+  std::vector<Set> all_tests{
+    lel_tests::TESTS,
+    guecs_tests::TESTS,
+    shader_tests::TESTS,
+    sound_tests::TESTS,
+    texture_tests::TESTS,
+  };
+
+  run_tests(all_tests, argc, argv);
 }
diff --git a/tests/shaders.cpp b/tests/shaders.cpp
index c151d7b..e2560d0 100644
--- a/tests/shaders.cpp
+++ b/tests/shaders.cpp
@@ -28,7 +28,7 @@ namespace shader_tests {
   }
 
   fuc2::Set TESTS{
-    .name="shader tests",
+    .name="shader",
     .tests={
       TEST(test_shader_loading),
     }
diff --git a/tests/sound.cpp b/tests/sound.cpp
index 9d02fa8..c6d0514 100644
--- a/tests/sound.cpp
+++ b/tests/sound.cpp
@@ -15,7 +15,7 @@ namespace sound_tests {
   }
 
   fuc2::Set TESTS{
-    .name="sound manager tests",
+    .name="sound",
       .tests={
         TEST(test_sound_manager),
       }
diff --git a/tests/textures.cpp b/tests/textures.cpp
index f85883c..65da69d 100644
--- a/tests/textures.cpp
+++ b/tests/textures.cpp
@@ -16,7 +16,7 @@ namespace texture_tests {
   }
 
   fuc2::Set TESTS{
-    .name="texture manager tests",
+    .name="texture",
       .tests={
         TEST(test_texture_management),
       }