diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 341b2f4be..2a68311e3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -100,6 +100,7 @@ if( HAVE_BUILD_TOOLS )
         grib_grid_lambert_conformal
         grib_grid_polar_stereographic
         grib_grid_space_view
+        grib_g1monthlydate
         grib_g1fcperiod)
 
     # These tests do require data downloads
diff --git a/tests/grib_g1monthlydate.sh b/tests/grib_g1monthlydate.sh
new file mode 100755
index 000000000..7f2729dea
--- /dev/null
+++ b/tests/grib_g1monthlydate.sh
@@ -0,0 +1,25 @@
+#!/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
+
+label="grib_g1monthlydate"
+sample_g1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
+temp=temp.$label.grib
+
+${tools_dir}/grib_set -s marsType=fc,marsStream=wamo $sample_g1 $temp
+
+grib_check_key_equals $temp "mars.date,monthlyVerificationDate" "20060301 20060301"
+
+${tools_dir}/grib_dump $temp
+
+
+# Clean up
+rm -f $temp