diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index f8027cfc6..615e551f4 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -15,7 +15,7 @@ endif()
 
 
 # Download all data files doing md5 check on each
-ecbuild_get_test_multidata( TARGET eccodes_get_gribs
+ecbuild_get_test_multidata( TARGET eccodes_download_gribs
                             NOCHECK
                             NAMES ${files_to_download} )
 
diff --git a/data/bufr/CMakeLists.txt b/data/bufr/CMakeLists.txt
index 7ec0fda71..f81689249 100644
--- a/data/bufr/CMakeLists.txt
+++ b/data/bufr/CMakeLists.txt
@@ -15,7 +15,7 @@ STRING(REGEX REPLACE "\n" ";" bufr_refs_to_download "${bufr_refs_to_download}")
 LIST(APPEND bufr_refs_to_download "vos308014_v3_26.bufr")  # See test ecc-197
 
 ecbuild_get_test_multidata(
-     TARGET eccodes_get_bufrs
+     TARGET eccodes_download_bufrs
      NOCHECK
      NAMES ${bufr_files_to_download} ${bufr_refs_to_download}
 )
diff --git a/data/gts/CMakeLists.txt b/data/gts/CMakeLists.txt
index 01e9ca5ab..a349d2751 100644
--- a/data/gts/CMakeLists.txt
+++ b/data/gts/CMakeLists.txt
@@ -10,7 +10,7 @@ STRING(REGEX REPLACE "\n" ";" gts_refs_to_download "${gts_refs_to_download}")
 
 
 ecbuild_get_test_multidata(
-     TARGET eccodes_get_gts
+     TARGET eccodes_download_gts
      NOCHECK
      NAMES ${gts_files_to_download} ${gts_refs_to_download}
 )
diff --git a/data/metar/CMakeLists.txt b/data/metar/CMakeLists.txt
index cf06d0b2f..5d8980775 100644
--- a/data/metar/CMakeLists.txt
+++ b/data/metar/CMakeLists.txt
@@ -13,7 +13,7 @@ STRING(REGEX REPLACE "\n" ";" metar_refs_to_download "${metar_refs_to_download}"
 
 
 ecbuild_get_test_multidata(
-     TARGET eccodes_get_metars
+     TARGET eccodes_download_metars
      NOCHECK
      NAMES ${metar_files_to_download} ${metar_refs_to_download}
 )
diff --git a/data/tigge/CMakeLists.txt b/data/tigge/CMakeLists.txt
index 6193594f4..c1842ab48 100644
--- a/data/tigge/CMakeLists.txt
+++ b/data/tigge/CMakeLists.txt
@@ -5,6 +5,6 @@ file(READ "tigge_data_files.txt" tigge_files_to_download)
 string(REGEX REPLACE "\n" ";" tigge_files_to_download "${tigge_files_to_download}")
 
 # Download all data files doing md5 check on each
-ecbuild_get_test_multidata( TARGET eccodes_get_tigge_gribs
+ecbuild_get_test_multidata( TARGET eccodes_download_tigge_gribs
                             NOCHECK
                             NAMES ${tigge_files_to_download} )
diff --git a/examples/C/CMakeLists.txt b/examples/C/CMakeLists.txt
index feb50b96b..2dc74da81 100644
--- a/examples/C/CMakeLists.txt
+++ b/examples/C/CMakeLists.txt
@@ -92,7 +92,7 @@ foreach( test ${tests} )
     ecbuild_add_test( TARGET eccodes_c_${test}
                   TYPE       SCRIPT
                   COMMAND    ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
-                  TEST_DEPENDS eccodes_get_gribs eccodes_get_bufrs
+                  TEST_DEPENDS eccodes_download_gribs eccodes_download_bufrs
     )
 endforeach()
 
diff --git a/examples/F90/CMakeLists.txt b/examples/F90/CMakeLists.txt
index a16b176d8..5ee396bef 100644
--- a/examples/F90/CMakeLists.txt
+++ b/examples/F90/CMakeLists.txt
@@ -54,7 +54,7 @@ foreach( tool ${tests} )
                       CONDITION HAVE_FORTRAN
                       RESOURCES bufr_read_scatterometer_f.ref
                       COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${tool}.sh
-                      TEST_DEPENDS eccodes_get_gribs eccodes_get_bufrs
+                      TEST_DEPENDS eccodes_download_gribs eccodes_download_bufrs
     )
 endforeach()
 
diff --git a/examples/python/CMakeLists.txt b/examples/python/CMakeLists.txt
index b942b7f6b..86808086d 100644
--- a/examples/python/CMakeLists.txt
+++ b/examples/python/CMakeLists.txt
@@ -65,7 +65,7 @@ foreach( test ${tests} )
                       COMMAND    ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
                       CONDITION  HAVE_PYTHON
                       ENVIRONMENT PYTHON=${PYTHON_EXECUTABLE}
-                      TEST_DEPENDS eccodes_get_gribs eccodes_get_tigge_gribs eccodes_get_bufrs
+                      TEST_DEPENDS eccodes_download_gribs eccodes_download_tigge_gribs eccodes_download_bufrs
     )
 endforeach()
 
@@ -77,5 +77,5 @@ ecbuild_add_test( TARGET eccodes_p_bufr_encode_flight_test
                   CONDITION  HAVE_PYTHON
                   ENVIRONMENT PYTHON=${PYTHON_EXECUTABLE}
                   RESOURCES   flight_data.csv
-                  TEST_DEPENDS eccodes_get_bufrs
+                  TEST_DEPENDS eccodes_download_bufrs
 )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e36b6b8fe..5f18def5b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -116,7 +116,8 @@ foreach( test ${tests2} )
                   TYPE SCRIPT
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
                   RESOURCES asca_139.t1.ref
-                  TEST_DEPENDS eccodes_get_gribs eccodes_get_tigge_gribs eccodes_get_bufrs eccodes_get_metars eccodes_get_gts
+                  TEST_DEPENDS eccodes_download_gribs eccodes_download_tigge_gribs
+                               eccodes_download_bufrs eccodes_download_metars eccodes_download_gts
     )
 endforeach()
 
@@ -126,7 +127,7 @@ ecbuild_add_test( TARGET eccodes_t_lamb_az_eq_area
                   TYPE SCRIPT
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lamb_az_eq_area.sh
                   RESOURCES lamb_az_eq_area.ref
-                  TEST_DEPENDS eccodes_get_gribs
+                  TEST_DEPENDS eccodes_download_gribs
 )
 
 # These ones are conditional
@@ -134,19 +135,19 @@ ecbuild_add_test( TARGET eccodes_t_grib_to_netcdf
                   TYPE SCRIPT
                   CONDITION HAVE_NETCDF
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_to_netcdf.sh
-                  TEST_DEPENDS eccodes_get_gribs
+                  TEST_DEPENDS eccodes_download_gribs
 )
 
 ecbuild_add_test( TARGET eccodes_t_jpeg
                   TYPE SCRIPT
                   CONDITION HAVE_JPEG
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/jpeg.sh
-                  TEST_DEPENDS eccodes_get_gribs
+                  TEST_DEPENDS eccodes_download_gribs
 )
 
 ecbuild_add_test( TARGET eccodes_t_ccsds
                   TYPE SCRIPT
                   CONDITION HAVE_AEC
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ccsds.sh
-                  TEST_DEPENDS eccodes_get_gribs
+                  TEST_DEPENDS eccodes_download_gribs
 )