diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2cfcd36cd..b967e053c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -17,6 +17,7 @@ list( APPEND test_bins
       multi_from_message
       read_index
       unit_tests
+      bufr_keys_iter
       gauss_sub
       grib_util_set_spec
       local_MeteoFrance
@@ -38,6 +39,7 @@ list( APPEND tests1
     definitions
     calendar
     unit_tests
+    bufr_keys_iter
     md5
     uerra
     grib_2nd_order_numValues
diff --git a/tests/bufr_keys_iter.c b/tests/bufr_keys_iter.c
new file mode 100644
index 000000000..2ff25e7d6
--- /dev/null
+++ b/tests/bufr_keys_iter.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2005-2016 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 "grib_api_internal.h"
+#include "eccodes.h"
+#include <assert.h>
+
+void usage(const char* prog)
+{
+    printf("usage: %s infile\n",prog);
+    exit(1);
+}
+
+int main(int argc,char* argv[])
+{
+    int err = 0;
+    codes_handle* h = NULL;
+    grib_keys_iterator* kiter = NULL;
+    char* input_filename = NULL;
+    FILE* f = NULL;
+    
+    if (argc!=2) usage(argv[0]);
+    input_filename = argv[1];
+    f = fopen(input_filename, "r");
+    assert(f);
+    h = codes_handle_new_from_file(NULL, f, PRODUCT_BUFR, &err);
+    assert(h);
+
+    CODES_CHECK(codes_set_long(h,"unpack",1), 0);
+
+    /*kiter=codes_bufr_data_section_keys_iterator_new(h);*/
+    kiter = codes_bufr_keys_iterator_new(h);
+    while(codes_bufr_keys_iterator_next(kiter))
+    {
+        char* kname = codes_bufr_keys_iterator_get_name(kiter);
+        printf("%s\n", kname);
+    }
+    grib_keys_iterator_delete(kiter);
+    return 0;
+}
diff --git a/tests/bufr_keys_iter.sh b/tests/bufr_keys_iter.sh
new file mode 100755
index 000000000..0e2fbb487
--- /dev/null
+++ b/tests/bufr_keys_iter.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright 2005-2016 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
+
+input=${data_dir}/bufr/aaen_55.bufr
+${test_dir}/bufr_keys_iter $input
+
+# TODO: add test to check the output e.g. compare with reference file etc