diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
index 18ac73f9..7e3d1655 100644
--- a/.bcr/presubmit.yml
+++ b/.bcr/presubmit.yml
@@ -4,12 +4,12 @@ matrix:
   - debian10
   - ubuntu2004
   - macos
-  - windows
   bazel:
   - 7.x
   - 8.x
+
 tasks:
-  build:
+  unix_build:
     platform: ${{ platform }}
     bazel: ${{ bazel }}
     build_flags:
@@ -17,6 +17,14 @@ tasks:
     build_targets:
     - '@re2//:re2'
     - '@re2//python:re2'
+  windows_build:
+    platform: windows
+    bazel: ${{ bazel }}
+    build_flags:
+    - '--cxxopt=/std:c++17'
+    build_targets:
+    - '@re2//:re2'
+    - '@re2//python:re2'
 
 bcr_test_module:
   module_path: '.'
@@ -31,7 +39,7 @@ bcr_test_module:
     - 7.x
     - 8.x
   tasks:
-    test:
+    unix_test:
       platform: ${{ platform }}
       bazel: ${{ bazel }}
       test_flags:
@@ -45,3 +53,17 @@ bcr_test_module:
       - '-//:exhaustive_test'
       - '-//:random_test'
       - '//python:all'
+    windows_test:
+      platform: windows
+      bazel: ${{ bazel }}
+      test_flags:
+      - '--cxxopt=/std:c++17'
+      test_targets:
+      - '//:all'
+      - '-//:dfa_test'
+      - '-//:exhaustive1_test'
+      - '-//:exhaustive2_test'
+      - '-//:exhaustive3_test'
+      - '-//:exhaustive_test'
+      - '-//:random_test'
+      - '//python:all'