diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e8f35f6c9..c2b9da02b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -90,6 +90,7 @@ list( APPEND tests_data_reqd
     grib2to1
     grib1to3
     grib2to3
+    grib3_templates
     badgrib
     grib_ls
     grib_filter
diff --git a/tests/grib3_templates.sh b/tests/grib3_templates.sh
new file mode 100755
index 000000000..df4b00b1b
--- /dev/null
+++ b/tests/grib3_templates.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+# Copyright 2005-2017 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="grib3_templates"
+temp1=temp1.$label.grib3
+temp2=temp2.$label.grib3
+
+# Create a sample GRIB3 file converting from existing sample
+sample_g1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
+${tools_dir}/grib_set -s editionNumber=3 $sample_g1 $temp1
+
+# Section 4 templates: Horizontal Domain
+# -----------------------------------------
+${tools_dir}/grib_set -M -s horizontalDomainTemplateNumber=1 $temp1 $temp2
+res=`${tools_dir}/grib_get -M -p angleOfRotation $temp2`
+[ "$res" = "0" ]
+
+${tools_dir}/grib_set -M -s horizontalDomainTemplateNumber=2 $temp1 $temp2
+res=`${tools_dir}/grib_get -M -p stretchingFactorScaled $temp2`
+[ "$res" = "0" ]
+
+${tools_dir}/grib_set -M -s horizontalDomainTemplateNumber=3 $temp1 $temp2
+res=`${tools_dir}/grib_get -M -p angleOfRotation,stretchingFactorScaled $temp2`
+[ "$res" = "0 0" ]
+
+
+# Section 5 templates: Vertical Domain
+# -----------------------------------------
+${tools_dir}/grib_set -M -s verticalDomainTemplateNumber=1 $temp1 $temp2
+res=`${tools_dir}/grib_get -M -p scaleFactorOfFirstFixedSurface,scaleFactorOfSecondFixedSurface $temp2`
+[ "$res" = "0 MISSING" ]
+
+
+# Section 6 templates: Generating Process
+# -----------------------------------------
+${tools_dir}/grib_set -M -s generatingProcessTemplateNumber=1 $temp1 $temp2
+res=`${tools_dir}/grib_get -M -p numberOfMembersInEnsemble $temp2`
+[ "$res" = "0" ]
+
+
+# Section 7 templates: Observable Property
+# -----------------------------------------
+${tools_dir}/grib_set -M -s observablePropertyTemplateNumber=1 $temp1 $temp2
+res=`${tools_dir}/grib_get -M -p parameterDiscipline,parameterCategory,parameterNumber $temp2`
+[ "$res" = "0 0 0" ] # Temperature
+res=`${tools_dir}/grib_get -M -p unitsConversionScaleFactor,unitsConversionOffset $temp2`
+[ "$res" = "0 0" ]
+
+${tools_dir}/grib_set -M -s observablePropertyTemplateNumber=2 $temp1 $temp2
+res=`${tools_dir}/grib_get -M -p constituentType $temp2`
+[ "$res" = "0" ]
+
+
+rm -f $temp1 $temp2