diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 933a4c11a..134b2c6c4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -112,6 +112,7 @@ if( HAVE_BUILD_TOOLS )
         grib_generalised_tiles
         # grib_true_imagery
         grib2_wave_spectra
+        grib2_probability
         grib_suppressed
         grib_destine_mars_keys
         grib_2nd_order_numValues
diff --git a/tests/grib2_probability.sh b/tests/grib2_probability.sh
new file mode 100755
index 000000000..afdea6fe6
--- /dev/null
+++ b/tests/grib2_probability.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+# (C) Copyright 2005- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# 
+# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+#
+
+. ./include.ctest.sh
+
+label="grib2_probability_test"
+temp=temp.$label
+tempGribA=temp.$label.A.grib
+tempGribB=temp.$label.B.grib
+tempSample=temp.$label.tmpl
+tempRef=temp.$label.ref
+tempOut=temp.$label.txt
+
+sample2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
+
+latest=`${tools_dir}/grib_get -p tablesVersionLatest $sample2`
+
+# Check PDTN
+# -----------
+${tools_dir}/grib_set -s tablesVersion=$latest,paramId=131256 $sample2 $tempGribA
+grib_check_key_equals $tempGribA productDefinitionTemplateNumber,shortName,probabilityType '5 10cogug25 3'
+
+# Clean up
+rm -f $tempSample $temp $tempGribA $tempGribB $tempRef $tempOut
diff --git a/tests/grib2_wave_spectra.sh b/tests/grib2_wave_spectra.sh
index 336b6341a..e264e10e8 100755
--- a/tests/grib2_wave_spectra.sh
+++ b/tests/grib2_wave_spectra.sh
@@ -83,6 +83,10 @@ ${tools_dir}/grib_compare -b marsType,typeOfProcessedData,typeOfGeneratingProces
 ${tools_dir}/grib_set -s type=es $tempGribA $tempGribB
 ${tools_dir}/grib_compare -b marsType,typeOfProcessedData,typeOfGeneratingProcess $tempGribA $tempGribB
 
+# Check PDTN
+#
+${tools_dir}/grib_set -s paramId=140114 $sample2 $tempGribA
+grib_check_key_equals $tempGribA productDefinitionTemplateNumber,shortName '103 h1012'
 
 # Clean up
 rm -f $tempSample $temp $tempGribA $tempGribB $tempRef $tempOut