diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e6ac53a5b..97e5c697a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -76,6 +76,7 @@ list( APPEND tests_data_reqd
     ecc-379
     ecc-393
     ecc-433
+    ecc-490
     gts_get
     gts_ls
     gts_compare
diff --git a/tests/ecc-490.sh b/tests/ecc-490.sh
new file mode 100755
index 000000000..d904875cd
--- /dev/null
+++ b/tests/ecc-490.sh
@@ -0,0 +1,38 @@
+#!/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
+# ---------------------------------------------------------
+# This is the test for the JIRA issue ECC-490.
+# It tests changing GRIB templates
+# ---------------------------------------------------------
+label="ecc-490-test"
+tempSample=temp.${label}.sample.grib
+tempRules=temp.${label}.filter
+tempOut=temp.${label}.grib
+
+grib2_sample=$ECCODES_SAMPLES_PATH/reduced_gg_pl_128_grib2.tmpl
+${tools_dir}/grib_set -s productDefinitionTemplateNumber=11,typeOfProcessedData=pf,typeOfLevel=surface $grib2_sample $tempSample
+
+cat > $tempRules <<EOF
+    set  productDefinitionTemplateNumber=1;
+    set  typeOfFirstFixedSurface=1;
+    set  typeOfSecondFixedSurface=255;
+    set  typeOfFirstFixedSurface=100;
+    set  productDefinitionTemplateNumber=11;
+    set  typeOfFirstFixedSurface=100;
+    set  typeOfSecondFixedSurface=255;
+    write;
+EOF
+
+${tools_dir}/grib_filter -o $tempOut $tempRules $tempSample
+
+rm -f $tempSample $tempRules $tempOut