Use find_package to find gtest library.

92 files changed, 190 insertions, 95 deletions

diff --git a/document/src/tests/CMakeLists.txt b/document/src/tests/CMakeLists.txt
index 6458adccfd8..e203fc4b464 100644
--- a/document/src/tests/CMakeLists.txt
+++ b/document/src/tests/CMakeLists.txt
@@ -1,5 +1,7 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
+
 # Runner for unit tests written in gtest.
 # NOTE: All new test classes should be added here.
 vespa_add_executable(document_gtest_runner_app TEST
@@ -32,7 +34,7 @@ vespa_add_executable(document_gtest_runner_app TEST
     weightedsetfieldvaluetest.cpp
     DEPENDS
     document
-    gtest
+    GTest::GTest
     AFTER
     document_documentconfig
 )
diff --git a/documentapi/src/tests/loadtypes/CMakeLists.txt b/documentapi/src/tests/loadtypes/CMakeLists.txt
index 495c05c0e43..3e3e64310f8 100644
--- a/documentapi/src/tests/loadtypes/CMakeLists.txt
+++ b/documentapi/src/tests/loadtypes/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(documentapi_loadtype_test_app TEST
     SOURCES
     loadtypetest.cpp
     DEPENDS
     documentapi
     vdstestlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME documentapi_loadtype_test_app COMMAND documentapi_loadtype_test_app)
diff --git a/eval/src/tests/eval/inline_operation/CMakeLists.txt b/eval/src/tests/eval/inline_operation/CMakeLists.txt
index 04cdbca3abf..050e9287c21 100644
--- a/eval/src/tests/eval/inline_operation/CMakeLists.txt
+++ b/eval/src/tests/eval/inline_operation/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(eval_inline_operation_test_app TEST
     SOURCES
     inline_operation_test.cpp
     DEPENDS
     vespaeval
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME eval_inline_operation_test_app COMMAND eval_inline_operation_test_app)
diff --git a/eval/src/tests/eval/multiply_add/CMakeLists.txt b/eval/src/tests/eval/multiply_add/CMakeLists.txt
index c50aa4f50a2..687c9b3b576 100644
--- a/eval/src/tests/eval/multiply_add/CMakeLists.txt
+++ b/eval/src/tests/eval/multiply_add/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(eval_multiply_add_test_app TEST
     SOURCES
     multiply_add_test.cpp
     DEPENDS
     vespaeval
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME eval_multiply_add_test_app COMMAND eval_multiply_add_test_app)
diff --git a/eval/src/tests/tensor/dense_pow_as_map_optimizer/CMakeLists.txt b/eval/src/tests/tensor/dense_pow_as_map_optimizer/CMakeLists.txt
index cf5103f8b4f..60cb72a8ed7 100644
--- a/eval/src/tests/tensor/dense_pow_as_map_optimizer/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_pow_as_map_optimizer/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(eval_dense_pow_as_map_optimizer_test_app TEST
     SOURCES
     dense_pow_as_map_optimizer_test.cpp
     DEPENDS
     vespaeval
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME eval_dense_pow_as_map_optimizer_test_app COMMAND eval_dense_pow_as_map_optimizer_test_app)
diff --git a/eval/src/tests/tensor/dense_simple_expand_function/CMakeLists.txt b/eval/src/tests/tensor/dense_simple_expand_function/CMakeLists.txt
index 4e7409a6139..42be6f4c613 100644
--- a/eval/src/tests/tensor/dense_simple_expand_function/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_simple_expand_function/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(eval_dense_simple_expand_function_test_app TEST
     SOURCES
     dense_simple_expand_function_test.cpp
     DEPENDS
     vespaeval
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME eval_dense_simple_expand_function_test_app COMMAND eval_dense_simple_expand_function_test_app)
diff --git a/eval/src/tests/tensor/dense_simple_map_function/CMakeLists.txt b/eval/src/tests/tensor/dense_simple_map_function/CMakeLists.txt
index 766986bd628..daa68665d2e 100644
--- a/eval/src/tests/tensor/dense_simple_map_function/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_simple_map_function/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(eval_dense_simple_map_function_test_app TEST
     SOURCES
     dense_simple_map_function_test.cpp
     DEPENDS
     vespaeval
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME eval_dense_simple_map_function_test_app COMMAND eval_dense_simple_map_function_test_app)
diff --git a/eval/src/tests/tensor/index_lookup_table/CMakeLists.txt b/eval/src/tests/tensor/index_lookup_table/CMakeLists.txt
index f2dc5d31045..3669c663896 100644
--- a/eval/src/tests/tensor/index_lookup_table/CMakeLists.txt
+++ b/eval/src/tests/tensor/index_lookup_table/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(eval_index_lookup_table_test_app TEST
     SOURCES
     index_lookup_table_test.cpp
     DEPENDS
     vespaeval
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME eval_index_lookup_table_test_app COMMAND eval_index_lookup_table_test_app)
diff --git a/eval/src/tests/tensor/tensor_add_operation/CMakeLists.txt b/eval/src/tests/tensor/tensor_add_operation/CMakeLists.txt
index e511b23c5ec..3dcd14a2189 100644
--- a/eval/src/tests/tensor/tensor_add_operation/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_add_operation/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(eval_tensor_add_operation_test_app TEST
     SOURCES
     tensor_add_operation_test.cpp
     DEPENDS
     vespaeval
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME eval_tensor_add_operation_test_app COMMAND eval_tensor_add_operation_test_app)
diff --git a/eval/src/tests/tensor/tensor_modify_operation/CMakeLists.txt b/eval/src/tests/tensor/tensor_modify_operation/CMakeLists.txt
index 481a0aac7fb..9673c6d0c80 100644
--- a/eval/src/tests/tensor/tensor_modify_operation/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_modify_operation/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(eval_tensor_modify_operation_test_app TEST
     SOURCES
     tensor_modify_operation_test.cpp
     DEPENDS
     vespaeval
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME eval_tensor_modify_operation_test_app COMMAND eval_tensor_modify_operation_test_app)
diff --git a/eval/src/tests/tensor/tensor_remove_operation/CMakeLists.txt b/eval/src/tests/tensor/tensor_remove_operation/CMakeLists.txt
index ffc71563107..0d0c9b17473 100644
--- a/eval/src/tests/tensor/tensor_remove_operation/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_remove_operation/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(eval_tensor_remove_operation_test_app TEST
     SOURCES
     tensor_remove_operation_test.cpp
     DEPENDS
     vespaeval
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME eval_tensor_remove_operation_test_app COMMAND eval_tensor_remove_operation_test_app)
diff --git a/fbench/src/test/authority/CMakeLists.txt b/fbench/src/test/authority/CMakeLists.txt
index 00f804f43f6..09c1152383e 100644
--- a/fbench/src/test/authority/CMakeLists.txt
+++ b/fbench/src/test/authority/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(fbench_authority_test_app TEST
     SOURCES
     authority_test.cpp
     DEPENDS
     fbench_util
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME fbench_authority_test_app COMMAND fbench_authority_test_app)
diff --git a/logd/src/tests/empty_forwarder/CMakeLists.txt b/logd/src/tests/empty_forwarder/CMakeLists.txt
index 4c4ab8efa40..978a425a738 100644
--- a/logd/src/tests/empty_forwarder/CMakeLists.txt
+++ b/logd/src/tests/empty_forwarder/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(logd_empty_forwarder_test_app TEST
     SOURCES
     empty_forwarder_test.cpp
     DEPENDS
     logd
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME logd_empty_forwarder_test_app COMMAND logd_empty_forwarder_test_app)
diff --git a/logd/src/tests/proto_converter/CMakeLists.txt b/logd/src/tests/proto_converter/CMakeLists.txt
index 5ca048ecd4e..ba4c7c2b26d 100644
--- a/logd/src/tests/proto_converter/CMakeLists.txt
+++ b/logd/src/tests/proto_converter/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(logd_proto_converter_test_app TEST
     SOURCES
     proto_converter_test.cpp
     DEPENDS
     logd
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME logd_proto_converter_test_app COMMAND logd_proto_converter_test_app)
diff --git a/logd/src/tests/rpc_forwarder/CMakeLists.txt b/logd/src/tests/rpc_forwarder/CMakeLists.txt
index 66a30777b41..430647c9b82 100644
--- a/logd/src/tests/rpc_forwarder/CMakeLists.txt
+++ b/logd/src/tests/rpc_forwarder/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(logd_rpc_forwarder_test_app TEST
     SOURCES
     rpc_forwarder_test.cpp
     DEPENDS
     logd
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME logd_rpc_forwarder_test_app COMMAND logd_rpc_forwarder_test_app)
diff --git a/logd/src/tests/watcher/CMakeLists.txt b/logd/src/tests/watcher/CMakeLists.txt
index 0bf0a574fa9..42fddae48b3 100644
--- a/logd/src/tests/watcher/CMakeLists.txt
+++ b/logd/src/tests/watcher/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(logd_watcher_test_app TEST
     SOURCES
     watcher_test.cpp
     DEPENDS
     logd
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME logd_watcher_test_app COMMAND logd_watcher_test_app)
diff --git a/metrics/src/tests/CMakeLists.txt b/metrics/src/tests/CMakeLists.txt
index c7ca296e7b5..435be3fd1dd 100644
--- a/metrics/src/tests/CMakeLists.txt
+++ b/metrics/src/tests/CMakeLists.txt
@@ -1,5 +1,7 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
+
 # Runner for unit tests written in gtest.
 vespa_add_executable(metrics_gtest_runner_app TEST
     SOURCES
@@ -17,7 +19,7 @@ vespa_add_executable(metrics_gtest_runner_app TEST
     DEPENDS
     metrics
     vdstestlib
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/persistence/CMakeLists.txt b/persistence/CMakeLists.txt
index e9fd742af27..3883929265c 100644
--- a/persistence/CMakeLists.txt
+++ b/persistence/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_define_module(
     DEPENDS
     fastos
@@ -20,7 +21,7 @@ vespa_define_module(
     src/vespa/persistence/spi
 
     TEST_DEPENDS
-    gtest
+    GTest::GTest
 
     TESTS
     src/tests
diff --git a/persistence/src/vespa/persistence/CMakeLists.txt b/persistence/src/vespa/persistence/CMakeLists.txt
index 77f3f865b6f..456c3f8f87f 100644
--- a/persistence/src/vespa/persistence/CMakeLists.txt
+++ b/persistence/src/vespa/persistence/CMakeLists.txt
@@ -11,5 +11,5 @@ vespa_add_library(persistence_persistence_conformancetest
     $<TARGET_OBJECTS:persistence_conformancetest_lib>
     DEPENDS
     persistence
-    gtest
+    GTest::GTest
 )
diff --git a/searchcommon/src/tests/schema/CMakeLists.txt b/searchcommon/src/tests/schema/CMakeLists.txt
index aafe015d9a1..76c8d3f8483 100644
--- a/searchcommon/src/tests/schema/CMakeLists.txt
+++ b/searchcommon/src/tests/schema/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchcommon_schema_test_app TEST
     SOURCES
     schema_test.cpp
     DEPENDS
     searchcommon
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchcommon_schema_test_app NO_VALGRIND COMMAND searchcommon_schema_test_app)
diff --git a/searchcore/src/tests/proton/attribute/CMakeLists.txt b/searchcore/src/tests/proton/attribute/CMakeLists.txt
index c23d97c6e88..95f55c28f18 100644
--- a/searchcore/src/tests/proton/attribute/CMakeLists.txt
+++ b/searchcore/src/tests/proton/attribute/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchcore_attribute_test_app TEST
     SOURCES
     attribute_test.cpp
@@ -8,7 +9,7 @@ vespa_add_executable(searchcore_attribute_test_app TEST
     searchcore_flushengine
     searchcore_pcommon
     searchlib_test
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_attribute_test_app COMMAND searchcore_attribute_test_app)
 
diff --git a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/CMakeLists.txt b/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/CMakeLists.txt
index de1ab5851f4..54c028fbfe8 100644
--- a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchcore_attribute_aspect_delayer_test_app TEST
     SOURCES
     attribute_aspect_delayer_test.cpp
     DEPENDS
     searchcore_attribute
     searchcore_pcommon
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_attribute_aspect_delayer_test_app COMMAND searchcore_attribute_aspect_delayer_test_app)
diff --git a/searchcore/src/tests/proton/attribute/attribute_usage_sampler_functor/CMakeLists.txt b/searchcore/src/tests/proton/attribute/attribute_usage_sampler_functor/CMakeLists.txt
index 2cb6bc65df3..a48d7f19abe 100644
--- a/searchcore/src/tests/proton/attribute/attribute_usage_sampler_functor/CMakeLists.txt
+++ b/searchcore/src/tests/proton/attribute/attribute_usage_sampler_functor/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchcore_attribute_usage_sampler_functor_test_app TEST
     SOURCES
     attribute_usage_sampler_functor_test.cpp
     DEPENDS
     searchcore_attribute
     searchcore_pcommon
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_attribute_usage_sampler_functor_test_app COMMAND searchcore_attribute_usage_sampler_functor_test_app)
diff --git a/searchcore/src/tests/proton/common/operation_rate_tracker/CMakeLists.txt b/searchcore/src/tests/proton/common/operation_rate_tracker/CMakeLists.txt
index f5e6a791124..3c5152935d7 100644
--- a/searchcore/src/tests/proton/common/operation_rate_tracker/CMakeLists.txt
+++ b/searchcore/src/tests/proton/common/operation_rate_tracker/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchcore_operation_rate_tracker_test_app TEST
     SOURCES
     operation_rate_tracker_test.cpp
     DEPENDS
     searchcore_pcommon
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_operation_rate_tracker_test_app COMMAND searchcore_operation_rate_tracker_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/lid_space_compaction/CMakeLists.txt
index c4e69ace22c..3e008e3f5d0 100644
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchcore_lid_space_compaction_test_app TEST
     SOURCES
     lid_space_compaction_test.cpp
@@ -10,6 +11,6 @@ vespa_add_executable(searchcore_lid_space_compaction_test_app TEST
     searchcore_documentmetastore
     searchcore_bucketdb
     searchcore_pcommon
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_lid_space_compaction_test_app COMMAND searchcore_lid_space_compaction_test_app)
diff --git a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt b/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt
index f31d82240e0..c35d736acd1 100644
--- a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchcore_documentmetastore_test_app TEST
     SOURCES
     documentmetastore_test.cpp
@@ -9,7 +10,7 @@ vespa_add_executable(searchcore_documentmetastore_test_app TEST
     searchcore_attribute
     searchcore_feedoperation
     searchcore_fconfig
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_documentmetastore_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/documentmetastore_test.sh
                DEPENDS searchcore_documentmetastore_test_app)
diff --git a/searchcore/src/tests/proton/index/CMakeLists.txt b/searchcore/src/tests/proton/index/CMakeLists.txt
index 1ffad6cdbf8..b967bf304c3 100644
--- a/searchcore/src/tests/proton/index/CMakeLists.txt
+++ b/searchcore/src/tests/proton/index/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchcore_indexmanager_test_app TEST
     SOURCES
     indexmanager_test.cpp
@@ -7,7 +8,7 @@ vespa_add_executable(searchcore_indexmanager_test_app TEST
     searchcore_index
     searchcore_flushengine
     searchcore_pcommon
-    gtest
+    GTest::GTest
 )
 vespa_add_executable(searchcore_fusionrunner_test_app TEST
     SOURCES
@@ -28,7 +29,7 @@ vespa_add_executable(searchcore_indexcollection_test_app TEST
     indexcollection_test.cpp
     DEPENDS
     searchcore_index
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_index_test COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/index_test.sh 
                DEPENDS searchcore_indexmanager_test_app searchcore_fusionrunner_test_app searchcore_diskindexcleaner_test_app searchcore_indexcollection_test_app)
diff --git a/searchcore/src/tests/proton/matching/handle_recorder/CMakeLists.txt b/searchcore/src/tests/proton/matching/handle_recorder/CMakeLists.txt
index a56d22ab154..3f4fd071e5c 100644
--- a/searchcore/src/tests/proton/matching/handle_recorder/CMakeLists.txt
+++ b/searchcore/src/tests/proton/matching/handle_recorder/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
 vespa_add_executable(searchcore_matching_handle_recorder_test_app TEST
     SOURCES
     handle_recorder_test.cpp
     DEPENDS
     searchcore_matching
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_matching_handle_recorder_test_app COMMAND searchcore_matching_handle_recorder_test_app)
diff --git a/searchcore/src/tests/proton/matching/request_context/CMakeLists.txt b/searchcore/src/tests/proton/matching/request_context/CMakeLists.txt
index 54696112302..c044a9d4869 100644
--- a/searchcore/src/tests/proton/matching/request_context/CMakeLists.txt
+++ b/searchcore/src/tests/proton/matching/request_context/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchcore_matching_request_context_test_app TEST
     SOURCES
     request_context_test.cpp
     DEPENDS
     searchcore_matching
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_matching_request_context_test_app COMMAND searchcore_matching_request_context_test_app)
diff --git a/searchcore/src/tests/proton/matching/unpacking_iterators_optimizer/CMakeLists.txt b/searchcore/src/tests/proton/matching/unpacking_iterators_optimizer/CMakeLists.txt
index 6fce7151664..764208c0eba 100644
--- a/searchcore/src/tests/proton/matching/unpacking_iterators_optimizer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/matching/unpacking_iterators_optimizer/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchcore_unpacking_iterators_optimizer_test_app TEST
     SOURCES
     unpacking_iterators_optimizer_test.cpp
     DEPENDS
     searchcore_matching
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_unpacking_iterators_optimizer_test_app COMMAND searchcore_unpacking_iterators_optimizer_test_app)
diff --git a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/CMakeLists.txt b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/CMakeLists.txt
index 048ed1938e5..f96a31b7765 100644
--- a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchcore_attribute_reprocessing_initializer_test_app TEST
     SOURCES
     attribute_reprocessing_initializer_test.cpp
@@ -6,6 +7,6 @@ vespa_add_executable(searchcore_attribute_reprocessing_initializer_test_app TEST
     searchcore_reprocessing
     searchcore_attribute
     searchcore_pcommon
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchcore_attribute_reprocessing_initializer_test_app COMMAND searchcore_attribute_reprocessing_initializer_test_app)
diff --git a/searchlib/src/tests/attribute/attribute_header/CMakeLists.txt b/searchlib/src/tests/attribute/attribute_header/CMakeLists.txt
index e72c0c6a528..2327cf5116f 100644
--- a/searchlib/src/tests/attribute/attribute_header/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/attribute_header/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_attribute_header_test_app TEST
     SOURCES
     attribute_header_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_attribute_header_test_app COMMAND searchlib_attribute_header_test_app)
