diff --git a/tests/grib2_chemicals_aerosols.sh b/tests/grib2_chemicals_aerosols.sh
index 6ab0649a2..38a4a4759 100755
--- a/tests/grib2_chemicals_aerosols.sh
+++ b/tests/grib2_chemicals_aerosols.sh
@@ -168,5 +168,10 @@ ${tools_dir}/grib_dump -O -p aerosolType $temp > $temp1
 grep -q "Nitrate Fine Mode .*grib2/tables/local/ecmf/1/4.233.table" $temp1
 grib_check_key_equals $temp aerosolTypeName "Nitrate Fine Mode"
 
+# Automatic PDT selection
+${tools_dir}/grib_set -s paramId=403000 $sample2 $temp
+grib_check_key_equals $temp productDefinitionTemplateNumber,sourceSinkChemicalPhysicalProcess '76 255'
+
+
 # Clean up
 rm -f $tempSample $temp $temp1
diff --git a/tests/grib2_probability.sh b/tests/grib2_probability.sh
index afdea6fe6..349601c53 100755
--- a/tests/grib2_probability.sh
+++ b/tests/grib2_probability.sh
@@ -22,8 +22,8 @@ sample2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
 
 latest=`${tools_dir}/grib_get -p tablesVersionLatest $sample2`
 
-# Check PDTN
-# -----------
+# Automatic PDT selection
+# -----------------------
 ${tools_dir}/grib_set -s tablesVersion=$latest,paramId=131256 $sample2 $tempGribA
 grib_check_key_equals $tempGribA productDefinitionTemplateNumber,shortName,probabilityType '5 10cogug25 3'