diff --git a/cmake/Modules/FindGnssSimulator.cmake b/cmake/Modules/FindGnssSimulator.cmake
new file mode 100644
index 000000000..56bccc709
--- /dev/null
+++ b/cmake/Modules/FindGnssSimulator.cmake
@@ -0,0 +1,28 @@
+# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+#
+# This file is part of GNSS-SDR.
+#
+# GNSS-SDR is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNSS-SDR is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
+
+
+find_program(SW_GENERATOR_BIN gnss_sim
+             PATHS /usr/bin
+                   /usr/local/bin
+                   /opt/local/bin
+                   ${CMAKE_INSTALL_PREFIX}/bin
+             PATH_SUFFIXES bin )
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNSS-SIMULATOR  DEFAULT_MSG  SW_GENERATOR_BIN)
+MARK_AS_ADVANCED(SW_GENERATOR_BIN)
\ No newline at end of file
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 4821afbd4..6c83f0576 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -188,31 +188,38 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
    else(ENABLE_FPGA)
       set(CROSS_INSTALL_DIR "")
    endif(ENABLE_FPGA)
-   ExternalProject_Add(
-      gnss-sim
-      GIT_REPOSITORY https://bitbucket.org/jarribas/gnss-simulator
-      GIT_TAG ${GNSSSDR_GNSS_SIM_LOCAL_VERSION}
-      SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gnss-sim
-      BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim
-      CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} ${CROSS_INSTALL_DIR}
-      UPDATE_COMMAND ""
-      PATCH_COMMAND ""
-      INSTALL_COMMAND ""
-   )
-   if(ENABLE_INSTALL_TESTS)
-      install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim/gnss_sim DESTINATION bin)
-      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/brdc3540.14n DESTINATION share/gnss-sim)
-      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/circle.csv DESTINATION share/gnss-sim)
-      set(SW_GENERATOR_BIN ${CMAKE_INSTALL_PREFIX}/bin/gnss_sim)
+   find_package(GnssSimulator QUIET)
+   if(GNSS-SIMULATOR_FOUND)
       add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}")
       add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/brdc3540.14n")
       add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/circle.csv")
-   else(ENABLE_INSTALL_TESTS)
-      set(SW_GENERATOR_BIN ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim/gnss_sim)
-      add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}")
-      add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/brdc3540.14n")
-      add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/circle.csv")
-   endif(ENABLE_INSTALL_TESTS)
+   else(GNSS-SIMULATOR_FOUND)
+      ExternalProject_Add(
+         gnss-sim
+         GIT_REPOSITORY https://bitbucket.org/jarribas/gnss-simulator
+         GIT_TAG ${GNSSSDR_GNSS_SIM_LOCAL_VERSION}
+         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gnss-sim
+         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim
+         CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} ${CROSS_INSTALL_DIR}
+         UPDATE_COMMAND ""
+         PATCH_COMMAND ""
+         INSTALL_COMMAND ""
+      )
+      if(ENABLE_INSTALL_TESTS)
+         install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim/gnss_sim DESTINATION bin)
+         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/brdc3540.14n DESTINATION share/gnss-sim)
+         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/circle.csv DESTINATION share/gnss-sim)
+         set(SW_GENERATOR_BIN ${CMAKE_INSTALL_PREFIX}/bin/gnss_sim)
+         add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}")
+         add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/brdc3540.14n")
+         add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/circle.csv")
+      else(ENABLE_INSTALL_TESTS)
+         set(SW_GENERATOR_BIN ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim/gnss_sim)
+         add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}")
+         add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/brdc3540.14n")
+         add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/circle.csv")
+      endif(ENABLE_INSTALL_TESTS)
+   endif(GNSS-SIMULATOR_FOUND)
 
    ################################################################################
    # Local installation of GPSTk http://www.gpstk.org/