diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 1d416c74d..50f26874e 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -34,8 +34,6 @@ tasks:
     - "//:gazelle_ci"
     test_targets:
     - "..."
-    - "-//internal:bazel_test"
-    - "-//cmd/gazelle:gazelle_test"
   bcr_tests:
     name: BCR test module
     platform: ${{ platform }}
diff --git a/.bazelrc b/.bazelrc
index d9d19951e..a5d95ad3b 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,9 +1,6 @@
 # This file contains options passed to Bazel when running tests.
 # They are used by Travis CI and by non-Bazel test scripts.
 
-# TODO: Make all tests work with Bzlmod.
-common --noenable_bzlmod
-
 common:ci --verbose_failures
 common:ci --sandbox_debug
 common:ci --spawn_strategy=standalone
diff --git a/cmd/gazelle/BUILD.bazel b/cmd/gazelle/BUILD.bazel
index 3a87c0880..bd4103096 100644
--- a/cmd/gazelle/BUILD.bazel
+++ b/cmd/gazelle/BUILD.bazel
@@ -59,7 +59,7 @@ go_test(
         "//internal/wspace",
         "//testtools",
         "@com_github_google_go_cmp//cmp",
-        "@io_bazel_rules_go//go/tools/bazel:go_default_library",
+        "@io_bazel_rules_go//go/tools/bazel",
     ],
 )
 
diff --git a/internal/gazellebinarytest/BUILD.bazel b/internal/gazellebinarytest/BUILD.bazel
index c03a40c04..16fe072ac 100644
--- a/internal/gazellebinarytest/BUILD.bazel
+++ b/internal/gazellebinarytest/BUILD.bazel
@@ -33,7 +33,7 @@ go_test(
     rundir = ".",
     deps = [
         "//testtools",
-        "@io_bazel_rules_go//go/tools/bazel:go_default_library",
+        "@io_bazel_rules_go//go/tools/bazel",
     ],
 )
 
diff --git a/internal/module/BUILD.bazel b/internal/module/BUILD.bazel
index 0adffa699..2446f86c7 100644
--- a/internal/module/BUILD.bazel
+++ b/internal/module/BUILD.bazel
@@ -38,6 +38,6 @@ go_test(
     embed = [":module"],
     deps = [
         "@com_github_google_go_cmp//cmp",
-        "@io_bazel_rules_go//go/runfiles:go_default_library",
+        "@io_bazel_rules_go//go/runfiles",
     ],
 )
diff --git a/language/go/BUILD.bazel b/language/go/BUILD.bazel
index 4e41f68bc..cb3fa2a2b 100644
--- a/language/go/BUILD.bazel
+++ b/language/go/BUILD.bazel
@@ -87,7 +87,7 @@ go_test(
         "//walk",
         "@com_github_bazelbuild_buildtools//build",
         "@com_github_google_go_cmp//cmp",
-        "@io_bazel_rules_go//go/tools/bazel:go_default_library",
+        "@io_bazel_rules_go//go/tools/bazel",
         "@org_golang_x_tools_go_vcs//:vcs",
     ],
 )