diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 996fbb4b1..024e6be56 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,7 +10,7 @@ execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_S
 # Build the executables used by test scripts
 ################################################
 list( APPEND test_bins
-      bpv_limit
+      grib_bpv_limit
       grib_double_cmp
       read_any
       julian
@@ -75,7 +75,7 @@ list(APPEND tests_no_data_reqd
 # These tests do require data downloads
 list(APPEND tests_data_reqd
     grib_data_quality_checks
-    bpv_limit
+    grib_bpv_limit
     grib_complex
     grib_double_cmp
     grib_change_packing
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ef831d0d9..7564b1f9b 100755
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -108,7 +108,7 @@ download_data:
 
 noinst_PROGRAMS = packing_check gauss_sub read_any grib_double_cmp packing pack_unpack \
                   julian grib_read_index grib_indexing gribex_perf\
-                  jpeg_perf grib_ccsds_perf so_perf png_perf bpv_limit laplacian \
+                  jpeg_perf grib_ccsds_perf so_perf png_perf grib_bpv_limit laplacian \
                   unit_tests bufr_ecc-517
 
 laplacian_SOURCES = laplacian.c
diff --git a/tests/fortran_interface.sh b/tests/fortran_interface.sh
deleted file mode 100755
index 4ecf859bb..000000000
--- a/tests/fortran_interface.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /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.
-set -e
-
-tmpfiles="fortran_interface.dat"
-
-trap 'rm -f $tmpfiles' 1 2 3 15
-
-export ECCODES_DEFINITION_PATH=`pwd`"/definitions"
-path=../data
-grib1=latlon.grib
-
-[ ! -f "$path/$tmpfiles" ] && exit 1
-
-
-cd tests
-
-
-DECODE=readvalues
- 
-./${DECODE} -i  ${path}/${grib1} | head -600 > $tmpfiles
-
-diff $tmpfiles $path/$tmpfiles
-
-result=$?
-
-exit $result
-
diff --git a/tests/bpv_limit.c b/tests/grib_bpv_limit.c
similarity index 100%
rename from tests/bpv_limit.c
rename to tests/grib_bpv_limit.c
diff --git a/tests/bpv_limit.sh b/tests/grib_bpv_limit.sh
similarity index 74%
rename from tests/bpv_limit.sh
rename to tests/grib_bpv_limit.sh
index f9746cb42..edffa3c75 100755
--- a/tests/bpv_limit.sh
+++ b/tests/grib_bpv_limit.sh
@@ -9,17 +9,17 @@
 #
 
 # Test limitations in number of bits per value we can decode/encode are
-# working. Grib API can currently decode message with a bpv <= sizeof(long)
+# working. ecCodes can currently decode a message with a bpv <= sizeof(long)
 # and encode messages with bpv < sizeof(long). Attempt to do otherwise will
-# result in an error. Packing type this is valid for is simple packing.
+# result in an error. This is valid for Simple Packing.
 
 . ./include.sh
 
 REDIRECT=/dev/null
 
-$EXEC ${test_dir}/bpv_limit ${data_dir}/regular_latlon_surface.grib2 2>/dev/null
+$EXEC ${test_dir}/grib_bpv_limit ${data_dir}/regular_latlon_surface.grib2 2>/dev/null
 
 # TODO: grib1 does not work yet. bpv=64 but decode does not fail as expected
 #for file in ${data_dir}/regular_latlon_surface.grib?; do 
-#    ./bpv_limit $file
+#    ./grib_bpv_limit $file
 #done