diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index f8807299cd..74142e915e 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -667,7 +667,7 @@ if(BUILD_TESTING)
     message(STATUS "Generating test executable ${executable_name}.")
     add_executable(${executable_name} ${test_file})
     target_compile_definitions(${executable_name} PRIVATE BORINGSSL_IMPLEMENTATION)
-    target_link_libraries(${executable_name} test_support_lib boringssl_gtest_main crypto)
+    target_link_libraries(${executable_name} boringssl_gtest_main)
     add_dependencies(${executable_name} boringssl_prefix_symbols)
     target_include_directories(${executable_name} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
     add_dependencies(all_tests ${executable_name})
@@ -780,7 +780,7 @@ if(BUILD_TESTING)
   )
 
   add_dependencies(${CRYPTO_TEST_EXEC} boringssl_prefix_symbols)
-  target_link_libraries(${CRYPTO_TEST_EXEC} test_support_lib boringssl_gtest_main crypto)
+  target_link_libraries(${CRYPTO_TEST_EXEC} boringssl_gtest_main)
   target_include_directories(${CRYPTO_TEST_EXEC} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
   if(MSVC)
     target_link_libraries(${CRYPTO_TEST_EXEC} ws2_32)
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 59e15e2995..3863ae0772 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -69,8 +69,8 @@ if(BUILD_TESTING)
 
     $<TARGET_OBJECTS:crypto_test_data>
   )
-  target_link_libraries(${INTEGRATION_TEST_EXEC} test_support_lib
-          boringssl_gtest_main ssl crypto)
+  target_link_libraries(${INTEGRATION_TEST_EXEC}
+          boringssl_gtest_main ssl )
   target_include_directories(${INTEGRATION_TEST_EXEC} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
   add_dependencies(all_tests ${INTEGRATION_TEST_EXEC})
 
@@ -82,7 +82,7 @@ if(BUILD_TESTING)
     ssl_c_test.c
   )
 
-  target_link_libraries(${SSL_TEST_EXEC} test_support_lib boringssl_gtest_main ssl crypto)
+  target_link_libraries(${SSL_TEST_EXEC} boringssl_gtest_main ssl)
 
   target_include_directories(${SSL_TEST_EXEC} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)