diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
index 4bdd611..74c744a 100644
--- a/.bcr/presubmit.yml
+++ b/.bcr/presubmit.yml
@@ -2,7 +2,7 @@
   module_path: examples
   matrix:
     platform: ["debian10", "macos", "ubuntu2004", "windows"]
-    bazel: [7.x]
+    bazel: [7.x, 8.x]
 
   tasks:
     verify_targets:
diff --git a/WORKSPACE b/WORKSPACE
index 9587fb5..bfae406 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -97,10 +97,12 @@
 
 apple_support_dependencies()
 
-load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies")
+load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
 
 rules_cc_dependencies()
 
+rules_cc_toolchains()
+
 # For `kt_jvm_library`
 load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
 
diff --git a/build_defs/BUILD.bazel b/build_defs/BUILD.bazel
index 87f0b84..128c557 100644
--- a/build_defs/BUILD.bazel
+++ b/build_defs/BUILD.bazel
@@ -28,7 +28,6 @@
     constraint_values = [
         "@platforms//cpu:x86_64",
         "@platforms//os:windows",
-        "@bazel_tools//tools/cpp:clang-cl",
         # This is necessary for Bazel 7 compatibility with a MODULE.bazel file that still works in
         # Bazel 8.  Using cc_configure_extension from rules_cc produces a @local_config_cc
         # repository that's not compatible with @bazel_tools//tools/cpp:clang-cl from before
@@ -42,7 +41,6 @@
     constraint_values = [
         "@platforms//cpu:x86_64",
         "@platforms//os:windows",
-        "@bazel_tools//tools/cpp:msvc",
         # This may be necessary in case cc_configure_extension from rules_cc produces a
         # @local_config_cc repository that's not compatible with @bazel_tools//tools/cpp:msvc from
         # before Bazel 8, as with clang-cl above, to avoid silently falling back to clang-cl.