diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9cc08c4fc..6bf82422d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -102,17 +102,17 @@ list( APPEND tests_data_reqd
     missing
     local
     step
-    set
+    grib_set
     iterator
     grib_compare
-    level
+    grib_level
     index
     bitmap
     list
     grib_second_order
     multi_from_message
     grib_change_scanning
-    statistics
+    grib_statistics
     tigge
     tigge_conversions
     read_any
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 219e10e47..5cbb5f06c 100755
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,10 +36,10 @@ TESTS = definitions.sh \
         missing.sh \
         local.sh \
         step.sh \
-        set.sh \
+        grib_set.sh \
         iterator.sh \
         grib_compare.sh \
-        level.sh \
+        grib_level.sh \
         index.sh \
         bitmap.sh \
         list.sh \
@@ -47,7 +47,7 @@ TESTS = definitions.sh \
         multi_from_message.sh \
         grib_change_scanning.sh \
         julian.sh \
-        statistics.sh \
+        grib_statistics.sh \
         tigge.sh \
         uerra.sh \
         tigge_conversions.sh \
diff --git a/tests/level.sh b/tests/grib_level.sh
similarity index 100%
rename from tests/level.sh
rename to tests/grib_level.sh
diff --git a/tests/set.sh b/tests/grib_set.sh
similarity index 100%
rename from tests/set.sh
rename to tests/grib_set.sh
diff --git a/tests/statistics.sh b/tests/grib_statistics.sh
similarity index 100%
rename from tests/statistics.sh
rename to tests/grib_statistics.sh