diff --git a/searchlib/src/tests/attribute/enumstore/CMakeLists.txt b/searchlib/src/tests/attribute/enumstore/CMakeLists.txt
index e8f6068cebe..b9a361d05fc 100644
--- a/searchlib/src/tests/attribute/enumstore/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/enumstore/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_enumstore_test_app TEST
     SOURCES
     enumstore_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_enumstore_test_app COMMAND searchlib_enumstore_test_app)
diff --git a/searchlib/src/tests/attribute/multi_value_mapping/CMakeLists.txt b/searchlib/src/tests/attribute/multi_value_mapping/CMakeLists.txt
index 6b1f5f3d656..53856bf7b88 100644
--- a/searchlib/src/tests/attribute/multi_value_mapping/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/multi_value_mapping/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_multi_value_mapping_test_app TEST
     SOURCES
     multi_value_mapping_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_multi_value_mapping_test_app COMMAND searchlib_multi_value_mapping_test_app)
diff --git a/searchlib/src/tests/attribute/reference_attribute/CMakeLists.txt b/searchlib/src/tests/attribute/reference_attribute/CMakeLists.txt
index 6638bf886b7..9473f9f7fbf 100644
--- a/searchlib/src/tests/attribute/reference_attribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/reference_attribute/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_reference_attribute_test_app TEST
     SOURCES
     reference_attribute_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_reference_attribute_test_app COMMAND searchlib_reference_attribute_test_app)
diff --git a/searchlib/src/tests/attribute/save_target/CMakeLists.txt b/searchlib/src/tests/attribute/save_target/CMakeLists.txt
index e127f66579e..dac326207da 100644
--- a/searchlib/src/tests/attribute/save_target/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/save_target/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_attribute_save_target_test_app TEST
     SOURCES
     attribute_save_target_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_attribute_save_target_test_app COMMAND searchlib_attribute_save_target_test_app)
diff --git a/searchlib/src/tests/attribute/searchable/CMakeLists.txt b/searchlib/src/tests/attribute/searchable/CMakeLists.txt
index e754253c34a..80c23e299f4 100644
--- a/searchlib/src/tests/attribute/searchable/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/searchable/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_attribute_searchable_adapter_test_app TEST
     SOURCES
     attribute_searchable_adapter_test.cpp
@@ -19,6 +20,6 @@ vespa_add_executable(searchlib_attribute_blueprint_test_app TEST
     attributeblueprint_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_attribute_blueprint_test_app COMMAND searchlib_attribute_blueprint_test_app)
diff --git a/searchlib/src/tests/attribute/searchcontextelementiterator/CMakeLists.txt b/searchlib/src/tests/attribute/searchcontextelementiterator/CMakeLists.txt
index 1a27b446d30..6810d145124 100644
--- a/searchlib/src/tests/attribute/searchcontextelementiterator/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/searchcontextelementiterator/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_attribute_searchcontextelementiterator_test_app TEST
     SOURCES
     searchcontextelementiterator_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_attribute_searchcontextelementiterator_test_app COMMAND searchlib_attribute_searchcontextelementiterator_test_app)
