diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a929ee5dc..01f95d191 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -11,6 +11,64 @@ include_directories("${GNSSSDR_SOURCE_DIR}/src/core/receiver")
 
 include(XcodeRemoveWarningDuplicates)
 
+include(CMakeParseArguments)
+
+# Helper to fetch optional test data with integrity checking and optional uncompressing
+#
+# Arguments:
+#   url            - Remote file URL to download
+#   destination    - Absolute or relative path where the file will be stored
+#   expected_hash  - Hash in the format EXPECTED_HASH argument supports
+#
+# Optional keyword arguments (parsed via cmake_parse_arguments):
+#   EXTRACT_DIR    - Directory where the downloaded archive will be uncompressed with
+#                    `cmake -E tar xzf`. When omitted, no uncompressing is attempted.
+#
+# Behavior:
+#   * Creates the destination directory if it does not exist.
+#   * Skips downloading when the destination file is already present.
+#   * Requests SHOW_PROGRESS on CMake >= 3.2 to keep legacy versions compatible.
+#   * Removes the file if the download fails or the hash does not match.
+#   * Optionally uncompresses the archive into EXTRACT_DIR on successful download.
+function(download_test_file url destination expected_hash)
+    set(options)
+    set(oneValueArgs EXTRACT_DIR)
+    set(multiValueArgs)
+    # Parse optional arguments (such as EXTRACT_DIR) for this helper while keeping
+    # compatibility with legacy CMake versions.
+    cmake_parse_arguments(DOWNLOAD_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    get_filename_component(_filename "${destination}" NAME)
+    get_filename_component(_dest_dir "${destination}" DIRECTORY)
+
+    if(NOT EXISTS ${destination})
+        file(MAKE_DIRECTORY "${_dest_dir}")
+        set(_download_args
+            ${url}
+            "${destination}"
+            STATUS status_download
+            EXPECTED_HASH ${expected_hash}
+        )
+        if(NOT CMAKE_VERSION VERSION_LESS "3.2")
+            list(APPEND _download_args SHOW_PROGRESS)
+        endif()
+
+        message(STATUS "Downloading file: ${_filename}")
+        file(DOWNLOAD ${_download_args})
+        list(GET status_download 0 result_download)
+        if(${result_download} EQUAL 0)
+            if(DOWNLOAD_TEST_EXTRACT_DIR)
+                execute_process(
+                    COMMAND ${CMAKE_COMMAND} -E tar xzf "${destination}"
+                    WORKING_DIRECTORY "${DOWNLOAD_TEST_EXTRACT_DIR}"
+                )
+            endif()
+        else()
+            file(REMOVE "${destination}")
+        endif()
+    endif()
+endfunction()
+
 ################################################################################
 # Google Test - https://github.com/google/googletest
 ################################################################################
@@ -480,134 +538,61 @@ endif()
 
 if(NOT (ENABLE_PACKAGING OR ENABLE_UNIT_TESTING_MINIMAL))
     message(STATUS "Downloading some data files for testing ...")
-    if(NOT EXISTS ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat)
-        message(STATUS "Downloading file: Galileo_E1_ID_1_Fs_4Msps_8ms.dat")
-        file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/Galileo_E1_ID_1_Fs_4Msps_8ms.dat
-                ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat
-            SHOW_PROGRESS
-            EXPECTED_HASH MD5=d57a02d3c7361bba2e137329b66458ef
-            STATUS status_download
-        )
-        list(GET status_download 0 result_download)
-        if(NOT (${result_download} EQUAL 0))
-            file(REMOVE ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat)
-        endif()
-    endif()
-    if(NOT EXISTS ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat)
-        message(STATUS "Downloading file: GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat")
-        file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat
-                ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat
-            SHOW_PROGRESS
-            EXPECTED_HASH MD5=f12ada80a2ad1bab061262e010643529
-            STATUS status_download
-        )
-        list(GET status_download 0 result_download)
-        if(NOT (${result_download} EQUAL 0))
-            file(REMOVE ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat)
-        endif()
-    endif()
-    if(NOT EXISTS ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat)
-        message(STATUS "Downloading file: GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat")
-        file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat
-                ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat
-            SHOW_PROGRESS
-            EXPECTED_HASH MD5=b98d6d82885354f168f279817de284b5
-            STATUS status_download
-        )
-        list(GET status_download 0 result_download)
-        if(NOT (${result_download} EQUAL 0))
-            file(REMOVE ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat)
-        endif()
-    endif()
-    if(NOT EXISTS ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_4ms.bin)
-        message(STATUS "Downloading file: NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_4ms.bin")
-        file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_4ms.bin
-                ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_4ms.bin
-            SHOW_PROGRESS
-            EXPECTED_HASH MD5=0e2dc212309141d236897bc0af187074
-            STATUS status_download
-        )
-        list(GET status_download 0 result_download)
-        if(NOT (${result_download} EQUAL 0))
-            file(REMOVE ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_4ms.bin)
-        endif()
-    endif()
+    file(MAKE_DIRECTORY ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples)
+    download_test_file(
+        https://sourceforge.net/projects/gnss-sdr/files/data/Galileo_E1_ID_1_Fs_4Msps_8ms.dat
+        ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat
+        MD5=d57a02d3c7361bba2e137329b66458ef
+    )
+    download_test_file(
+        https://sourceforge.net/projects/gnss-sdr/files/data/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat
+        ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat
+        MD5=f12ada80a2ad1bab061262e010643529
+    )
+    download_test_file(
+        https://sourceforge.net/projects/gnss-sdr/files/data/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat
+        ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat
+        MD5=b98d6d82885354f168f279817de284b5
+    )
+    download_test_file(
+        https://sourceforge.net/projects/gnss-sdr/files/data/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_4ms.bin
+        ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_4ms.bin
+        MD5=0e2dc212309141d236897bc0af187074
+    )
     message(STATUS "Done.")
 endif()
 
 if(ENABLE_UNIT_TESTING_EXTRA)
     add_definitions(-DEXTRA_TESTS)
     message(STATUS "Downloading some extra data files for testing ...")
