diff --git a/tests/grib2_templates.sh b/tests/grib2_templates.sh
index 64b43e4ad..bb295b73a 100755
--- a/tests/grib2_templates.sh
+++ b/tests/grib2_templates.sh
@@ -26,7 +26,7 @@ latestOfficial=`${tools_dir}/grib_get -p tablesVersionLatestOfficial $sample2`
 
 latest_codetable_file=$ECCODES_DEFINITION_PATH/grib2/tables/$latestOfficial/4.0.table
 awk '$1 !~ /#/ && $1 < 65000 {print $1}' $latest_codetable_file | while read pdtn; do
-    if [ ! -f "$ECCODES_DEFINITION_PATH/grib2/template.4.$pdtn.def" ]; then
+    if [ ! -f "$ECCODES_DEFINITION_PATH/grib2/templates/template.4.$pdtn.def" ]; then
         echo "GRIB2 template for product definition $pdtn does not exist!"
         exit 1
     fi
diff --git a/tests/grib_list_keys.sh b/tests/grib_list_keys.sh
index c58bddc96..c1d7295ed 100755
--- a/tests/grib_list_keys.sh
+++ b/tests/grib_list_keys.sh
@@ -16,9 +16,9 @@ tempOut=temp.$label.txt
 if [ -d "$ECCODES_DEFINITION_PATH" ]; then
     if [ -x "${tools_dir}/grib_list_keys" ]; then
         ${tools_dir}/grib_list_keys $ECCODES_DEFINITION_PATH/boot.def > $tempOut
-        ${tools_dir}/grib_list_keys $ECCODES_DEFINITION_PATH/grib2/template.4.2000.def > $tempOut
-        ${tools_dir}/grib_list_keys $ECCODES_DEFINITION_PATH/grib2/template.3.0.def > $tempOut
-        ${tools_dir}/grib_list_keys $ECCODES_DEFINITION_PATH/grib2/template.3.120.def > $tempOut
+        ${tools_dir}/grib_list_keys $ECCODES_DEFINITION_PATH/grib2/templates/template.4.2000.def > $tempOut
+        ${tools_dir}/grib_list_keys $ECCODES_DEFINITION_PATH/grib2/templates/template.3.0.def > $tempOut
+        ${tools_dir}/grib_list_keys $ECCODES_DEFINITION_PATH/grib2/templates/template.3.120.def > $tempOut
     fi
 fi