diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b23693fee..e20bc3523 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -49,7 +49,7 @@ list( APPEND tests_no_data_reqd
     grib_calendar
     unit_tests
     md5
-    uerra
+    grib_uerra
     grib_2nd_order_numValues
     julian
     bufr_dump_samples
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 655a72cf3..cdfd331da 100755
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -51,7 +51,7 @@ TESTS = definitions.sh \
         julian.sh \
         grib_statistics.sh \
         tigge.sh \
-        uerra.sh \
+        grib_uerra.sh \
         tigge_conversions.sh \
         read_any.sh \
         grib_padding.sh \
diff --git a/tests/uerra.sh b/tests/grib_uerra.sh
similarity index 93%
rename from tests/uerra.sh
rename to tests/grib_uerra.sh
index 1d470d987..9d3e25a38 100755
--- a/tests/uerra.sh
+++ b/tests/grib_uerra.sh
@@ -12,12 +12,11 @@
 
 REDIRECT=/dev/null
 
-#set -eax
 grib2_sample=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
-this_test=ecCodes-uerra
-tempSample=tempSample.${this_test}.grib2
-temp1=temp1.${this_test}.grib2
-temp2=temp2.${this_test}.grib2
+label=grib_uerra_test
+tempSample=tempSample.${label}.grib2
+temp1=temp1.${label}.grib2
+temp2=temp2.${label}.grib2
 
 test_stream_and_type()
 {