diff --git a/bazel/check_deps/BUILD b/bazel/check_deps/BUILD
index 54280aa07cd7..96d735a4488c 100644
--- a/bazel/check_deps/BUILD
+++ b/bazel/check_deps/BUILD
@@ -15,11 +15,13 @@ filegroup(
     data = [
         "//explorer",
         "//installers/local:carbon",
+        "//language_server",
         "//migrate_cpp:rewriter",
         "//migrate_cpp/cpp_refactoring",
-        "//toolchain/diagnostics:null_diagnostics",
         "//toolchain/driver:carbon",
+        "//utils/treesitter",
     ],
+    tags = ["manual"],
 )
 
 genquery(
diff --git a/bazel/check_deps/check_non_test_cc_deps.py b/bazel/check_deps/check_non_test_cc_deps.py
index 49aa7fa9ac42..a364d777ba71 100644
--- a/bazel/check_deps/check_non_test_cc_deps.py
+++ b/bazel/check_deps/check_non_test_cc_deps.py
@@ -42,7 +42,7 @@ for dep in deps:
 
         # Other packages in the LLVM project shouldn't be accidentally used
         # in Carbon. We can expand the above list if use cases emerge.
-        if package not in ("llvm", "lld", "clang"):
+        if package not in ("llvm", "lld", "clang", "clang-tools-extra/clangd"):
             sys.exit(
                 "ERROR: unexpected dependency into the LLVM project: %s" % dep
             )
diff --git a/common/BUILD b/common/BUILD
index 09dc556c04d3..20e84374bc6b 100644
--- a/common/BUILD
+++ b/common/BUILD
@@ -71,6 +71,7 @@ cc_library(
 
 cc_library(
     name = "enum_base_test_def",
+    testonly = 1,
     textual_hdrs = ["enum_base_test.def"],
 )
 
diff --git a/language_server/BUILD b/language_server/BUILD
index 69e73fdfd515..6e9cf560e140 100644
--- a/language_server/BUILD
+++ b/language_server/BUILD
@@ -5,6 +5,8 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary")
 
 package(default_visibility = [
+    "//bazel/check_deps:__pkg__",
+    "//installers:__subpackages__",
     "//language_server:__subpackages__",
 ])
 
diff --git a/utils/treesitter/BUILD b/utils/treesitter/BUILD
index 61d540f192e0..a0f9e029af48 100644
--- a/utils/treesitter/BUILD
+++ b/utils/treesitter/BUILD
@@ -5,6 +5,11 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test")
 load("@rules_tree_sitter//tree_sitter:tree_sitter.bzl", "tree_sitter_cc_library")
 
+package(default_visibility = [
+    "//bazel/check_deps:__pkg__",
+    "//installers:__subpackages__",
+])
+
 tree_sitter_cc_library(
     name = "treesitter",
     srcs = ["src/scanner.c"],
@@ -13,6 +18,7 @@ tree_sitter_cc_library(
 
 cc_binary(
     name = "test_runner",
+    testonly = 1,
     srcs = ["test_runner.cpp"],
     deps = [
         ":treesitter",