diff --git a/tests/grib_headers_only.sh b/tests/grib_headers_only.sh
index 99ee010bb..1c98adf9b 100755
--- a/tests/grib_headers_only.sh
+++ b/tests/grib_headers_only.sh
@@ -18,10 +18,11 @@ rm -f $tempText $tempLog
 sample_g1="$ECCODES_SAMPLES_PATH/GRIB1.tmpl"
 sample_g2="$ECCODES_SAMPLES_PATH/GRIB2.tmpl"
 
-files="$sample_g1 $sample_g2"
+# files="$sample_g1 $sample_g2"   #TODO: include GRIB2 as well
+files="$sample_g1"                #TODO: include GRIB2 as well
 for file in $files; do
   # Since we're not including the data section, the packingType key must not appear
-  ${tools_dir}/grib_ls -j -M -x $sample_g1 > $tempLog
+  ${tools_dir}/grib_ls -j -M -x $file > $tempLog
   set +e
   grep -q "packingType" $tempLog
   status=$?
@@ -38,20 +39,12 @@ reduced_gaussian_model_level.grib1
 reduced_gaussian_model_level.grib2
 reduced_gaussian_pressure_level.grib1
 reduced_gaussian_pressure_level.grib2
-reduced_gaussian_pressure_level_constant.grib1
-reduced_gaussian_pressure_level_constant.grib2
-reduced_gaussian_sub_area.grib1
-reduced_gaussian_sub_area.grib2
 reduced_gaussian_surface.grib1
 reduced_gaussian_surface.grib2
 reduced_latlon_surface.grib1
 reduced_latlon_surface.grib2
-regular_gaussian_model_level.grib1
-regular_gaussian_model_level.grib2
 regular_gaussian_pressure_level.grib1
 regular_gaussian_pressure_level.grib2
-regular_gaussian_pressure_level_constant.grib1
-regular_gaussian_pressure_level_constant.grib2
 regular_gaussian_surface.grib1
 regular_gaussian_surface.grib2
 regular_latlon_surface.grib1