diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 04bbf7841..4fe2bac30 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -161,11 +161,6 @@ if(GNUPLOT_FOUND)
     add_definitions(-DGNUPLOT_EXECUTABLE="${GNUPLOT_EXECUTABLE}")
 endif(GNUPLOT_FOUND)
 
-if(MATIO_FOUND OR MATIO_LOCAL)
-    add_definitions(-DMATIO_TEST=1)
-    set(GNSS_SDR_TEST_OPTIONAL_LIBS "${GNSS_SDR_TEST_OPTIONAL_LIBS};${MATIO_LIBRARIES}")
-    set(GNSS_SDR_TEST_OPTIONAL_HEADERS "${GNSS_SDR_TEST_OPTIONAL_HEADERS};${MATIO_INCLUDE_DIRS}")
-endif(MATIO_FOUND OR MATIO_LOCAL)
 
 ################################################################################
 # Optional generator
@@ -324,6 +319,7 @@ include_directories(
      ${ARMADILLO_INCLUDE_DIRS}
      ${VOLK_INCLUDE_DIRS}
      ${VOLK_GNSSSDR_INCLUDE_DIRS}
+     ${MATIO_INCLUDE_DIRS}
      ${GNSS_SDR_TEST_OPTIONAL_HEADERS}
 )
 
@@ -358,6 +354,7 @@ if(ENABLE_UNIT_TESTING)
                                 pvt_gr_blocks
                                 signal_processing_testing_lib
                                 ${VOLK_GNSSSDR_LIBRARIES}
+                                ${MATIO_LIBRARIES}
                                 ${GNSS_SDR_TEST_OPTIONAL_LIBS}
     )
     if(NOT ${GTEST_DIR_LOCAL})
@@ -389,6 +386,7 @@ if(ENABLE_FPGA)
                              ${GNURADIO_BLOCKS_LIBRARIES}
                              ${ARMADILLO_LIBRARIES}
                              ${VOLK_LIBRARIES}
+                             ${MATIO_LIBRARIES}
                              channel_fsm
                              gnss_sp_libs
                              gnss_rx