-    if(NOT EXISTS ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat)
-        message(STATUS "Downloading file: gps_l2c_m_prn7_5msps.dat")
-        file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/gps_l2c_m_prn7_5msps.dat
-                ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat
-            SHOW_PROGRESS
-            EXPECTED_HASH MD5=a6fcbefe155137945d3c33c5ef7bd0f9
-            STATUS status_download
-        )
-        list(GET status_download 0 result_download)
-        if(NOT (${result_download} EQUAL 0))
-            file(REMOVE ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat)
-        endif()
-    endif()
-    if(NOT EXISTS ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat)
-        message(STATUS "Downloading file: Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat")
-        file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat
-                ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat
-            SHOW_PROGRESS
-            EXPECTED_HASH MD5=ffb72fc63c116be58d5e5ccb1daaed3a
-            STATUS status_download
-        )
-        list(GET status_download 0 result_download)
-        if(NOT (${result_download} EQUAL 0))
-            file(REMOVE ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat)
-        endif()
-    endif()
-    if(NOT EXISTS ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/BdsB1IStr01_fs25e6_if0_4ms.dat)
-        message(STATUS "Downloading file: BdsB1IStr01_fs25e6_if0_4ms.dat")
-        file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/BdsB1IStr01_fs25e6_if0_4ms.dat
-                ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/BdsB1IStr01_fs25e6_if0_4ms.dat
-            SHOW_PROGRESS
-            EXPECTED_HASH MD5=5a4336dad9d80f3313a16dec4fff9233
-            STATUS status_download
-        )
-        list(GET status_download 0 result_download)
-        if(NOT (${result_download} EQUAL 0))
-            file(REMOVE ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/BdsB1IStr01_fs25e6_if0_4ms.dat)
-        endif()
-    endif()
-    if(NOT EXISTS ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/BdsB3IStr01_fs50e6_if0_4ms.dat)
-        message(STATUS "Downloading file: BdsB3IStr01_fs50e6_if0_4ms.dat")
-        file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/BdsB3IStr01_fs50e6_if0_4ms.dat
-                ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/BdsB3IStr01_fs50e6_if0_4ms.dat
-            SHOW_PROGRESS
-            EXPECTED_HASH MD5=066d0d8434a8bc81e161778b7c34cc07
-            STATUS status_download
-        )
-        list(GET status_download 0 result_download)
-        if(NOT (${result_download} EQUAL 0))
-            file(REMOVE ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/BdsB3IStr01_fs50e6_if0_4ms.dat)
-        endif()
-    endif()
-    if(NOT EXISTS ${GNSSSDR_BINARY_DIR}/thirdparty/osnma_tests/Test_vectors.zip)
-        message(STATUS "Downloading file: Test_vectors.zip")
-        file(DOWNLOAD https://www.gsc-europa.eu/sites/default/files/sites/all/files/Test_vectors.zip
-                ${GNSSSDR_BINARY_DIR}/thirdparty/osnma_tests/Test_vectors.zip
-            SHOW_PROGRESS
-            EXPECTED_HASH MD5=8158aebee735652c9398e5bb6d944364
-            STATUS status_download
-        )
-        list(GET status_download 0 result_download)
-        if(${result_download} EQUAL 0)
-            execute_process(
-                COMMAND ${CMAKE_COMMAND} -E tar xzf ${GNSSSDR_BINARY_DIR}/thirdparty/osnma_tests/Test_vectors.zip
-                WORKING_DIRECTORY ${GNSSSDR_BINARY_DIR}/thirdparty/osnma_tests/
-            )
-        else()
-            file(REMOVE ${GNSSSDR_BINARY_DIR}/thirdparty/osnma_tests/Test_vectors.zip)
-        endif()
-    endif()
+    file(MAKE_DIRECTORY ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples)
+    download_test_file(
+        https://sourceforge.net/projects/gnss-sdr/files/data/gps_l2c_m_prn7_5msps.dat
+        ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat
+        MD5=a6fcbefe155137945d3c33c5ef7bd0f9
+    )
+    download_test_file(
+        https://sourceforge.net/projects/gnss-sdr/files/data/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat
+        ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat
+        MD5=ffb72fc63c116be58d5e5ccb1daaed3a
+    )
+    download_test_file(
+        https://sourceforge.net/projects/gnss-sdr/files/data/BdsB1IStr01_fs25e6_if0_4ms.dat
+        ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/BdsB1IStr01_fs25e6_if0_4ms.dat
+        MD5=5a4336dad9d80f3313a16dec4fff9233
+    )
+    download_test_file(
+        https://sourceforge.net/projects/gnss-sdr/files/data/BdsB3IStr01_fs50e6_if0_4ms.dat
+        ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/BdsB3IStr01_fs50e6_if0_4ms.dat
+        MD5=066d0d8434a8bc81e161778b7c34cc07
+    )
+    file(MAKE_DIRECTORY ${GNSSSDR_BINARY_DIR}/thirdparty/osnma_tests)
+    download_test_file(
+        https://www.gsc-europa.eu/sites/default/files/sites/all/files/Test_vectors.zip
+        ${GNSSSDR_BINARY_DIR}/thirdparty/osnma_tests/Test_vectors.zip
+        MD5=8158aebee735652c9398e5bb6d944364
+        EXTRACT_DIR ${GNSSSDR_BINARY_DIR}/thirdparty/osnma_tests/
+    )
     message(STATUS "Done.")
     if(ENABLE_INSTALL_TESTS)
         install(FILES ${GNSSSDR_BINARY_DIR}/thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat DESTINATION share/gnss-sdr/signal_samples)