diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c409aa60f..2af3f3da0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -271,16 +271,16 @@ if( ENABLE_EXTRA_TESTS AND HAVE_ECCODES_THREADS )
                       TYPE SCRIPT
                       COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_encode_pthreads.sh )
 
-    foreach( test grib_ecc-604 grib_ecc-604-encode bufr_ecc-604 )
+    foreach( test grib_threads_ecc-604 grib_threads_ecc-604-encode bufr_ecc-604 )
         ecbuild_add_executable( TARGET    ${test}
                                 NOINSTALL
                                 SOURCES   ${test}.c
                                 LIBS      eccodes )
     endforeach()
-    ecbuild_add_test( TARGET eccodes_t_grib_ecc-604
+    ecbuild_add_test( TARGET eccodes_t_grib_threads_ecc-604
                       TYPE SCRIPT
                       TEST_DEPENDS eccodes_download_gribs
-                      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_ecc-604.sh )
+                      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_threads_ecc-604.sh )
     ecbuild_add_test( TARGET eccodes_t_bufr_ecc-604
                       TYPE SCRIPT
                       TEST_DEPENDS eccodes_download_bufrs
diff --git a/tests/grib_ecc-604-encode.c b/tests/grib_threads_ecc-604-encode.c
similarity index 100%
rename from tests/grib_ecc-604-encode.c
rename to tests/grib_threads_ecc-604-encode.c
diff --git a/tests/grib_ecc-604.c b/tests/grib_threads_ecc-604.c
similarity index 100%
rename from tests/grib_ecc-604.c
rename to tests/grib_threads_ecc-604.c
diff --git a/tests/grib_ecc-604.sh b/tests/grib_threads_ecc-604.sh
similarity index 89%
rename from tests/grib_ecc-604.sh
rename to tests/grib_threads_ecc-604.sh
index 8b226f5bb..d6e147471 100755
--- a/tests/grib_ecc-604.sh
+++ b/tests/grib_threads_ecc-604.sh
@@ -10,12 +10,13 @@
 
 . ./include.sh
 
-label="grib_ecc-604"
+label="grib_threads_ecc-604"
 temp_dir=tempdir.${label}
 
 NUM_THREADS=3
 NUM_ITER=10
 OUTPUT=output
+PROG="${test_dir}/grib_threads_ecc-604"
 
 validate()
 {
@@ -36,19 +37,19 @@ process()
     # Test 01: Clone + output
     # ------------------------
     rm -fr $OUTPUT;   mkdir -p $OUTPUT
-    time ${test_dir}/grib_ecc-604 -c -w par $input $NUM_THREADS $NUM_ITER
+    time $PROG -c -w par $input $NUM_THREADS $NUM_ITER
     validate
 
     # Test 02: No clone + output
     # --------------------------
     rm -fr $OUTPUT;   mkdir -p $OUTPUT
-    time ${test_dir}/grib_ecc-604 -w par $input $NUM_THREADS $NUM_ITER
+    time $PROG -w par $input $NUM_THREADS $NUM_ITER
     validate
 
     # Test 03: Clone + dump + no output
     # ---------------------------------
     rm -fr $OUTPUT
-    time ${test_dir}/grib_ecc-604 -c -d par $input $NUM_THREADS $NUM_ITER
+    time $PROG -c -d par $input $NUM_THREADS $NUM_ITER
     # Nothing to validate as there is no output
 }
 ###################################################