diff --git a/searchlib/src/tests/common/matching_elements/CMakeLists.txt b/searchlib/src/tests/common/matching_elements/CMakeLists.txt
index cd1d3560c15..ef7aa316dfd 100644
--- a/searchlib/src/tests/common/matching_elements/CMakeLists.txt
+++ b/searchlib/src/tests/common/matching_elements/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_common_matching_elements_test_app TEST
     SOURCES
     matching_elements_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_common_matching_elements_test_app COMMAND searchlib_common_matching_elements_test_app)
diff --git a/searchlib/src/tests/common/matching_elements_fields/CMakeLists.txt b/searchlib/src/tests/common/matching_elements_fields/CMakeLists.txt
index 3d6f338315a..f5a61787328 100644
--- a/searchlib/src/tests/common/matching_elements_fields/CMakeLists.txt
+++ b/searchlib/src/tests/common/matching_elements_fields/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_common_matching_elements_fields_test_app TEST
     SOURCES
     matching_elements_fields_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_common_matching_elements_fields_test_app COMMAND searchlib_common_matching_elements_fields_test_app)
diff --git a/searchlib/src/tests/engine/proto_converter/CMakeLists.txt b/searchlib/src/tests/engine/proto_converter/CMakeLists.txt
index 718e8120c2c..82e8e1b8be7 100644
--- a/searchlib/src/tests/engine/proto_converter/CMakeLists.txt
+++ b/searchlib/src/tests/engine/proto_converter/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_engine_proto_converter_test_app TEST
     SOURCES
     proto_converter_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_engine_proto_converter_test_app COMMAND searchlib_engine_proto_converter_test_app)
diff --git a/searchlib/src/tests/engine/proto_rpc_adapter/CMakeLists.txt b/searchlib/src/tests/engine/proto_rpc_adapter/CMakeLists.txt
index 3fa638f16e5..7d7259c40d8 100644
--- a/searchlib/src/tests/engine/proto_rpc_adapter/CMakeLists.txt
+++ b/searchlib/src/tests/engine/proto_rpc_adapter/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_engine_proto_rpc_adapter_test_app TEST
     SOURCES
     proto_rpc_adapter_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_engine_proto_rpc_adapter_test_app COMMAND searchlib_engine_proto_rpc_adapter_test_app)
diff --git a/searchlib/src/tests/features/bm25/CMakeLists.txt b/searchlib/src/tests/features/bm25/CMakeLists.txt
index 3f9b92684f8..35ad629169f 100644
--- a/searchlib/src/tests/features/bm25/CMakeLists.txt
+++ b/searchlib/src/tests/features/bm25/CMakeLists.txt
@@ -1,11 +1,12 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_features_bm25_test_app TEST
     SOURCES
     bm25_test.cpp
     DEPENDS
     searchlib
     searchlib_test
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_features_bm25_test_app COMMAND searchlib_features_bm25_test_app)
diff --git a/searchlib/src/tests/index/field_length_calculator/CMakeLists.txt b/searchlib/src/tests/index/field_length_calculator/CMakeLists.txt
index df09d0abaa7..e35927662e6 100644
--- a/searchlib/src/tests/index/field_length_calculator/CMakeLists.txt
+++ b/searchlib/src/tests/index/field_length_calculator/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_field_length_calculator_test_app TEST
     SOURCES
     field_length_calculator_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_field_length_calculator_test_app COMMAND searchlib_field_length_calculator_test_app)
