diff --git a/data/bufr/CMakeLists.txt b/data/bufr/CMakeLists.txt
index 148500ed9..786cf27b5 100644
--- a/data/bufr/CMakeLists.txt
+++ b/data/bufr/CMakeLists.txt
@@ -12,13 +12,18 @@ file(READ "bufr_ref_files.txt" bufr_refs_to_download)
 string(REGEX REPLACE "\n" ";" bufr_refs_to_download "${bufr_refs_to_download}")
 
 # Exceptional case: download bufr files which have to be treated specially
-list(APPEND bufr_refs_to_download "vos308014_v3_26.bufr")  # See test ecc-197
+list(APPEND bufr_files_to_download "vos308014_v3_26.bufr")  # See test ecc-197
 
 if( ENABLE_EXTRA_TESTS )
     ecbuild_get_test_multidata(
-         TARGET eccodes_download_bufrs
-         NOCHECK
-        NAMES ${bufr_files_to_download} ${bufr_refs_to_download}
+        TARGET eccodes_download_bufrs
+        NOCHECK
+        NAMES ${bufr_files_to_download}
+    )
+    ecbuild_get_test_multidata(
+        TARGET eccodes_download_bufr_refs
+        NOCHECK
+        NAMES ${bufr_refs_to_download}
     )
 endif()
 
diff --git a/examples/C/CMakeLists.txt b/examples/C/CMakeLists.txt
index bafdb2dfc..539077c2b 100644
--- a/examples/C/CMakeLists.txt
+++ b/examples/C/CMakeLists.txt
@@ -148,7 +148,7 @@ foreach( test ${tests_extra} )
                           TYPE         SCRIPT
                           CONDITION    ENABLE_EXTRA_TESTS
                           COMMAND      ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
-                          TEST_DEPENDS eccodes_download_gribs eccodes_download_bufrs )
+                          TEST_DEPENDS eccodes_download_gribs eccodes_download_bufrs eccodes_download_bufr_refs )
 endforeach()
 
 # Tests which are conditional
diff --git a/examples/F90/CMakeLists.txt b/examples/F90/CMakeLists.txt
index ce522de09..5734358db 100644
--- a/examples/F90/CMakeLists.txt
+++ b/examples/F90/CMakeLists.txt
@@ -115,7 +115,7 @@ foreach( tool ${tests_extra} )
                       CONDITION       HAVE_FORTRAN AND ENABLE_EXTRA_TESTS
                       RESOURCES       bufr_read_scatterometer_f.ref
                       COMMAND         ${CMAKE_CURRENT_SOURCE_DIR}/${tool}.sh
-                      TEST_DEPENDS    eccodes_download_gribs eccodes_download_bufrs )
+                      TEST_DEPENDS    eccodes_download_gribs eccodes_download_bufrs eccodes_download_bufr_refs )
 endforeach()
 
 # Test for CCSDS (AEC) packing
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 589278ec8..7ed14fbd0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -313,7 +313,8 @@ if( HAVE_BUILD_TOOLS )
                       COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
                       RESOURCES asca_139.t1.ref
                       TEST_DEPENDS eccodes_download_gribs eccodes_download_tigge_gribs
-                                   eccodes_download_bufrs eccodes_download_metars eccodes_download_gts )
+                                   eccodes_download_bufrs eccodes_download_bufr_refs
+                                   eccodes_download_metars eccodes_download_gts )
     endforeach()
 
     if( HAVE_FORTRAN AND ENABLE_EXTRA_TESTS )
@@ -350,7 +351,7 @@ if( HAVE_BUILD_TOOLS )
                       TYPE SCRIPT
                       CONDITION NOT ECCODES_ON_WINDOWS AND ENABLE_EXTRA_TESTS
                       COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bufr_ecc-1288.sh
-                      TEST_DEPENDS eccodes_download_bufrs )
+                      TEST_DEPENDS eccodes_download_bufrs eccodes_download_bufr_refs )
 
 
     if( ENABLE_EXTRA_TESTS AND HAVE_ECCODES_THREADS )