diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 9065173d2..f4ef9ee0a 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -47,11 +47,13 @@ tasks:
     environment:
       BAZEL_VC: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\VC"
     build_flags:
+    - "--noincompatible_enable_cc_toolchain_resolution"
     - "--compiler=clang-cl"
     - "--features=layering_check"
     build_targets:
     - "//..."
     test_flags:
+    - "--noincompatible_enable_cc_toolchain_resolution"
     - "--compiler=clang-cl"
     - "--features=layering_check"
     test_targets: