diff --git a/tests/bufr_change_edition.sh b/tests/bufr_change_edition.sh
index 04feb7d72..98228556a 100755
--- a/tests/bufr_change_edition.sh
+++ b/tests/bufr_change_edition.sh
@@ -13,7 +13,7 @@
 cd ${data_dir}/bufr
 
 # Define a common label for all the tmp files
-label="bufr_change_edition"
+label="bufr_change_edition_test"
 
 fBufrTmp=${label}".bufr.tmp"
 
diff --git a/tests/bufr_indexing.sh b/tests/bufr_indexing.sh
index da12caf12..a3030d46c 100755
--- a/tests/bufr_indexing.sh
+++ b/tests/bufr_indexing.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="bufr_indexing"
+label="bufr_indexing_test"
 tempIndex=temp.$label.$$.idx
 tempOut=temp.$label.$$.out
 tempRef=temp.$label.$$.ref
diff --git a/tests/codes_split_file.sh b/tests/codes_split_file.sh
index e9209cdf3..88021b4c2 100755
--- a/tests/codes_split_file.sh
+++ b/tests/codes_split_file.sh
@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 pwd
 # Define a common label for all the tmp files
-label="codes_split_file"
+label="codes_split_file_test"
 temp=$label.temp.grib
 
 # Do all the work in a temporary directory
diff --git a/tests/grib1to3.sh b/tests/grib1to3.sh
index de7bab965..9b6dc40d4 100755
--- a/tests/grib1to3.sh
+++ b/tests/grib1to3.sh
@@ -12,7 +12,7 @@
 
 REDIRECT=/dev/null
 
-label="grib1to3"
+label="grib1to3_test"
 temp=temp.$label.grib3
 sample_g1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
 ${tools_dir}/grib_set -s editionNumber=3 $sample_g1 $temp
diff --git a/tests/grib2_templates.sh b/tests/grib2_templates.sh
index 5d4f263d1..c1e062b20 100755
--- a/tests/grib2_templates.sh
+++ b/tests/grib2_templates.sh
@@ -10,7 +10,7 @@
 . ./include.ctest.sh
 set -u
 
-label="grib2_templates"
+label="grib2_templates_test"
 
 temp1=temp1.$label.grib2
 temp2=temp2.$label.grib2
diff --git a/tests/grib2_version.sh b/tests/grib2_version.sh
index 14e219a30..4f1661836 100755
--- a/tests/grib2_version.sh
+++ b/tests/grib2_version.sh
@@ -10,7 +10,7 @@
 . ./include.ctest.sh
 
 
-label="grib2_version"
+label="grib2_version_test"
 if [ ! -d "$ECCODES_DEFINITION_PATH" ]; then
     echo "Test $0 disabled. No definitions directory"
     exit 0
diff --git a/tests/grib2to3.sh b/tests/grib2to3.sh
index ece486fdc..ae4a4d339 100755
--- a/tests/grib2to3.sh
+++ b/tests/grib2to3.sh
@@ -11,7 +11,7 @@
 
 REDIRECT=/dev/null
 
-label="grib2to3"
+label="grib2to3_test"
 temp=temp.$label.grib3
 sample_g2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
 ${tools_dir}/grib_set -s editionNumber=3 $sample_g2 $temp
diff --git a/tests/grib3_templates.sh b/tests/grib3_templates.sh
index dcc90c48f..decba118a 100755
--- a/tests/grib3_templates.sh
+++ b/tests/grib3_templates.sh
@@ -11,7 +11,7 @@
 
 REDIRECT=/dev/null
 
-label="grib3_templates"
+label="grib3_templates_test"
 temp1=temp1.$label.grib3
 temp2=temp2.$label.grib3
 
diff --git a/tests/grib_change_scanning.sh b/tests/grib_change_scanning.sh
index 65b4360a0..9bd8f8561 100755
--- a/tests/grib_change_scanning.sh
+++ b/tests/grib_change_scanning.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_change_scanning"
+label="grib_change_scanning_test"
 
 editions="1 2"
 gridTypes="regular_ll rotated_ll" 
diff --git a/tests/grib_check_gaussian_grids.sh b/tests/grib_check_gaussian_grids.sh
index d1bb7a0b8..ec6adb8b7 100755
--- a/tests/grib_check_gaussian_grids.sh
+++ b/tests/grib_check_gaussian_grids.sh
@@ -9,7 +9,7 @@
 
 . ./include.ctest.sh
 
-label="grib_check_gaussian_grids"
+label="grib_check_gaussian_grids_test"
 temp=temp.$label.grib
 
 
diff --git a/tests/grib_complex.sh b/tests/grib_complex.sh
index 14d7a86a2..05f5663e8 100755
--- a/tests/grib_complex.sh
+++ b/tests/grib_complex.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_complex"
+label="grib_complex_test"
 temp=${label}".grib.tmp"
 temp1=${label}".1.tmp"
 temp2=${label}".2.tmp"
diff --git a/tests/grib_data_quality_checks.sh b/tests/grib_data_quality_checks.sh
index 8cd47b0cc..6a6177cfd 100755
--- a/tests/grib_data_quality_checks.sh
+++ b/tests/grib_data_quality_checks.sh
@@ -13,7 +13,7 @@
 # ---------------------------------------------------------
 # Tests for data quality checks
 # ---------------------------------------------------------
-label="grib_data_quality"
+label="grib_data_quality_test"
 tempOut=temp.1.${label}.out
 temp2=temp.2.${label}.out
 tempErr=temp.${label}.err
diff --git a/tests/grib_dump_debug.sh b/tests/grib_dump_debug.sh
index cc84ac62e..d5bceb4f7 100755
--- a/tests/grib_dump_debug.sh
+++ b/tests/grib_dump_debug.sh
@@ -9,7 +9,7 @@
 #
 
 . ./include.ctest.sh
-label="grib_dump_debug"
+label="grib_dump_debug_test"
 temp=temp.$label.txt
 
 REDIRECT=/dev/null
diff --git a/tests/grib_dump_json.sh b/tests/grib_dump_json.sh
index 83eb70e69..81b3d94ef 100755
--- a/tests/grib_dump_json.sh
+++ b/tests/grib_dump_json.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_dump_json"
+label="grib_dump_json_test"
 temp=${label}".temp.json"
 
 REDIRECT=/dev/null
diff --git a/tests/grib_efas.sh b/tests/grib_efas.sh
index 7a9da86f8..2c6541b79 100755
--- a/tests/grib_efas.sh
+++ b/tests/grib_efas.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_efas"
+label="grib_efas_test"
 sample=temp.sample.$label.grib
 temp1=temp1.$label.grib
 temp2=temp2.$label.grib
diff --git a/tests/grib_g1fcperiod.sh b/tests/grib_g1fcperiod.sh
index 97f6bf46b..173f6e898 100755
--- a/tests/grib_g1fcperiod.sh
+++ b/tests/grib_g1fcperiod.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_g1fcperiod"
+label="grib_g1fcperiod_test"
 sample_g1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
 temp=temp.$label.grib
 
diff --git a/tests/grib_g1monthlydate.sh b/tests/grib_g1monthlydate.sh
index 9825f32c7..06f478ec1 100755
--- a/tests/grib_g1monthlydate.sh
+++ b/tests/grib_g1monthlydate.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_g1monthlydate"
+label="grib_g1monthlydate_test"
 sample_g1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
 temp=temp.$label.grib
 
diff --git a/tests/grib_grid_unstructured.sh b/tests/grib_grid_unstructured.sh
index 24d0ffa29..8a68dc2b8 100755
--- a/tests/grib_grid_unstructured.sh
+++ b/tests/grib_grid_unstructured.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_grid_unstructured"
+label="grib_grid_unstructured_test"
 
 # Only relevant for GRIB2
 sample=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
diff --git a/tests/grib_indexing.sh b/tests/grib_indexing.sh
index b3f6a7583..841778f09 100755
--- a/tests/grib_indexing.sh
+++ b/tests/grib_indexing.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_indexing"
+label="grib_indexing_test"
 temp=temp.$label.index.out
 infile=${data_dir}/index.grib
 
diff --git a/tests/grib_lam_bf.sh b/tests/grib_lam_bf.sh
index 84ecc37f6..b1071f7e8 100755
--- a/tests/grib_lam_bf.sh
+++ b/tests/grib_lam_bf.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_lam_bf"
+label="grib_lam_bf_test"
 temp=temp.$label.txt
 
 if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
diff --git a/tests/grib_lam_gp.sh b/tests/grib_lam_gp.sh
index 16e65f498..65724a13a 100755
--- a/tests/grib_lam_gp.sh
+++ b/tests/grib_lam_gp.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_lam_gp"
+label="grib_lam_gp_test"
 temp=temp.$label.txt
 
 dump_and_check()
diff --git a/tests/grib_levtype.sh b/tests/grib_levtype.sh
index a46b1ee19..d6a8cc522 100755
--- a/tests/grib_levtype.sh
+++ b/tests/grib_levtype.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 set -u
-label="grib_levtype"
+label="grib_levtype_test"
 
 if [ ! -d "$ECCODES_DEFINITION_PATH" ]; then
     echo "Test $0 disabled. No definitions directory"
diff --git a/tests/grib_mars_keys.sh b/tests/grib_mars_keys.sh
index 40cc6a05a..5188d83b1 100755
--- a/tests/grib_mars_keys.sh
+++ b/tests/grib_mars_keys.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_mars_keys"
+label="grib_mars_keys_test"
 tempOut=temp.${label}.out
 tempGrib=temp.${label}.grib
 tempRef=temp.${label}.ref
diff --git a/tests/grib_packing_order.sh b/tests/grib_packing_order.sh
index 684874e54..3cadb3f91 100755
--- a/tests/grib_packing_order.sh
+++ b/tests/grib_packing_order.sh
@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 
 REDIRECT=/dev/null
-label="grib_packing_order"
+label="grib_packing_order_test"
 temp=${label}".grib.tmp"
 temp_simple1=${label}".simple1.tmp"
 temp_simple2=${label}".simple2.tmp"
diff --git a/tests/grib_png.sh b/tests/grib_png.sh
index 6acf763e9..5d28981a3 100755
--- a/tests/grib_png.sh
+++ b/tests/grib_png.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_png"
+label="grib_png_test"
 temp=${label}".grib.tmp"
 temp1=${label}".1.tmp"
 temp2=${label}".2.tmp"
diff --git a/tests/grib_tigge_conversions1.sh b/tests/grib_tigge_conversions1.sh
index b105a9d98..088066951 100755
--- a/tests/grib_tigge_conversions1.sh
+++ b/tests/grib_tigge_conversions1.sh
@@ -16,7 +16,7 @@
 
 REDIRECT=/dev/null
 
-label="grib_tigge_conv1"
+label="grib_tigge_conv1_test"
 dir="${data_dir}/tigge"
 temp1="temp.${label}.grib1_"
 temp2="temp.${label}.grib2_"
diff --git a/tests/grib_tigge_conversions2.sh b/tests/grib_tigge_conversions2.sh
index 3d1c0f947..4bf8666b4 100755
--- a/tests/grib_tigge_conversions2.sh
+++ b/tests/grib_tigge_conversions2.sh
@@ -16,7 +16,7 @@
 
 REDIRECT=/dev/null
 
-label="grib_tigge_conv2"
+label="grib_tigge_conv2_test"
 dir="${data_dir}/tigge"
 temp1="temp.${label}.grib1_"
 temp2="temp.${label}.grib2_"