diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 206b8bb39..3a3cb5453 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -24,7 +24,7 @@ list( APPEND test_bins
       grib_2nd_order_numValues
       optimize_scaling
       optimize_scaling_sh
-      ecc-386
+      grib_ecc-386
       ecc-517
       bufr_get_element
       sh_ieee64
@@ -82,7 +82,7 @@ list( APPEND tests_data_reqd
     ecc-379
     ecc-393
     ecc-433
-    ecc-490
+    grib_ecc-490
     ecc-556
     gts_get
     gts_ls
@@ -251,9 +251,9 @@ ecbuild_add_test( TARGET eccodes_t_grib_check_param_concepts
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_check_param_concepts.sh
 )
 # Performance test. Must have -DENABLE_GRIB_TIMER=ON
-ecbuild_add_test( TARGET eccodes_t_ecc-386
+ecbuild_add_test( TARGET eccodes_t_grib_ecc-386
                   TYPE SCRIPT
                   CONDITION ENABLE_EXTRA_TESTS AND ENABLE_GRIB_TIMER
-                  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ecc-386.sh
+                  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_ecc-386.sh
                   TEST_DEPENDS eccodes_download_gribs
 )
diff --git a/tests/ecc-386.c b/tests/grib_ecc-386.c
similarity index 100%
rename from tests/ecc-386.c
rename to tests/grib_ecc-386.c
diff --git a/tests/ecc-386.sh b/tests/grib_ecc-386.sh
similarity index 100%
rename from tests/ecc-386.sh
rename to tests/grib_ecc-386.sh
diff --git a/tests/ecc-490.sh b/tests/grib_ecc-490.sh
similarity index 100%
rename from tests/ecc-490.sh
rename to tests/grib_ecc-490.sh