diff --git a/CMakeModules/testing_cpp.cmake b/CMakeModules/testing_cpp.cmake
index 7f9a0448f267b7f99da9feb33c895277efdd4a87..86c51d037fd51bbcec5ce7a773242fd6b5500d0b 100644
--- a/CMakeModules/testing_cpp.cmake
+++ b/CMakeModules/testing_cpp.cmake
@@ -18,14 +18,12 @@ set (TOKENS "${TOKENS};BT_TEST_RUN_RW_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9
 
 if (BUILD_TESTS)
     set(ASAPO_MINIMUM_COVERAGE 70)
+    find_package(GTest REQUIRED)
+    set(GTEST_LIBS GTest::gmock GTest::gmock_main)
     find_package(Threads)
     find_program(MEMORYCHECK_COMMAND valgrind)
     set(MEMORYCHECK_COMMAND_OPTIONS
             "--trace-children=yes --leak-check=full --error-exitcode=1 --num-callers=20 --suppressions=${CMAKE_SOURCE_DIR}/tests/valgrind.suppressions")
-    if (NOT "$ENV{gtest_SOURCE_DIR}" STREQUAL "")
-        set(gtest_SOURCE_DIR $ENV{gtest_SOURCE_DIR})
-    endif ()
-    message(STATUS "Will look for google test at ${gtest_SOURCE_DIR}")
     if (CMAKE_COMPILER_IS_GNUCXX)
         include(CodeCoverage)
         APPEND_COVERAGE_COMPILER_FLAGS()
@@ -35,20 +33,12 @@ endif ()
 #TODO: Call add_plain_unit_test in gtest
 function(add_plain_unit_test target test_source_files linktarget)
     if (BUILD_TESTS)
-        include_directories(SYSTEM ${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
-        link_directories(${gtest_SOURCE_DIR}/lib)
-
         add_executable(test-${target} ${test_source_files})
 
         if (NOT ${libs} STREQUAL "")
             target_link_libraries(test-${target} ${libs})
         endif ()
 
-        IF (WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-            set(GTEST_LIBS gtestd gtest_maind gmockd)
-        ELSE ()
-            set(GTEST_LIBS gtest gmock gtest_main)
-        ENDIF (WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
         target_link_libraries(test-${target} ${GTEST_LIBS} ${CMAKE_THREAD_LIBS_INIT})
 
         GET_PROPERTY(ASAPO_COMMON_IO_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES)
@@ -67,9 +57,6 @@ endfunction()
 
 function(gtest target test_source_files linktarget)
     if (BUILD_TESTS)
-        include_directories(SYSTEM ${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
-        link_directories(${gtest_SOURCE_DIR}/lib)
-
         FOREACH (lib ${linktarget})
             if (NOT ${lib} STREQUAL "")
                 get_target_property(target_type ${lib} TYPE)
@@ -88,11 +75,6 @@ function(gtest target test_source_files linktarget)
             target_link_libraries(test-${target} ${libs})
         endif ()
 
-        IF (WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-            set(GTEST_LIBS gtestd gtest_maind gmockd)
-        ELSE ()
-            set(GTEST_LIBS gtest gmock gtest_main)
-        ENDIF (WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
         target_link_libraries(test-${target} ${GTEST_LIBS} ${CMAKE_THREAD_LIBS_INIT})
 
         GET_PROPERTY(ASAPO_COMMON_IO_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES)
diff --git a/README.md b/README.md
index c61da8dc702423b6cffc5e82aac2eec7b5616f91..2c2e2e3056f58459f8df1ac0b68924e40fdfee16 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ The software is MIT licensed (see LICENSE.txt) and uses third party libraries th
 (see LICENSE-3RD-PARTY.txt)
 
 ### with non-standard 3rd party libraries paths
-- cmake -Dlibmongoc-static-1.0_DIR=... -Dlibbson-static-1.0_DIR=...  -Dgtest_SOURCE_DIR=... -DLIBCURL_DIR=... ...
+- cmake -Dlibmongoc-static-1.0_DIR=... -Dlibbson-static-1.0_DIR=...  -DLIBCURL_DIR=... ...
 
 ### compile
  - make -j 4