diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7bf66b32d..f5d2dee36 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -60,6 +60,7 @@ if( HAVE_BUILD_TOOLS )
         bufr_dump_samples
         bufr_check_descriptors
         definitions
+        grib2_version
         grib_calendar
         grib_md5
         grib_cfNames
diff --git a/tests/grib2_version.sh b/tests/grib2_version.sh
new file mode 100755
index 000000000..030a9a653
--- /dev/null
+++ b/tests/grib2_version.sh
@@ -0,0 +1,33 @@
+#!/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.sh
+set -u
+REDIRECT=/dev/null
+
+label="grib2_version"
+if [ ! -d "$ECCODES_DEFINITION_PATH" ]; then
+    echo "Test $0 disabled. No definitions directory"
+    exit 0
+fi
+
+temp=temp.$label.grib2
+sample2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
+tables_dir="$ECCODES_DEFINITION_PATH/grib2/tables"
+
+# In $tables_dir, the directory names should match the version numbers of GRIB2 tables.
+# Check the directory with the highest number matches the key 'tablesVersionLatest'
+cd $tables_dir
+highest_num=`ls -1d [0-9]* | sort -rn | sed 1q`
+latest=`${tools_dir}/grib_get -p tablesVersionLatest $sample2`
+if [ "$latest" != "$highest_num" ]; then
+    echo "The GRIB2 key tablesVersionLatest = $latest but the highest number in $tables_dir is $highest_num"
+fi
+
+rm -f $temp