diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1508b820a..ac0f133de 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -228,6 +228,7 @@ if( HAVE_BUILD_TOOLS )
         grib_geo_iter
         grib_to_json
         grib_to_ppm
+        grib_merge
         big2gribex
         grib_sub_area_check
         grib_list_keys
diff --git a/tests/grib_list_keys.sh b/tests/grib_list_keys.sh
index c5b71cb07..c58bddc96 100755
--- a/tests/grib_list_keys.sh
+++ b/tests/grib_list_keys.sh
@@ -15,7 +15,10 @@ tempOut=temp.$label.txt
 
 if [ -d "$ECCODES_DEFINITION_PATH" ]; then
     if [ -x "${tools_dir}/grib_list_keys" ]; then
-        ${tools_dir}/grib_list_keys $ECCODES_DEFINITION_PATH/boot.def
+        ${tools_dir}/grib_list_keys $ECCODES_DEFINITION_PATH/boot.def > $tempOut
+        ${tools_dir}/grib_list_keys $ECCODES_DEFINITION_PATH/grib2/template.4.2000.def > $tempOut
+        ${tools_dir}/grib_list_keys $ECCODES_DEFINITION_PATH/grib2/template.3.0.def > $tempOut
+        ${tools_dir}/grib_list_keys $ECCODES_DEFINITION_PATH/grib2/template.3.120.def > $tempOut
     fi
 fi
 
diff --git a/tests/grib_merge.sh b/tests/grib_merge.sh
new file mode 100755
index 000000000..33c7960ce
--- /dev/null
+++ b/tests/grib_merge.sh
@@ -0,0 +1,26 @@
+#!/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="grib_merge_test"
+
+tempGrib=temp.$label.grib
+tempFilt=temp.$label.filt
+tempLog=temp.$label.log
+tempOut=temp.$label.txt
+tempRef=temp.$label.ref
+
+f1=$ECCODES_SAMPLES_PATH/regular_ll_pl_grib1.tmpl
+f2=$ECCODES_SAMPLES_PATH/regular_ll_sfc_grib1.tmpl
+${tools_dir}/grib_merge $f1 $f2 $tempGrib
+
+# Clean up
+rm -f $tempGrib $tempFilt $tempLog $tempOut $tempRef