diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4ca0701c6..8da2e475c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -15,7 +15,7 @@ list( APPEND test_bins
       read_any
       julian
       index
-      multi_from_message
+      grib_multi_from_message
       read_index
       unit_tests
       bufr_keys_iter
@@ -152,7 +152,7 @@ list( APPEND tests_data_reqd
     grib_bitmap
     grib_list
     grib_second_order
-    multi_from_message
+    grib_multi_from_message
     grib_change_scanning
     grib_statistics
     grib_tigge
diff --git a/tests/multi_from_message.c b/tests/grib_multi_from_message.c
similarity index 100%
rename from tests/multi_from_message.c
rename to tests/grib_multi_from_message.c
diff --git a/tests/multi_from_message.sh b/tests/grib_multi_from_message.sh
similarity index 73%
rename from tests/multi_from_message.sh
rename to tests/grib_multi_from_message.sh
index 873af94d0..263886083 100755
--- a/tests/multi_from_message.sh
+++ b/tests/grib_multi_from_message.sh
@@ -11,25 +11,19 @@
 
 . ./include.sh
 
-out1=${data_dir}/multi1.out
-out2=${data_dir}/multi2.out
+label='grib_multi_from_message'
+out1=${data_dir}/temp.$label.1.out
+out2=${data_dir}/temp.$label.2.out
 
 for infile in ${data_dir}/multi.grib2 ${data_dir}/reduced_gaussian_model_level.grib1
 do
-  #if [ ! -f ${infile} ]
-  #then
-  #  echo no data to test
-  #  exit 0
-  #fi
-
-  $EXEC ${test_dir}/multi_from_message -m $infile > $out1
+  $EXEC ${test_dir}/grib_multi_from_message -m $infile > $out1
   ${tools_dir}/grib_get -p count,shortName,level $infile > $out2
   diff $out1 $out2
 
-  $EXEC ${test_dir}/multi_from_message $infile > $out1
+  $EXEC ${test_dir}/grib_multi_from_message $infile > $out1
   ${tools_dir}/grib_get -M -p count,shortName,level $infile > $out2
   diff $out1 $out2
 
   rm -f $out1 $out2
-
 done