diff --git a/tests/grib_ecpoint.sh b/tests/grib_ecpoint.sh
index 6e12571cc..875d3cfd4 100755
--- a/tests/grib_ecpoint.sh
+++ b/tests/grib_ecpoint.sh
@@ -16,9 +16,11 @@ tempGrib=temp.$label.grib
 
 sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
 
+latest=`${tools_dir}/grib_get -p tablesVersionLatest $sample_grib2`
+
 # 1. bias-corrected
 ## we check if we can set PDTN 73 and typeOfPostProcessing to ecPoint, ecPoint versioning and MARS type
-${tools_dir}/grib_set -s tablesVersion=31,productDefinitionTemplateNumber=73,backgroundProcess=1,\
+${tools_dir}/grib_set -s tablesVersion=$latest,productDefinitionTemplateNumber=73,backgroundProcess=1,\
 setLocalDefinition=1,grib2LocalSectionNumber=1,type=gbf,class=od,stream=enfo,\
 generatingProcessIdentifier=2,typeOfPostProcessing=206 $sample_grib2 $tempGrib
 grib_check_key_equals $tempGrib backgroundProcess,generatingProcessIdentifier,typeOfPostProcessing,type "1 2 206 gbf"
@@ -26,7 +28,7 @@ rm -f $tempGrib
 
 # 2. Point values
 ## we check if we can set PDTN 90 and typeOfPostProcessing to ecPoint, ecPoint versioning, MARS type, quantile
-${tools_dir}/grib_set -s tablesVersion=31,productDefinitionTemplateNumber=90,backgroundProcess=1,\
+${tools_dir}/grib_set -s tablesVersion=$latest,productDefinitionTemplateNumber=90,backgroundProcess=1,\
 setLocalDefinition=1,grib2LocalSectionNumber=1,type=pfc,class=od,stream=enfo,\
 totalNumberOfQuantiles=1000,quantileValue=995,\
 generatingProcessIdentifier=2,typeOfPostProcessing=206 $sample_grib2 $tempGrib
@@ -35,7 +37,7 @@ rm -f $tempGrib
 
 # 3. Point value metrics
 ## we check if we can set PDTN 90 and typeOfPostProcessing to ecPoint, ecPoint versioning, MARS type, quantile
-${tools_dir}/grib_set -s tablesVersion=31,productDefinitionTemplateNumber=90,backgroundProcess=1,\
+${tools_dir}/grib_set -s tablesVersion=$latest,productDefinitionTemplateNumber=90,backgroundProcess=1,\
 setLocalDefinition=1,grib2LocalSectionNumber=1,type=ppm,class=od,stream=enfo,\
 totalNumberOfQuantiles=1000,quantileValue=995,\
 generatingProcessIdentifier=2,typeOfPostProcessing=206 $sample_grib2 $tempGrib
@@ -44,7 +46,7 @@ rm -f $tempGrib
 
 # 4. weather types
 ## we check if we can set PDTN 73 and typeOfPostProcessing to ecPoint, ecPoint versioning and MARS type
-${tools_dir}/grib_set -s tablesVersion=31,productDefinitionTemplateNumber=73,backgroundProcess=1,\
+${tools_dir}/grib_set -s tablesVersion=$latest,productDefinitionTemplateNumber=73,backgroundProcess=1,\
 setLocalDefinition=1,grib2LocalSectionNumber=1,type=gwt,class=od,stream=enfo,\
 generatingProcessIdentifier=2,typeOfPostProcessing=206 $sample_grib2 $tempGrib
 grib_check_key_equals $tempGrib backgroundProcess,generatingProcessIdentifier,typeOfPostProcessing,type "1 2 206 gwt"