diff --git a/searchlib/src/tests/memoryindex/compact_words_store/CMakeLists.txt b/searchlib/src/tests/memoryindex/compact_words_store/CMakeLists.txt
index 754ff796690..71e13db15fa 100644
--- a/searchlib/src/tests/memoryindex/compact_words_store/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/compact_words_store/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_compact_words_store_test_app TEST
     SOURCES
     compact_words_store_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_compact_words_store_test_app COMMAND searchlib_compact_words_store_test_app)
diff --git a/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt b/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt
index be1a193cd3c..770118a65b4 100644
--- a/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_feature_store_test_app TEST
     SOURCES
     feature_store_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_feature_store_test_app COMMAND searchlib_feature_store_test_app)
 vespa_add_executable(searchlib_word_store_test_app TEST
@@ -12,6 +13,6 @@ vespa_add_executable(searchlib_word_store_test_app TEST
     word_store_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_word_store_test_app COMMAND searchlib_word_store_test_app)
diff --git a/searchlib/src/tests/memoryindex/document_inverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/document_inverter/CMakeLists.txt
index ecf33ee48fd..0831e87252f 100644
--- a/searchlib/src/tests/memoryindex/document_inverter/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/document_inverter/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_document_inverter_test_app TEST
     SOURCES
     document_inverter_test.cpp
     DEPENDS
     searchlib_test
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_document_inverter_test_app COMMAND searchlib_document_inverter_test_app)
diff --git a/searchlib/src/tests/memoryindex/field_index/CMakeLists.txt b/searchlib/src/tests/memoryindex/field_index/CMakeLists.txt
index a09d6baf1a5..2568249c2df 100644
--- a/searchlib/src/tests/memoryindex/field_index/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/field_index/CMakeLists.txt
@@ -1,11 +1,12 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_field_index_test_app TEST
     SOURCES
     field_index_test.cpp
     DEPENDS
     searchlib
     searchlib_test
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_field_index_test_app COMMAND searchlib_field_index_test_app)
 
diff --git a/searchlib/src/tests/memoryindex/field_index_remover/CMakeLists.txt b/searchlib/src/tests/memoryindex/field_index_remover/CMakeLists.txt
index f18b4ba29cd..bc3a62c4f26 100644
--- a/searchlib/src/tests/memoryindex/field_index_remover/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/field_index_remover/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_field_index_remover_test_app TEST
     SOURCES
     field_index_remover_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_field_index_remover_test_app COMMAND searchlib_field_index_remover_test_app)
diff --git a/searchlib/src/tests/memoryindex/field_inverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/field_inverter/CMakeLists.txt
index 6fefada6570..b670e0ccf57 100644
--- a/searchlib/src/tests/memoryindex/field_inverter/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/field_inverter/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_field_inverter_test_app TEST
     SOURCES
     field_inverter_test.cpp
     DEPENDS
     searchlib_test
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_field_inverter_test_app COMMAND searchlib_field_inverter_test_app)
diff --git a/searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt b/searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt
index 0dd42eacf30..611aa6e58c6 100644
--- a/searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_memory_index_test_app TEST
     SOURCES
     memory_index_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_memory_index_test_app COMMAND searchlib_memory_index_test_app)
diff --git a/searchlib/src/tests/memoryindex/url_field_inverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/url_field_inverter/CMakeLists.txt
index db9418b7190..0378d209d5e 100644
--- a/searchlib/src/tests/memoryindex/url_field_inverter/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/url_field_inverter/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_url_field_inverter_test_app TEST
     SOURCES
     url_field_inverter_test.cpp
     DEPENDS
     searchlib_test
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_url_field_inverter_test_app COMMAND searchlib_url_field_inverter_test_app)
diff --git a/searchlib/src/tests/postinglistbm/CMakeLists.txt b/searchlib/src/tests/postinglistbm/CMakeLists.txt
index 6e90f44726a..004cff76efd 100644
--- a/searchlib/src/tests/postinglistbm/CMakeLists.txt
+++ b/searchlib/src/tests/postinglistbm/CMakeLists.txt
@@ -1,11 +1,12 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_posting_list_test_app TEST
     SOURCES
     posting_list_test.cpp
     DEPENDS
     searchlib_test
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_posting_list_test_app NO_VALGRIND COMMAND searchlib_posting_list_test_app)
 
diff --git a/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt b/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt
index c98306aa179..d21524d158a 100644
--- a/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_fake_searchable_test_app TEST
     SOURCES
     fake_searchable_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_fake_searchable_test_app COMMAND searchlib_fake_searchable_test_app)
diff --git a/searchlib/src/tests/tensor/distance_functions/CMakeLists.txt b/searchlib/src/tests/tensor/distance_functions/CMakeLists.txt
index 9356658f90e..6f7c71d4d54 100644
--- a/searchlib/src/tests/tensor/distance_functions/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/distance_functions/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_distance_functions_test_app TEST
     SOURCES
     distance_functions_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_distance_functions_test_app COMMAND searchlib_distance_functions_test_app)
diff --git a/searchlib/src/tests/tensor/hnsw_index/CMakeLists.txt b/searchlib/src/tests/tensor/hnsw_index/CMakeLists.txt
index b6a87502fdf..0fd2f9a205a 100644
--- a/searchlib/src/tests/tensor/hnsw_index/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/hnsw_index/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_hnsw_index_test_app TEST
     SOURCES
     hnsw_index_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_hnsw_index_test_app COMMAND searchlib_hnsw_index_test_app)
 
