diff --git a/tests/main.c b/tests/main.c
index 386413e..0c9abaf 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -89,6 +89,10 @@ add_suites_to_registry(void)
     if (error)
         return error;
 
+    error = add_cross_suite();
+    if (error)
+        return error;
+
     error = add_image_suite();
     if (error)
         return error;
@@ -137,10 +141,6 @@ add_suites_to_registry(void)
     if (error)
         return error;
 
-    error = add_visual_stimuli_suite();
-    if (error)
-        return error;
-
     error = add_vector_suite();
     if (error)
         return error;
diff --git a/tests/meson.build b/tests/meson.build
index 196eb42..8d4f0c5 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -73,6 +73,7 @@ unit_test = executable (
         'test-audio-utils.c',
         'test-canvas.c',
         'test-color.c',
+        'test-cross.c',
         'test-image.c',
         'test-gl-canvas.c',
         'test-gl-utils.c',
@@ -87,7 +88,6 @@ unit_test = executable (
         'test-utility.c',
         'test-wave.c',
         'test-visual-stimulus.c',
-        'test-visual-stimuli.c',
         'unit-test-utilities.c',
         'vector-test.c',
         'vector3-test.c',
diff --git a/tests/suites.h b/tests/suites.h
index 089845a..6de9849 100644
--- a/tests/suites.h
+++ b/tests/suites.h
@@ -18,6 +18,9 @@ add_canvas_suite(void);
 int
 add_color_suite(void);
 
+int
+add_cross_suite(void);
+
 int
 add_image_suite(void);
 
@@ -57,9 +60,6 @@ add_utility_suite(void);
 int
 add_visual_stimulus_suite(void);
 
-int
-add_visual_stimuli_suite(void);
-
 int
 add_vector_suite(void);
 
diff --git a/tests/test-visual-stimuli.c b/tests/test-cross.c
similarity index 97%
rename from tests/test-visual-stimuli.c
rename to tests/test-cross.c
index 09f55ca..2b42abc 100644
--- a/tests/test-visual-stimuli.c
+++ b/tests/test-cross.c
@@ -17,7 +17,7 @@ static PsyColor  *g_bg_color   = NULL;
 static PsyTimePoint *g_tp_start = NULL;
 
 static int
-visual_stimuli_setup(void)
+cross_setup(void)
 {
     set_log_handler_file("test-visual-stimuli.txt");
     g_debug("Entering %s", __func__);
@@ -48,7 +48,7 @@ visual_stimuli_setup(void)
 }
 
 static int
-visual_stimuli_teardown(void)
+cross_teardown(void)
 {
     g_debug("Entering %s", __func__);
     g_clear_object(&g_canvas);
@@ -219,10 +219,9 @@ cross_specific_values(void)
 }
 
 int
-add_visual_stimuli_suite(void)
+add_cross_suite(void)
 {
-    CU_Suite *suite = CU_add_suite(
-        "Visual stimuli suite", visual_stimuli_setup, visual_stimuli_teardown);
+    CU_Suite *suite = CU_add_suite("Cross suite", cross_setup, cross_teardown);
 
     CU_Test *test = NULL;