diff --git a/BUILD.bazel b/BUILD.bazel
index 5ab4e114f6..03392c6b48 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -187,6 +187,7 @@ cc_library(
         "//conditions:default": [],
     }),
     deps = [":gtest"],
+    alwayslink = True,
 )
 
 # The following rules build samples of how to use gTest.
diff --git a/googletest/test/BUILD.bazel b/googletest/test/BUILD.bazel
index 9575ae11a4..7561d3c165 100644
--- a/googletest/test/BUILD.bazel
+++ b/googletest/test/BUILD.bazel
@@ -125,7 +125,7 @@ cc_test(
     name = "googletest-listener-test",
     size = "small",
     srcs = ["googletest-listener-test.cc"],
-    deps = ["//:gtest_main"],
+    deps = ["//:gtest"],
 )
 
 cc_test(
@@ -358,7 +358,7 @@ cc_test(
     name = "gtest_skip_in_environment_setup_test",
     size = "small",
     srcs = ["gtest_skip_in_environment_setup_test.cc"],
-    deps = ["//:gtest_main"],
+    deps = ["//:gtest"],
 )
 
 py_test(
@@ -417,7 +417,7 @@ cc_binary(
     name = "googletest-catch-exceptions-no-ex-test_",
     testonly = 1,
     srcs = ["googletest-catch-exceptions-test_.cc"],
-    deps = ["//:gtest_main"],
+    deps = ["//:gtest"],
 )
 
 cc_binary(
@@ -425,7 +425,7 @@ cc_binary(
     testonly = 1,
     srcs = ["googletest-catch-exceptions-test_.cc"],
     copts = ["-fexceptions"],
-    deps = ["//:gtest_main"],
+    deps = ["//:gtest"],
 )
 
 py_test(