diff --git a/.github/workflows/test_rust.yml b/.github/workflows/test_rust.yml
index b7046731d1..a3d08b9123 100644
--- a/.github/workflows/test_rust.yml
+++ b/.github/workflows/test_rust.yml
@@ -29,7 +29,7 @@ jobs:
           bazel-cache: rust_linux
           bazel: >-
             test --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
-            //rust:protobuf_upb_test //rust:protobuf_cpp_test
+            //rust:all
             //rust/test/rust_proto_library_unit_test:rust_upb_aspect_test
             //src/google/protobuf/compiler/rust/...
       - name: Run Cargo tests
diff --git a/rust/BUILD b/rust/BUILD
index cdd0588a01..5ab307588e 100644
--- a/rust/BUILD
+++ b/rust/BUILD
@@ -130,7 +130,10 @@ rust_library(
     proc_macro_deps = [
         "@crate_index//:paste",
     ],
-    rustc_flags = ["--cfg=cpp_kernel"],
+    rustc_flags = [
+        "--cfg=cpp_kernel",
+        "--cfg=bzl",
+    ],
     deps = [
         ":utf8",
         "//rust/cpp_kernel:cpp_api",