diff --git a/cc_bindings_from_rs/test/golden/golden_test.bzl b/cc_bindings_from_rs/test/golden/golden_test.bzl
index 4342a3729..6532854ce 100644
--- a/cc_bindings_from_rs/test/golden/golden_test.bzl
+++ b/cc_bindings_from_rs/test/golden/golden_test.bzl
@@ -44,6 +44,14 @@ _generate_bindings = rule(
             aspects = [cc_bindings_from_rust_aspect],
             cfg = crubit_flavor_transition,
         ),
+        # Synthetic dependency to ensure even a coarse `bazel query` analysis finds a transitive
+        # dependency from Crubit tool sources to golden test bindings.
+        "_cc_bindings_from_rs_binary": attr.label(
+            default = "//cc_bindings_from_rs",
+            executable = True,
+            allow_single_file = True,
+            cfg = "exec",
+        ),
     },
     implementation = _generate_bindings_impl,
 )
diff --git a/common/golden_update.sh b/common/golden_update.sh
index ba8d7eeb1..62dd6bb93 100755
--- a/common/golden_update.sh
+++ b/common/golden_update.sh
@@ -17,6 +17,5 @@ bazel test \
   --config=llvm-unstable \
   --test_strategy=local \
   --test_env=WRITE_GOLDENS=1 \
-  --cache_test_results=no \
   -k \
   $TESTS_TO_RUN
diff --git a/rs_bindings_from_cc/test/golden/golden_test.bzl b/rs_bindings_from_cc/test/golden/golden_test.bzl
index 9948b2e5d..2a06829c6 100644
--- a/rs_bindings_from_cc/test/golden/golden_test.bzl
+++ b/rs_bindings_from_cc/test/golden/golden_test.bzl
@@ -36,6 +36,14 @@ _generate_bindings = rule(
             aspects = [rust_bindings_from_cc_aspect],
             cfg = crubit_flavor_transition,
         ),
+        # Synthetic dependency to ensure even a coarse `bazel query` analysis finds a transitive
+        # dependency from Crubit tool sources to golden test bindings.
+        "_rs_bindings_from_cc_binary": attr.label(
+            default = "//rs_bindings_from_cc",
+            executable = True,
+            allow_single_file = True,
+            cfg = "exec",
+        ),
     },
     implementation = _generate_bindings_impl,
 )