diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 059e9342d..68a2d1336 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,55 +2,7 @@ set(TEST_EXE testAll)
 set(GTEST_DIR gtest)
 add_subdirectory(${GTEST_DIR})
 
-set(TEST_SRC
-  # helpers
-  main.cpp
-  crypto/mock_crypto.cpp
-  dht/mock_context.cpp
-  test_util.cpp
-  # actual test cases
-  crypto/test_llarp_crypto_types.cpp
-  crypto/test_llarp_crypto.cpp
-  dht/test_llarp_dht_bucket.cpp
-  dht/test_llarp_dht_explorenetworkjob.cpp
-  dht/test_llarp_dht_kademlia.cpp
-  dht/test_llarp_dht_key.cpp
-  dht/test_llarp_dht_node.cpp
-  dht/test_llarp_dht_serviceaddresslookup.cpp
-  dht/test_llarp_dht_taglookup.cpp
-  dht/test_llarp_dht_tx.cpp
-  dht/test_llarp_dht_txowner.cpp
-  dns/test_llarp_dns_dns.cpp
-  exit/test_llarp_exit_context.cpp
-  link/test_llarp_link.cpp
-  net/test_llarp_net_inaddr.cpp
-  net/test_llarp_net.cpp
-  routing/llarp_routing_transfer_traffic.cpp
-  routing/test_llarp_routing_obtainexitmessage.cpp
-  service/test_llarp_service_address.cpp
-  service/test_llarp_service_identity.cpp
-  test_llarp_dns.cpp
-  test_llarp_dnsd.cpp
-  test_llarp_encrypted_frame.cpp
-  test_llarp_router_contact.cpp
-  test_llarp_router.cpp
-  util/test_llarp_util_aligned.cpp
-  util/test_llarp_util_bencode.cpp
-  util/test_llarp_util_bits.cpp
-  util/test_llarp_util_encode.cpp
-  util/test_llarp_util_ini.cpp
-  util/test_llarp_util_queue_manager.cpp
-  util/test_llarp_util_queue.cpp
-  util/test_llarp_util_thread_pool.cpp
-)
-
-add_executable(${TEST_EXE}
-    # helpers
-    main.cpp
-    crypto/mock_crypto.cpp
-    dht/mock_context.cpp
-    test_util.cpp
-    # actual test cases
+list(APPEND TEST_SRC
     crypto/test_llarp_crypto_types.cpp
     crypto/test_llarp_crypto.cpp
     dht/test_llarp_dht_bucket.cpp
@@ -83,7 +35,24 @@ add_executable(${TEST_EXE}
     util/test_llarp_util_ini.cpp
     util/test_llarp_util_queue_manager.cpp
     util/test_llarp_util_queue.cpp
-    util/test_llarp_util_thread_pool.cpp)
+    util/test_llarp_util_thread_pool.cpp
+)
+
+add_executable(${TEST_EXE}
+    # helpers
+    main.cpp
+    crypto/mock_crypto.cpp
+    dht/mock_context.cpp
+    test_util.cpp
+    # actual test cases
+    ${TEST_SRC}
+)
+
+set(GTEST_ROOT ${INSTALL_DIR})
+# This will warn because we have googletest in-source, but this is the only way
+# to import gtest_add_tests.
+find_package(GTest)
+gtest_add_tests(TARGET ${TEST_EXE} SOURCES ${TEST_SRC})
 
 target_link_libraries(${TEST_EXE} PUBLIC gmock gtest ${STATIC_LIB})
 target_include_directories(${TEST_EXE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})