diff --git a/src/algorithms/acquisition/CMakeLists.txt b/src/algorithms/acquisition/CMakeLists.txt
index 0dc31ec9b..5cf06e3e8 100644
--- a/src/algorithms/acquisition/CMakeLists.txt
+++ b/src/algorithms/acquisition/CMakeLists.txt
@@ -18,7 +18,5 @@
 
 add_subdirectory(adapters)
 add_subdirectory(gnuradio_blocks)
-if(ENABLE_FPGA)
-	add_subdirectory(libs)
-endif(ENABLE_FPGA)
+add_subdirectory(libs)
 
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index ac70b816e..8ea932e1b 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -211,7 +211,7 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
    find_package(GPSTK)
    if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
       message(STATUS "GPSTk v${GNSSSDR_GPSTK_LOCAL_VERSION} will be automatically downloaded and built when doing 'make'.")
-      if(NOT ENABLE_FPGA)
+#      if(NOT ENABLE_FPGA)
           if(CMAKE_VERSION VERSION_LESS 3.2)
            ExternalProject_Add(
              gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
@@ -245,10 +245,10 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
           add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}")
           set(gpstk_libs gpstk)
           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 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})