@@ -13,5 +14,5 @@ vespa_add_executable(mt_stress_hnsw_app TEST
     stress_hnsw_mt.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
diff --git a/searchlib/src/tests/tensor/hnsw_saver/CMakeLists.txt b/searchlib/src/tests/tensor/hnsw_saver/CMakeLists.txt
index 90202e222a7..0dbd80c68d0 100644
--- a/searchlib/src/tests/tensor/hnsw_saver/CMakeLists.txt
+++ b/searchlib/src/tests/tensor/hnsw_saver/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(searchlib_hnsw_save_load_test_app TEST
     SOURCES
     hnsw_save_load_test.cpp
     DEPENDS
     searchlib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME searchlib_hnsw_save_load_test_app COMMAND searchlib_hnsw_save_load_test_app)
diff --git a/storage/src/tests/bucketdb/CMakeLists.txt b/storage/src/tests/bucketdb/CMakeLists.txt
index 2468e587aff..5dc269e54f9 100644
--- a/storage/src/tests/bucketdb/CMakeLists.txt
+++ b/storage/src/tests/bucketdb/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
 vespa_add_executable(storage_bucketdb_gtest_runner_app TEST
     SOURCES
     bucketinfotest.cpp
@@ -12,7 +13,7 @@ vespa_add_executable(storage_bucketdb_gtest_runner_app TEST
     DEPENDS
     storage
     storage_testcommon
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/storage/src/tests/common/CMakeLists.txt b/storage/src/tests/common/CMakeLists.txt
index 1922d13ca61..5d5b04d8095 100644
--- a/storage/src/tests/common/CMakeLists.txt
+++ b/storage/src/tests/common/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(storage_testcommon TEST
     SOURCES
     dummystoragelink.cpp
@@ -19,7 +20,7 @@ vespa_add_executable(storage_common_gtest_runner_app TEST
     DEPENDS
     storage_testcommon
     storage
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/storage/src/tests/common/hostreporter/CMakeLists.txt b/storage/src/tests/common/hostreporter/CMakeLists.txt
index 2fcb159cb08..4328b8156e6 100644
--- a/storage/src/tests/common/hostreporter/CMakeLists.txt
+++ b/storage/src/tests/common/hostreporter/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(storage_testhostreporter TEST
     SOURCES
     util.cpp
@@ -14,7 +15,7 @@ vespa_add_executable(storage_hostreporter_gtest_runner_app TEST
     DEPENDS
     storage
     storage_testhostreporter
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/storage/src/tests/distributor/CMakeLists.txt b/storage/src/tests/distributor/CMakeLists.txt
index 3148540d86d..1403021a9c3 100644
--- a/storage/src/tests/distributor/CMakeLists.txt
+++ b/storage/src/tests/distributor/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
 vespa_add_executable(storage_distributor_gtest_runner_app TEST
     SOURCES
     blockingoperationstartertest.cpp
@@ -49,7 +50,7 @@ vespa_add_executable(storage_distributor_gtest_runner_app TEST
     storage_testcommon
     storage_testhostreporter
     storage_distributor
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/storage/src/tests/frameworkimpl/status/CMakeLists.txt b/storage/src/tests/frameworkimpl/status/CMakeLists.txt
index 1b49b1bac45..cf2ee5fd51b 100644
--- a/storage/src/tests/frameworkimpl/status/CMakeLists.txt
+++ b/storage/src/tests/frameworkimpl/status/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
 vespa_add_executable(storage_status_gtest_runner_app TEST
     SOURCES
     gtest_runner.cpp
@@ -8,7 +9,7 @@ vespa_add_executable(storage_status_gtest_runner_app TEST
     DEPENDS
     storage
     storage_testcommon
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/storage/src/tests/persistence/CMakeLists.txt b/storage/src/tests/persistence/CMakeLists.txt
index e8095109806..ae96748ff9d 100644
--- a/storage/src/tests/persistence/CMakeLists.txt
+++ b/storage/src/tests/persistence/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
 vespa_add_executable(storage_persistence_gtest_runner_app TEST
     SOURCES
     bucketownershipnotifiertest.cpp
@@ -15,7 +16,7 @@ vespa_add_executable(storage_persistence_gtest_runner_app TEST
     DEPENDS
     storage
     storage_testpersistence_common
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/storage/src/tests/persistence/common/CMakeLists.txt b/storage/src/tests/persistence/common/CMakeLists.txt
index 53ec3fd7c0c..29b826c0c9b 100644
--- a/storage/src/tests/persistence/common/CMakeLists.txt
+++ b/storage/src/tests/persistence/common/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(storage_testpersistence_common TEST
     SOURCES
     filestortestfixture.cpp
     persistenceproviderwrapper.cpp
     DEPENDS
-    gtest
+    GTest::GTest
     persistence
     storage_testcommon
 )
diff --git a/storage/src/tests/persistence/filestorage/CMakeLists.txt b/storage/src/tests/persistence/filestorage/CMakeLists.txt
index 5209bcce73d..8cabfb865cd 100644
--- a/storage/src/tests/persistence/filestorage/CMakeLists.txt
+++ b/storage/src/tests/persistence/filestorage/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
 vespa_add_executable(storage_filestorage_gtest_runner_app TEST
     SOURCES
     deactivatebucketstest.cpp
@@ -16,7 +17,7 @@ vespa_add_executable(storage_filestorage_gtest_runner_app TEST
     storage
     storageapi
     storage_testpersistence_common
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/storage/src/tests/storageserver/CMakeLists.txt b/storage/src/tests/storageserver/CMakeLists.txt
index 1d759a534f6..95ce08265ad 100644
--- a/storage/src/tests/storageserver/CMakeLists.txt
+++ b/storage/src/tests/storageserver/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(storage_teststorageserver TEST
     SOURCES
     testvisitormessagesession.cpp
@@ -25,7 +26,7 @@ vespa_add_executable(storage_storageserver_gtest_runner_app TEST
     storage_storageserver
     storage_testcommon
     storage_teststorageserver
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/storage/src/tests/visiting/CMakeLists.txt b/storage/src/tests/visiting/CMakeLists.txt
index c1b19960cea..8bfc28e7eb9 100644
--- a/storage/src/tests/visiting/CMakeLists.txt
+++ b/storage/src/tests/visiting/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
 vespa_add_executable(storage_visiting_gtest_runner_app TEST
     SOURCES
     commandqueuetest.cpp
@@ -10,7 +11,7 @@ vespa_add_executable(storage_visiting_gtest_runner_app TEST
     DEPENDS
     storage
     storage_teststorageserver
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/storageapi/src/tests/CMakeLists.txt b/storageapi/src/tests/CMakeLists.txt
index 8b820adb467..f07b9d0a2bc 100644
--- a/storageapi/src/tests/CMakeLists.txt
+++ b/storageapi/src/tests/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
 vespa_add_executable(storageapi_gtest_runner_app TEST
     SOURCES
     gtest_runner.cpp
@@ -8,7 +9,7 @@ vespa_add_executable(storageapi_gtest_runner_app TEST
     storageapi_testmbusprot
     storageapi_testmessageapi
     storageapi
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/storageapi/src/tests/buckets/CMakeLists.txt b/storageapi/src/tests/buckets/CMakeLists.txt
index 42310be56f0..ea2cc109986 100644
--- a/storageapi/src/tests/buckets/CMakeLists.txt
+++ b/storageapi/src/tests/buckets/CMakeLists.txt
@@ -1,8 +1,9 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(storageapi_testbuckets
     SOURCES
     bucketinfotest.cpp
     DEPENDS
     storageapi
-    gtest
+    GTest::GTest
 )
diff --git a/storageapi/src/tests/mbusprot/CMakeLists.txt b/storageapi/src/tests/mbusprot/CMakeLists.txt
index 2801c9a91dd..84b8ff0f1b0 100644
--- a/storageapi/src/tests/mbusprot/CMakeLists.txt
+++ b/storageapi/src/tests/mbusprot/CMakeLists.txt
@@ -1,8 +1,9 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(storageapi_testmbusprot
     SOURCES
     storageprotocoltest.cpp
     DEPENDS
     storageapi
-    gtest
+    GTest::GTest
 )
diff --git a/storageframework/src/tests/CMakeLists.txt b/storageframework/src/tests/CMakeLists.txt
index d658605a911..1cf40b8a2ef 100644
--- a/storageframework/src/tests/CMakeLists.txt
+++ b/storageframework/src/tests/CMakeLists.txt
@@ -1,5 +1,7 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
+
 # Runner for unit tests written in gtest.
 # NOTE: All new test classes should be added here.
 vespa_add_executable(storageframework_gtest_runner_app TEST
@@ -8,7 +10,7 @@ vespa_add_executable(storageframework_gtest_runner_app TEST
     DEPENDS
     storageframework_testclock
     storageframework_testthread
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/storageframework/src/tests/clock/CMakeLists.txt b/storageframework/src/tests/clock/CMakeLists.txt
index f887de61239..62bb6eeedc1 100644
--- a/storageframework/src/tests/clock/CMakeLists.txt
+++ b/storageframework/src/tests/clock/CMakeLists.txt
@@ -1,8 +1,9 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(storageframework_testclock
     SOURCES
     timetest.cpp
     DEPENDS
     storageframework
-    gtest
+    GTest::GTest
 )
diff --git a/storageframework/src/tests/thread/CMakeLists.txt b/storageframework/src/tests/thread/CMakeLists.txt
index 3e6db8c9b57..810b0c59912 100644
--- a/storageframework/src/tests/thread/CMakeLists.txt
+++ b/storageframework/src/tests/thread/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(storageframework_testthread
     SOURCES
     tickingthreadtest.cpp
     taskthreadtest.cpp
     DEPENDS
     storageframework
-    gtest
+    GTest::GTest
 )
diff --git a/storageserver/src/tests/CMakeLists.txt b/storageserver/src/tests/CMakeLists.txt
index 9c475543b81..2981d452d5f 100644
--- a/storageserver/src/tests/CMakeLists.txt
+++ b/storageserver/src/tests/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
 vespa_add_executable(storageserver_gtest_runner_app TEST
     SOURCES
     storageservertest.cpp
@@ -8,7 +9,7 @@ vespa_add_executable(storageserver_gtest_runner_app TEST
     DEPENDS
     storageserver_storageapp
     vdstestlib
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/vdslib/src/tests/CMakeLists.txt b/vdslib/src/tests/CMakeLists.txt
index f552808f97c..458f3bda01d 100644
--- a/vdslib/src/tests/CMakeLists.txt
+++ b/vdslib/src/tests/CMakeLists.txt
@@ -1,5 +1,7 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
+
 # Runner for unit tests written in gtest.
 # NOTE: All new test classes should be added here.
 vespa_add_executable(vdslib_gtest_runner_app TEST
@@ -11,7 +13,7 @@ vespa_add_executable(vdslib_gtest_runner_app TEST
     vdslib_testdistribution
     vdslib_teststate
     vdslib_testthread
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/vdslib/src/tests/bucketdistribution/CMakeLists.txt b/vdslib/src/tests/bucketdistribution/CMakeLists.txt
index ecb29e9b12d..986a7ff26ff 100644
--- a/vdslib/src/tests/bucketdistribution/CMakeLists.txt
+++ b/vdslib/src/tests/bucketdistribution/CMakeLists.txt
@@ -1,8 +1,9 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(vdslib_bucketdistributiontest
     SOURCES
     bucketdistributiontest.cpp
     DEPENDS
     vdslib
-    gtest
+    GTest::GTest
 )
diff --git a/vdslib/src/tests/container/CMakeLists.txt b/vdslib/src/tests/container/CMakeLists.txt
index 9f7b2e33efa..47ffbcf7b82 100644
--- a/vdslib/src/tests/container/CMakeLists.txt
+++ b/vdslib/src/tests/container/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(vdslib_containertest
     SOURCES
     parameterstest.cpp
@@ -6,5 +7,5 @@ vespa_add_library(vdslib_containertest
     documentsummarytest.cpp
     DEPENDS
     vdslib
-    gtest
+    GTest::GTest
 )
diff --git a/vdslib/src/tests/distribution/CMakeLists.txt b/vdslib/src/tests/distribution/CMakeLists.txt
index cdcfcfce5f9..61563c4c448 100644
--- a/vdslib/src/tests/distribution/CMakeLists.txt
+++ b/vdslib/src/tests/distribution/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(vdslib_testdistribution
     SOURCES
     distributiontest.cpp
@@ -6,5 +7,5 @@ vespa_add_library(vdslib_testdistribution
     idealnodecalculatorimpltest.cpp
     DEPENDS
     vdslib
-    gtest
+    GTest::GTest
 )
diff --git a/vdslib/src/tests/state/CMakeLists.txt b/vdslib/src/tests/state/CMakeLists.txt
index 0e057d12226..d28ff47798a 100644
--- a/vdslib/src/tests/state/CMakeLists.txt
+++ b/vdslib/src/tests/state/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(vdslib_teststate
     SOURCES
     cluster_state_bundle_test.cpp
@@ -7,5 +8,5 @@ vespa_add_library(vdslib_teststate
     nodestatetest.cpp
     DEPENDS
     vdslib
-    gtest
+    GTest::GTest
 )
diff --git a/vdslib/src/tests/thread/CMakeLists.txt b/vdslib/src/tests/thread/CMakeLists.txt
index 4d1e753a8f6..df2e8bf43f9 100644
--- a/vdslib/src/tests/thread/CMakeLists.txt
+++ b/vdslib/src/tests/thread/CMakeLists.txt
@@ -1,8 +1,9 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_library(vdslib_testthread
     SOURCES
     taskschedulertest.cpp
     DEPENDS
     vdslib
-    gtest
+    GTest::GTest
 )
diff --git a/vespalib/src/tests/crypto/CMakeLists.txt b/vespalib/src/tests/crypto/CMakeLists.txt
index b930b5715b5..d0661461dd4 100644
--- a/vespalib/src/tests/crypto/CMakeLists.txt
+++ b/vespalib/src/tests/crypto/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_crypto_crypto_test_app TEST
     SOURCES
     crypto_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_crypto_crypto_test_app COMMAND vespalib_crypto_crypto_test_app)
 
diff --git a/vespalib/src/tests/datastore/datastore/CMakeLists.txt b/vespalib/src/tests/datastore/datastore/CMakeLists.txt
index eb3e0a4576a..631c1812a7f 100644
--- a/vespalib/src/tests/datastore/datastore/CMakeLists.txt
+++ b/vespalib/src/tests/datastore/datastore/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_datastore_test_app TEST
     SOURCES
     datastore_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_datastore_test_app COMMAND vespalib_datastore_test_app)
diff --git a/vespalib/src/tests/datastore/unique_store/CMakeLists.txt b/vespalib/src/tests/datastore/unique_store/CMakeLists.txt
index d72e8c10ad5..29b34e93247 100644
--- a/vespalib/src/tests/datastore/unique_store/CMakeLists.txt
+++ b/vespalib/src/tests/datastore/unique_store/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_unique_store_test_app TEST
     SOURCES
     unique_store_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_unique_store_test_app COMMAND vespalib_unique_store_test_app)
diff --git a/vespalib/src/tests/datastore/unique_store_dictionary/CMakeLists.txt b/vespalib/src/tests/datastore/unique_store_dictionary/CMakeLists.txt
index b1478dea22c..2208902b5bb 100644
--- a/vespalib/src/tests/datastore/unique_store_dictionary/CMakeLists.txt
+++ b/vespalib/src/tests/datastore/unique_store_dictionary/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_unique_store_dictionary_test_app TEST
     SOURCES
     unique_store_dictionary_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_unique_store_dictionary_test_app COMMAND vespalib_unique_store_dictionary_test_app)
diff --git a/vespalib/src/tests/datastore/unique_store_string_allocator/CMakeLists.txt b/vespalib/src/tests/datastore/unique_store_string_allocator/CMakeLists.txt
index c2a9999d545..9984877ab21 100644
--- a/vespalib/src/tests/datastore/unique_store_string_allocator/CMakeLists.txt
+++ b/vespalib/src/tests/datastore/unique_store_string_allocator/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_unique_store_string_allocator_test_app TEST
     SOURCES
     unique_store_string_allocator_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_unique_store_string_allocator_test_app COMMAND vespalib_unique_store_string_allocator_test_app)
diff --git a/vespalib/src/tests/overload/CMakeLists.txt b/vespalib/src/tests/overload/CMakeLists.txt
index 67aa6230225..a03f6fbdc8d 100644
--- a/vespalib/src/tests/overload/CMakeLists.txt
+++ b/vespalib/src/tests/overload/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_overload_test_app TEST
     SOURCES
     overload_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_overload_test_app COMMAND vespalib_overload_test_app)
diff --git a/vespalib/src/tests/stllike/CMakeLists.txt b/vespalib/src/tests/stllike/CMakeLists.txt
index ebf7de9c747..41e0b9e8507 100644
--- a/vespalib/src/tests/stllike/CMakeLists.txt
+++ b/vespalib/src/tests/stllike/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_hash_test_app TEST
     SOURCES
     hash_test.cpp
@@ -52,6 +53,6 @@ vespa_add_executable(vespalib_replace_variable_test_app TEST
     replace_variable_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_replace_variable_test_app COMMAND vespalib_replace_variable_test_app)
diff --git a/vespalib/src/tests/time/CMakeLists.txt b/vespalib/src/tests/time/CMakeLists.txt
index e43bd9097e5..ba639f2392e 100644
--- a/vespalib/src/tests/time/CMakeLists.txt
+++ b/vespalib/src/tests/time/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_time_box_test_app TEST
     SOURCES
     time_box_test.cpp
@@ -11,6 +12,6 @@ vespa_add_executable(vespalib_time_test_app TEST
     time_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_time_test_app COMMAND vespalib_time_test_app)
diff --git a/vespalib/src/tests/typify/CMakeLists.txt b/vespalib/src/tests/typify/CMakeLists.txt
index 29e95af1988..c8e53d6baca 100644
--- a/vespalib/src/tests/typify/CMakeLists.txt
+++ b/vespalib/src/tests/typify/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_typify_test_app TEST
     SOURCES
     typify_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_typify_test_app COMMAND vespalib_typify_test_app)
diff --git a/vespalib/src/tests/util/reusable_set/CMakeLists.txt b/vespalib/src/tests/util/reusable_set/CMakeLists.txt
index 9c46b5ba61e..edbbc2ff11f 100644
--- a/vespalib/src/tests/util/reusable_set/CMakeLists.txt
+++ b/vespalib/src/tests/util/reusable_set/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_reusable_set_test_app TEST
     SOURCES
     reusable_set_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_reusable_set_test_app COMMAND vespalib_reusable_set_test_app)
diff --git a/vespalib/src/tests/visit_ranges/CMakeLists.txt b/vespalib/src/tests/visit_ranges/CMakeLists.txt
index de94b2ebb1e..3c51d7c1e34 100644
--- a/vespalib/src/tests/visit_ranges/CMakeLists.txt
+++ b/vespalib/src/tests/visit_ranges/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_visit_ranges_test_app TEST
     SOURCES
     visit_ranges_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_visit_ranges_test_app COMMAND vespalib_visit_ranges_test_app)
diff --git a/vespalog/src/test/log_message/CMakeLists.txt b/vespalog/src/test/log_message/CMakeLists.txt
index 51c888f67f3..a42e7f24bf3 100644
--- a/vespalog/src/test/log_message/CMakeLists.txt
+++ b/vespalog/src/test/log_message/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalog_log_message_test_app TEST
     SOURCES
     log_message_test.cpp
     DEPENDS
     vespalog
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalog_log_message_test_app COMMAND vespalog_log_message_test_app)