diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 3978f1b71..ec884c78b 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -260,19 +260,15 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
           endif(CMAKE_VERSION VERSION_LESS 3.2)
 
           set(GPSTK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include CACHE PATH "Local GPSTK headers")
-          add_library(gpstk UNKNOWN IMPORTED)
-          set_property(TARGET gpstk PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX})
-          add_dependencies(gpstk gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION})
           set(GPSTK_BINDIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/bin/ )
           add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}")
-          set(gpstk_libs gpstk)
+          set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX})
           set(OWN_GPSTK True)
 #      else(NOT ENABLE_FPGA)
 #          message(STATUS "GPSTk has not been found, try to install it on target.")
 #          message(STATUS "Some extra tests requiring GPSTk will not be built.")
 #      endif(NOT ENABLE_FPGA)
    else(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
-       set(gpstk_libs ${GPSTK_LIBRARIES})
        set(GPSTK_INCLUDE_DIRS ${GPSTK_INCLUDE_DIR})
        set(GPSTK_BINDIR ${GPSTK_LIBRARY}/../bin/ )
        add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}")
@@ -281,7 +277,7 @@ endif(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
 
 
 if (ENABLE_UNIT_TESTING_EXTRA)
-	set(GNSS_SDR_TEST_OPTIONAL_LIBS ${GNSS_SDR_TEST_OPTIONAL_LIBS} ${gpstk_libs})
+	set(GNSS_SDR_TEST_OPTIONAL_LIBS ${GNSS_SDR_TEST_OPTIONAL_LIBS} ${GPSTK_LIBRARY})
 	set(GNSS_SDR_TEST_OPTIONAL_HEADERS ${GNSS_SDR_TEST_OPTIONAL_HEADERS} ${GPSTK_INCLUDE_DIRS} ${GPSTK_INCLUDE_DIRS}/gpstk)
 endif (ENABLE_UNIT_TESTING_EXTRA)
 
@@ -526,7 +522,7 @@ if(ENABLE_SYSTEM_TESTING)
         #if(GPSTK_FOUND OR OWN_GPSTK)
             ## OBS_SYSTEM_TEST and OBS_GPS_L1_SYSTEM_TEST
         #    set(OPT_LIBS_ ${GFlags_LIBS} ${GLOG_LIBRARIES} ${GTEST_LIBRARIES}
-        #                  gnss_sp_libs gnss_rx ${gpstk_libs} )
+        #                  gnss_sp_libs gnss_rx ${GPSTK_LIBRARY} )
         #    set(OPT_INCLUDES_ ${GPSTK_INCLUDE_DIRS} ${GPSTK_INCLUDE_DIRS}/gpstk)
         #    add_system_test(obs_gps_l1_system_test)
         #    add_system_test(obs_system_test)