diff --git a/tests/big2gribex.sh b/tests/big2gribex.sh
index c8c0b6098..acc78cdf2 100755
--- a/tests/big2gribex.sh
+++ b/tests/big2gribex.sh
@@ -17,6 +17,12 @@ if [ ! -x ${tools_dir}/big2gribex ]; then
     exit 0
 fi
 
+set +e
+${tools_dir}/big2gribex
+status=$?
+set -e
+[ $status -ne 0 ]
+
 ${tools_dir}/big2gribex $data_dir/test.grib1 $tempGrib
 
 # Clean up
diff --git a/tests/grib_histogram.sh b/tests/grib_histogram.sh
index c5b56ab22..9653a9500 100755
--- a/tests/grib_histogram.sh
+++ b/tests/grib_histogram.sh
@@ -17,5 +17,17 @@ tempOut=temp.$label.txt
 ${tools_dir}/grib_histogram $ECCODES_SAMPLES_PATH/GRIB1.tmpl > $tempOut
 ${tools_dir}/grib_histogram $ECCODES_SAMPLES_PATH/GRIB2.tmpl > $tempOut
 
+${tools_dir}/grib_histogram -p step,shortName $ECCODES_SAMPLES_PATH/GRIB2.tmpl > $tempOut
+
+# Something with a bitmap
+input=$data_dir/reduced_latlon_surface.grib2
+grib_check_key_equals $input numberOfMissing 98701
+${tools_dir}/grib_histogram $input > $tempOut
+
+# Skip
+input=$data_dir/tigge_cf_ecmwf.grib2
+${tools_dir}/grib_histogram -w level=925,shortName=gh $input > $tempOut
+
+
 # Clean up
 rm -f $tempOut