diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index 67f4a9a..b81982d 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -37,9 +37,6 @@
       - "//tools/compliance/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
       # These tests are not compatible with the gcov version of CentOS 7.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
       - "-//src/test/shell/bazel:bazel_coverage_cc_released_test_gcc"
@@ -99,7 +96,6 @@
       - "//tools/python/..."
       - "//tools/bash/..."
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/import_deps_checker/..."
     include_json_profile:
       - build
       - test
@@ -158,8 +154,6 @@
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/import_deps_checker/..."
     include_json_profile:
       - build
       - test
@@ -194,13 +188,6 @@
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
-      # C++ coverage is not supported on macOS yet.
-      - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
-      # MacOS does not have cgroups so it can't support hardened sandbox
-      - "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
       # https://github.com/bazelbuild/bazel/issues/16526
       - "-//src/test/shell/bazel:starlark_repository_test"
       # https://github.com/bazelbuild/bazel/issues/17407
@@ -209,10 +196,6 @@
       - "-//src/test/shell/bazel/apple:bazel_objc_test"
       # https://github.com/bazelbuild/bazel/issues/17410
       - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
-      # https://github.com/bazelbuild/bazel/issues/17411
-      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
-      # https://github.com/bazelbuild/bazel/issues/17447
-      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
       # https://github.com/bazelbuild/bazel/issues/17456
       - "-//src/test/shell/bazel:bazel_determinism_test"
       # https://github.com/bazelbuild/bazel/issues/17457
@@ -222,12 +205,6 @@
       - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
       - "-//src/test/shell/bazel/android:aapt_integration_test"
       - "-//src/test/shell/bazel/android:aapt_integration_test_with_head_android_tools"
-      # Disable recently regressed tests: https://github.com/bazelbuild/bazel/issues/20437
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CppSysrootTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcImportConfiguredTargetTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:BazelJ2ObjcLibraryTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcToolchainTest"
     include_json_profile:
       - build
       - test
@@ -261,43 +238,12 @@
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
-      # C++ coverage is not supported on macOS yet.
-      - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
-      # MacOS does not have cgroups so it can't support hardened sandbox
-      - "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
-      # https://github.com/bazelbuild/bazel/issues/16525
-      - "-//src/test/java/com/google/devtools/build/lib/buildtool:KeepGoingTest"
-      - "-//src/test/java/com/google/devtools/build/lib/buildtool:DanglingSymlinkTest"
-      - "-//src/test/java/com/google/devtools/build/lib/buildtool:CompileOneDependencyIntegrationTest"
-      - "-//src/test/java/com/google/devtools/build/lib/buildtool:SkymeldBuildIntegrationTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:BazelJ2ObjcLibraryTest"
-      - "-//src/test/java/com/google/devtools/build/lib/skyframe/rewinding:RewindingTest"
-      - "-//src/test/java/com/google/devtools/build/lib/buildtool:MiscAnalysisTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests"
-      # https://github.com/bazelbuild/bazel/issues/17007
+      # https://github.com/bazelbuild/bazel/issues/17410
       - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
       # https://github.com/bazelbuild/bazel/issues/16521 & https://github.com/bazelbuild/bazel/issues/18776
       - "-//src/test/shell/bazel/android/..."
       - "-//src/tools/android/java/com/google/devtools/build/android/..."
       - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
-      # Macs can't find python, so these fail: https://github.com/bazelbuild/bazel/issues/18776
-      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test"
-      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
-      - "-//src/test/shell/bazel/android:aapt_integration_test"
-      - "-//src/test/shell/bazel/android:aapt_integration_test_with_head_android_tools"
-      # Disable recently regressed tests: https://github.com/bazelbuild/bazel/issues/20437
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CppSysrootTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcImportConfiguredTargetTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:BazelJ2ObjcLibraryTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcToolchainTest"
-      # https://github.com/bazelbuild/bazel/issues/17411
-      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
-      # https://github.com/bazelbuild/bazel/issues/17447
-      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
     include_json_profile:
       - build
       - test
@@ -414,9 +360,6 @@
       - "-//src/test/shell/bazel:bazel_repository_cache_test"
       - "-//src/test/shell/integration:java_integration_test"
       - "-//src/test/java/com/google/devtools/build/lib/sandbox/..."
-      # See https://github.com/bazelbuild/bazel/issues/8162 (also disabled for local exec)
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
       # We hit connection timeout error when downloading multiple URLs on RBE, see b/217865760
       - "-//src/test/py/bazel:bazel_module_test"
       - "-//src/test/py/bazel:bazel_lockfile_test"
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index c474d1c..330bada 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -38,9 +38,6 @@
       - "//tools/compliance/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
       # These tests are not compatible with the gcov version of CentOS 7.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
       - "-//src/test/shell/bazel:bazel_coverage_cc_released_test_gcc"
@@ -100,8 +97,6 @@
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/import_deps_checker/..."
     include_json_profile:
       - build
       - test
@@ -161,8 +156,6 @@
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/import_deps_checker/..."
     include_json_profile:
       - build
       - test
@@ -198,13 +191,6 @@
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
-      # C++ coverage is not supported on macOS yet.
-      - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
-      # MacOS does not have cgroups so it can't support hardened sandbox
-      - "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
       # https://github.com/bazelbuild/bazel/issues/16526
       - "-//src/test/shell/bazel:starlark_repository_test"
       # https://github.com/bazelbuild/bazel/issues/17407
@@ -214,10 +200,6 @@
       # https://github.com/bazelbuild/bazel/issues/17410
       - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
       # https://github.com/bazelbuild/bazel/issues/17411
-      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
-      # https://github.com/bazelbuild/bazel/issues/17447
-      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
-      # https://github.com/bazelbuild/bazel/issues/17456
       - "-//src/test/shell/bazel:bazel_determinism_test"
       # https://github.com/bazelbuild/bazel/issues/17457
       - "-//src/test/shell/bazel:jdeps_test"
@@ -226,12 +208,60 @@
       - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
       - "-//src/test/shell/bazel/android:aapt_integration_test"
       - "-//src/test/shell/bazel/android:aapt_integration_test_with_head_android_tools"
-      # Disable recently regressed tests: https://github.com/bazelbuild/bazel/issues/20437
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CppSysrootTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcImportConfiguredTargetTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:BazelJ2ObjcLibraryTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcToolchainTest"
+      # Disable the top 50 most time-consuming tests on macOS Intel platform in presubmit.
+      # Those tests are still covered in postsubmit and by macOS arm64 platform in presubmit.
+      # To run any of the following test in presubmit, just comment out the corresponding line.
+      # TODO(pcloudy): Disable the android tests after enabling them on Apple Silicon platform.
+      - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test"
+      - "-//src/test/shell/bazel:bazel_bootstrap_distfile_tar_test"
+      # - "-//src/test/shell/bazel/android:android_integration_test"
+      # - "-//src/test/shell/bazel/android:android_integration_test_with_head_android_tools"
+      - "-//src/test/shell/bazel:bazel_proto_library_test"
+      - "-//src/test/py/bazel:runfiles_test"
+      - "-//src/test/shell/integration:loading_phase_tests"
+      - "-//src/test/py/bazel:bazel_module_test"
+      - "-//src/test/shell/integration:target_compatible_with_test"
+      - "-//src/test/shell/integration:bazel_json_worker_test"
+      - "-//src/test/shell/bazel:bazel_coverage_java_jdk17_toolchain_head_test"
+      - "-//src/test/shell/bazel:bazel_java_test_jdk11_toolchain_head"
+      # - "-//src/test/shell/bazel/android:aar_integration_test"
+      - "-//src/test/shell/bazel:bazel_coverage_java_test"
+      - "-//src/test/shell/bazel:bazel_coverage_java_jdk11_toolchain_head_test"
+      - "-//src/test/shell/bazel:bazel_java_test_jdk17_toolchain_head"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"
+      - "-//src/test/shell/integration:build_event_stream_test"
+      - "-//third_party/ijar/test:zip_test"
+      - "-//src/test/java/com/google/devtools/build/lib/rules/java:JavaStarlarkApiTest"
+      - "-//src/test/shell/bazel:bazel_java_tools_test"
+      - "-//src/test/shell/bazel/remote:build_without_the_bytes_test"
+      - "-//src/test/shell/integration:bazel_sandboxed_worker_test"
+      - "-//src/test/shell/integration:client_test"
+      - "-//src/test/shell/bazel/remote:remote_execution_test"
+      - "-//src/test/shell/bazel:bazel_coverage_java_jdk17_toolchain_released_test"
+      - "-//src/test/py/bazel:bazel_vendor_test"
+      - "-//src/test/shell/integration:sandboxing_test"
+      - "-//src/test/shell/bazel:bazel_java_test"
+      - "-//src/test/py/bazel:bzlmod_query_test"
+      # - "-//src/test/shell/bazel/android:desugarer_integration_test"
+      # - "-//src/test/shell/bazel/android:android_local_test_integration_test"
+      # - "-//src/test/shell/bazel/android:desugarer_integration_test_with_head_android_tools"
+      - "-//src/test/py/bazel:bazel_external_repository_test"
+      # - "-//src/test/shell/bazel/android:resource_processing_integration_test"
+      - "-//src/test/shell/bazel:bazel_coverage_java_jdk11_toolchain_released_test"
+      # - "-//src/test/shell/bazel/android:aar_integration_test_with_head_android_tools"
+      # - "-//src/test/shell/bazel/android:android_local_test_integration_test_with_head_android_tools"
+      - "-//src/tools/singlejar:zip64_test"
+      - "-//src/test/py/bazel:launcher_test"
+      - "-//src/test/shell/integration:bazel_worker_test"
+      - "-//src/test/py/bazel:py_test"
+      - "-//src/test/shell/bazel:bazel_test_test"
+      - "-//src/test/py/bazel:bazel_overrides_test"
+      - "-//src/test/shell/bazel:path_mapping_test"
+      - "-//src/test/shell/integration:toolchain_test"
+      - "-//src/test/shell/integration:execution_phase_tests"
+      # - "-//src/test/shell/bazel/android:resource_processing_integration_test_with_head_android_tools"
+      - "-//src/test/shell/integration:aquery_test"
+      - "-//src/test/py/bazel:mod_command_test"
     include_json_profile:
       - build
       - test
@@ -266,97 +296,12 @@
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
-      # C++ coverage is not supported on macOS yet.
-      - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
-      # MacOS does not have cgroups so it can't support hardened sandbox
-      - "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
-      # https://github.com/bazelbuild/bazel/issues/16525
-      - "-//src/test/java/com/google/devtools/build/lib/buildtool:KeepGoingTest"
-      - "-//src/test/java/com/google/devtools/build/lib/buildtool:DanglingSymlinkTest"
-      - "-//src/test/java/com/google/devtools/build/lib/buildtool:CompileOneDependencyIntegrationTest"
-      - "-//src/test/java/com/google/devtools/build/lib/buildtool:SkymeldBuildIntegrationTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:BazelJ2ObjcLibraryTest"
-      - "-//src/test/java/com/google/devtools/build/lib/skyframe/rewinding:RewindingTest"
-      - "-//src/test/java/com/google/devtools/build/lib/buildtool:MiscAnalysisTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests"
-      # https://github.com/bazelbuild/bazel/issues/17007
+      # https://github.com/bazelbuild/bazel/issues/17410
       - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
-      # Disable the most time-consuming tests on macOS arm64 platform in presubmit.
-      # To run any of the following test in presubmit, just comment out the corresponding line.
-      # TODO(pcloudy): Re-enable when Apple Silicon machine waiting time is no longer the major
-      # bottleneck for presubmit.
-      - "-//src/test/shell/bazel:bazel_determinism_test"
-      - "-//src/test/shell/bazel:jdeps_test"
-      - "-//src/test/shell/bazel:starlark_git_repository_test"
-      - "-//src/test/shell/bazel:bazel_bootstrap_distfile_tar_test"
-      - "-//src/test/shell/integration:bazel_json_worker_test"
-      - "-//src/test/py/bazel:runfiles_test"
-      - "-//src/test/py/bazel:launcher_test"
-      - "-//src/test/py/bazel:bazel_module_test"
-      - "-//src/test/shell/bazel:bazel_java_test_jdk11_toolchain_head"
-      - "-//src/test/shell/integration:target_compatible_with_test"
-      - "-//src/test/py/bazel:py_test"
-      - "-//src/test/py/bazel:bzlmod_query_test"
-      - "-//src/test/py/bazel:cc_import_test"
-      - "-//src/test/shell/bazel/remote:build_without_the_bytes_test"
-      - "-//src/test/shell/bazel:bazel_coverage_java_test"
-      - "-//src/test/py/bazel:bazel_yanked_versions_test"
-      - "-//src/test/shell/bazel:bazel_coverage_java_jdk17_toolchain_head_test"
-      - "-//src/test/shell/bazel:bazel_proto_library_test"
-      - "-//src/test/shell/bazel:bazel_java_tools_test"
-      - "-//src/test/shell/integration:build_event_stream_test"
-      - "-//src/test/py/bazel:bazel_overrides_test"
-      - "-//src/test/shell/bazel:cc_integration_test"
-      - "-//src/test/shell/bazel:bazel_java_test"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/config:ConfigRulesTests"
-      - "-//src/test/shell/bazel:bazel_java_test_jdk17_toolchain_head"
-      - "-//src/test/shell/integration:bazel_worker_test"
-      - "-//src/test/shell/bazel:tags_propagation_native_test"
-      - "-//src/test/shell/bazel:bazel_coverage_java_jdk11_toolchain_head_test"
-      - "-//src/test/shell/integration:bazel_sandboxed_worker_test"
-      - "-//src/test/py/bazel:bazel_repo_mapping_test"
-      - "-//src/test/shell/bazel:bazel_coverage_java_jdk11_toolchain_released_test"
-      - "-//src/test/py/bazel:bazel_workspace_test"
-      - "-//src/test/shell/bazel:execroot_test"
-      - "-//src/test/shell/bazel:starlark_repository_test"
-      - "-//src/test/shell/bazel:bazel_coverage_java_jdk17_toolchain_released_test"
-      - "-//src/test/shell/bazel/remote:remote_execution_test"
-      - "-//src/test/shell/integration:toolchain_test"
-      - "-//src/test/shell/bazel:bazel_test_test"
-      - "-//src/test/shell/integration:test_test"
-      - "-//src/test/shell/bazel:bazel_execlog_test"
-      - "-//src/test/shell/integration:modify_execution_info_test"
-      - "-//src/test/shell/bazel:external_integration_test"
-      - "-//src/test/py/bazel:bazel_external_repository_test"
-      - "-//src/test/shell/bazel:bazel_workspaces_test"
-      - "-//src/test/shell/integration:client_test"
-      - "-//src/test/shell/bazel:workspace_resolved_test"
-      - "-//src/test/shell/bazel:bazel_repository_cache_test"
-      - "-//src/test/shell/integration:aquery_test"
-      - "-//src/test/shell/integration:py_args_escaping_test"
       # https://github.com/bazelbuild/bazel/issues/16521 & https://github.com/bazelbuild/bazel/issues/18776
       - "-//src/test/shell/bazel/android/..."
       - "-//src/tools/android/java/com/google/devtools/build/android/..."
       - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
-      # Macs can't find python, so these fail: https://github.com/bazelbuild/bazel/issues/18776
-      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test"
-      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
-      - "-//src/test/shell/bazel/android:aapt_integration_test"
-      - "-//src/test/shell/bazel/android:aapt_integration_test_with_head_android_tools"
-      # Disable recently regressed tests: https://github.com/bazelbuild/bazel/issues/20437
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CppSysrootTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcImportConfiguredTargetTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:BazelJ2ObjcLibraryTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcToolchainTest"
-      - "-//src/test/shell/integration:minimal_jdk_test"
-      # https://github.com/bazelbuild/bazel/issues/17411
-      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
-      # https://github.com/bazelbuild/bazel/issues/17447
-      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
     include_json_profile:
       - build
       - test
@@ -476,9 +421,6 @@
       - "-//src/test/shell/bazel:bazel_repository_cache_test"
       - "-//src/test/shell/integration:java_integration_test"
       - "-//src/test/java/com/google/devtools/build/lib/sandbox/..."
-      # See https://github.com/bazelbuild/bazel/issues/8162 (also disabled for local exec)
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
       # We hit connection timeout error when downloading multiple URLs on RBE, see b/217865760
       - "-//src/test/py/bazel:bazel_module_test"
       - "-//src/test/py/bazel:bazel_lockfile_test"
diff --git a/.bazelrc b/.bazelrc
index 45cd93d..ca3c9c7 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -95,6 +95,7 @@
 test:ci-macos --test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80
 test:ci-macos --sandbox_writable_path=/Users/buildkite/bazeltest
 test:ci-macos --sandbox_default_allow_network=false
+test:ci-macos --test_tag_filters=-no_macos
 
 ## For Windows
 common:ci-windows --config=ci-common
diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/BUILD b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/BUILD
index 6ef72da..4bc9dce 100644
--- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/BUILD
+++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/BUILD
@@ -61,10 +61,10 @@
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_LibraryInterface",
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_LibraryModuleInfo",
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_Library_no_members",
-        "@local_jdk//:jre/lib/rt.jar",
+        "@bazel_tools//tools/jdk:platformclasspath",
     ],
     jvm_flags = [
-        "-Dclasscache.test.bootclasspath=$(location @local_jdk//:jre/lib/rt.jar)",
+        "-Dclasscache.test.bootclasspath=$(location @bazel_tools//tools/jdk:platformclasspath)",
         "-Dclasscache.test.Client=$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_client)",
         "-Dclasscache.test.Library=$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_Library)",
         "-Dclasscache.test.Library_no_members=$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_Library_no_members)",
@@ -96,10 +96,10 @@
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_LibraryInterface",
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_LibraryModuleInfo",
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_Library_no_members",
-        "@local_jdk//:jre/lib/rt.jar",
+        "@bazel_tools//tools/jdk:platformclasspath",
     ],
     jvm_flags = [
-        "-Dclasscache.test.bootclasspath=$(location @local_jdk//:jre/lib/rt.jar)",
+        "-Dclasscache.test.bootclasspath=$(location @bazel_tools//tools/jdk:platformclasspath)",
         "-Dclasscache.test.Client=$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_client)",
         "-Dclasscache.test.Library=$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_Library)",
         "-Dclasscache.test.Library_no_members=$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_Library_no_members)",
@@ -115,7 +115,6 @@
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
-        "@local_jdk//:jre/lib/rt.jar",
     ],
 )
 
@@ -129,7 +128,7 @@
     has_bootclasspath = False,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = None,
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -143,7 +142,7 @@
     has_bootclasspath = False,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = None,
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -151,12 +150,12 @@
     name = "silent_on_bootclasspath_missing_golden_test",
     checking_mode = "silence",
     expect_errors = False,
-    golden_output_file = "golden_complete_classpath.txt",
+    golden_output_file = "golden_silent_on_bootclasspath_missing_golden_test.txt",
     golden_stderr_file = "golden_complete_classpath.stderr.txt",
     has_bootclasspath = False,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = None,
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -169,7 +168,7 @@
     has_bootclasspath = True,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = "testdata_lib_LibraryException",
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -182,7 +181,7 @@
     has_bootclasspath = True,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = "testdata_lib_LibraryAnnotations",
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -195,7 +194,7 @@
     has_bootclasspath = True,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = "testdata_lib_Library",
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -209,7 +208,7 @@
     has_bootclasspath = True,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = "testdata_lib_LibraryInterface",
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -224,7 +223,7 @@
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = "testdata_lib_Library",
     replacing_jar = "testdata_lib_Library_no_members",
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -239,7 +238,7 @@
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = "testdata_lib_Library",
     replacing_jar = "testdata_lib_Library_no_members",
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -247,13 +246,13 @@
     name = "complete_classpath_golden_test",
     checking_mode = "error",
     expect_errors = False,
-    golden_output_file = "golden_silent_on_bootclasspath_missing_golden_test.txt",
+    golden_output_file = "golden_complete_classpath.txt",
     golden_stderr_file = "golden_complete_classpath.stderr.txt",
     has_bootclasspath = True,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = None,
     replacing_jar = None,
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -306,12 +305,12 @@
     args = [
         "$(location golden_invoke_polymorphic_test.txt)",
         "$(location golden_invoke_polymorphic_test.stderr.txt)",
-        "199",
+        "0",
         "$(location :DumpProto)",
         "$(location //src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker)",
         "--checking_mode=error",
         "--bootclasspath_entry",
-        "$(location @local_jdk//:jre/lib/rt.jar)",
+        "$(location @bazel_tools//tools/jdk:platformclasspath)",
         "--input",
         "$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:libInvokePolymorphic.jar)",
     ],
@@ -322,7 +321,7 @@
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps:golden_invoke_polymorphic_test.stderr.txt",
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps:golden_invoke_polymorphic_test.txt",
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:libInvokePolymorphic.jar",
-        "@local_jdk//:jre/lib/rt.jar",
+        "@bazel_tools//tools/jdk:platformclasspath",
     ],
 )
 
diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_test.sh b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_test.sh
index c4c33ca..2d87eeb 100755
--- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_test.sh
+++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_test.sh
@@ -54,7 +54,8 @@
   exit 1 # Exit with an error.
 fi
 
-diff "${gold_output_file}" <($PRINT_JDEPS_PROTO "${output_file}")
+# Correct for different paths between Blaze and Bazel.
+diff <(sed 's|third_party/bazel/||g' "${gold_output_file}") <($PRINT_JDEPS_PROTO "${output_file}" | sed 's|third_party/bazel/||g')
 gold_output_ret=$?
 
 if [[ "${gold_output_ret}" != 0 ]] ; then
@@ -71,7 +72,8 @@
   exit 1
 fi
 
-diff "${gold_stderr_file}" "${checker_stderr}"
+# Correct for different paths between Blaze and Bazel.
+diff <(sed 's|third_party/bazel/||g' "${gold_stderr_file}") <(sed 's|third_party/bazel/||g' "${checker_stderr}")
 gold_stderr_ret=$?
 
 if [[ "${gold_stderr_ret}" != 0 ]]; then
diff --git a/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/GitRepositoryBlackBoxTest.java b/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/GitRepositoryBlackBoxTest.java
index b3d7916..aeeca76 100644
--- a/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/GitRepositoryBlackBoxTest.java
+++ b/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/GitRepositoryBlackBoxTest.java
@@ -40,7 +40,7 @@
  * <p>1. We are creating some git repository with the preset contents, which will be used for
  * fetching contents for the test. We plan to fetch contents specifying either commit hash, tag, or
  * branch. For all test variants, we are creating the same repository, as the same HEAD commit is
- * marked with a tag, and can be addressed with commit hash, master branch, and tag name.
+ * marked with a tag, and can be addressed with commit hash, main branch, and tag name.
  *
  * <p>2. The contents of the git repository working tree is generated by {@link
  * RepoWithRuleWritingTextGenerator}. We pass some certain text to that generator; that exact text
@@ -123,7 +123,7 @@
    * general approach description in the class javadoc comment.
    */
   @Test
-  public void testCloneAtMaster() throws Exception {
+  public void testCloneAtMain() throws Exception {
     Path repo = context().getTmpDir().resolve("ext_repo");
     setupGitRepository(context(), repo);
 
@@ -138,7 +138,7 @@
             "new_git_repository(",
             "  name='ext',",
             String.format("  remote='%s',", PathUtils.pathToFileURI(repo.resolve(".git"))),
-            "  branch='master',",
+            "  branch='main',",
             String.format("  build_file_content=\"\"\"%s\"\"\",", buildFileContent),
             ")");
 
@@ -158,7 +158,7 @@
     Path repo = context().getTmpDir().resolve("branch_repo");
     GitRepositoryHelper gitRepository = initGitRepository(context(), repo);
 
-    context().write(repo.resolve("master.marker").toString());
+    context().write(repo.resolve("main.marker").toString());
     gitRepository.addAll();
     gitRepository.commit("Initial commit");
 
@@ -171,10 +171,10 @@
     gitRepository.commit("Commit in branch");
     String branchCommitHash = gitRepository.getHead();
 
-    gitRepository.checkout("master");
+    gitRepository.checkout("main");
     generator.withOutputText(HELLO_FROM_EXTERNAL_REPOSITORY).setupRepository();
     gitRepository.addAll();
-    gitRepository.commit("Commit in master");
+    gitRepository.commit("Commit in main");
 
     context()
         .write(
@@ -203,7 +203,7 @@
     Path repo = context().getTmpDir().resolve("tag_repo");
     GitRepositoryHelper gitRepository = initGitRepository(context(), repo);
 
-    context().write(repo.resolve("master.marker").toString());
+    context().write(repo.resolve("main.marker").toString());
     gitRepository.addAll();
     gitRepository.commit("Initial commit");
 
@@ -217,14 +217,14 @@
     gitRepository.tag("tag1");
     String tagCommitHash = gitRepository.getHead();
 
-    gitRepository.checkout("master");
+    gitRepository.checkout("main");
 
     // delete branch, so that the last commit is not an any branch.
     gitRepository.deleteBranch("demonstrate_branch");
 
     generator.withOutputText(HELLO_FROM_EXTERNAL_REPOSITORY).setupRepository();
     gitRepository.addAll();
-    gitRepository.commit("Commit in master");
+    gitRepository.commit("Commit in main");
 
     context()
         .write(
diff --git a/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/GitRepositoryHelper.java b/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/GitRepositoryHelper.java
index 4574fe7..ff2dd2e 100644
--- a/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/GitRepositoryHelper.java
+++ b/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/GitRepositoryHelper.java
@@ -48,6 +48,8 @@
     runGit("init");
     runGit("config", "user.email", "me@example.com");
     runGit("config", "user.name", "E X Ample");
+    runGit("commit", "--allow-empty", "-m", "Initial commit");
+    runGit("branch", "-M", "main");
   }
 
   /**
diff --git a/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/PatchApiBlackBoxTest.java b/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/PatchApiBlackBoxTest.java
index c2e5c9f..933648c 100644
--- a/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/PatchApiBlackBoxTest.java
+++ b/src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace/PatchApiBlackBoxTest.java
@@ -113,7 +113,7 @@
             "index 1f4c41e..9d548ff 100644",
             "--- a/foo.sh",
             "+++ b/foo.sh",
-            "@@ -1,3 +1,3 @@",
+            "@@ -1,4 +1,4 @@",
             " #!/usr/bin/env sh",
             "",
             "-echo Here be dragons...",
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/Crosstool.java b/src/test/java/com/google/devtools/build/lib/packages/util/Crosstool.java
index 841d0f0..5bf080d 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/Crosstool.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/Crosstool.java
@@ -301,12 +301,24 @@
 
     public String getToolchainTargetConstraints() {
       ImmutableList<String> constraints = this.toolchainTargetConstraints;
-      if (constraints.isEmpty() && getTargetCpu().equals("k8")) {
-        // Use default constraints
-        constraints =
-            ImmutableList.of(
-                TestConstants.CONSTRAINTS_PACKAGE_ROOT + "cpu:x86_64",
-                TestConstants.CONSTRAINTS_PACKAGE_ROOT + "os:linux");
+      if (constraints.isEmpty()) {
+        if (getTargetCpu().equals("k8")) {
+          // Use default constraints
+          constraints =
+              ImmutableList.of(
+                  TestConstants.CONSTRAINTS_PACKAGE_ROOT + "cpu:x86_64",
+                  TestConstants.CONSTRAINTS_PACKAGE_ROOT + "os:linux");
+        } else if (getTargetCpu().equals("darwin_x86_64")) {
+          constraints =
+              ImmutableList.of(
+                  TestConstants.CONSTRAINTS_PACKAGE_ROOT + "cpu:x86_64",
+                  TestConstants.CONSTRAINTS_PACKAGE_ROOT + "os:macos");
+        } else if (getTargetCpu().equals("darwin_arm64")) {
+          constraints =
+              ImmutableList.of(
+                  TestConstants.CONSTRAINTS_PACKAGE_ROOT + "cpu:arm64",
+                  TestConstants.CONSTRAINTS_PACKAGE_ROOT + "os:macos");
+        }
       }
       return formatConstraints("target", constraints);
     }
@@ -727,15 +739,14 @@
           "    toolchain_type = '" + TestConstants.TOOLS_REPOSITORY + "//tools/cpp:toolchain_type'",
           ")");
       crosstoolBuild.add(toolchainConfig.getCcToolchainConfigRule());
-      // Add the newly-created toolchain to the WORKSPACE.
-      config.append(
-          "WORKSPACE",
-          "register_toolchains('//" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL_DIR + ":all')");
     }
 
     config.overwrite(
         MockObjcSupport.DEFAULT_OSX_CROSSTOOL_DIR + "/BUILD",
         Joiner.on("\n").join(crosstoolBuild.build()));
+    config.append(
+        "WORKSPACE",
+        "register_toolchains('//" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL_DIR + ":all')");
     config.overwrite(crosstoolTop + "/cc_toolchain_config.bzl", ccToolchainConfigFileContents);
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
index 15459e8..18e7e91 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
@@ -175,12 +175,12 @@
         "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
-        "//src/main/java/com/google/devtools/build/lib/util:os",
         "//src/main/java/com/google/devtools/build/lib/vfs",
         "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
         "//src/test/java/com/google/devtools/build/lib/actions/util",
         "//src/test/java/com/google/devtools/build/lib/analysis/util",
         "//src/test/java/com/google/devtools/build/lib/packages:testutil",
+        "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
index cc9983c..9d811b5 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
@@ -37,6 +37,7 @@
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.packages.util.Crosstool.CcToolchainConfig;
 import com.google.devtools.build.lib.packages.util.MockCcSupport;
+import com.google.devtools.build.lib.testutil.TestConstants;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.ModifiedFileSet;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -710,7 +711,17 @@
   @Test
   public void testCcLibraryWithDashStaticOnDarwin() throws Exception {
     getAnalysisMock().ccSupport().setupCcToolchainConfigForCpu(mockToolsConfig, "darwin_x86_64");
-    useConfiguration("--cpu=darwin_x86_64");
+    mockToolsConfig.create(
+        "platforms/BUILD",
+        "platform(",
+        "  name = 'darwin_x86_64',",
+        "  constraint_values = [",
+        "    '" + TestConstants.CONSTRAINTS_PACKAGE_ROOT + "os:macos',",
+        "    '" + TestConstants.CONSTRAINTS_PACKAGE_ROOT + "cpu:x86_64',",
+        "  ],",
+        ")");
+    useConfiguration("--cpu=darwin_x86_64", "--platforms=//platforms:darwin_x86_64");
+
     checkError(
         "badlib",
         "lib_with_dash_static",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/PyTestConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/python/PyTestConfiguredTargetTest.java
index bb277f0..f7e32a8 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/python/PyTestConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/python/PyTestConfiguredTargetTest.java
@@ -36,14 +36,15 @@
     // The default mock environment doesn't have platform_mappings (which map --cpu to a platform),
     // nor does it have Apple platforms defined, so we have to set one up ourselves.
     mockToolsConfig.create(
-        "mockplatforms/BUILD",
+        "platforms/BUILD",
         "platform(",
-        "    name='macos',",
-        String.format(
-            "    constraint_values=['%sos:macos'],", TestConstants.CONSTRAINTS_PACKAGE_ROOT),
-        ")",
-        "");
-    useConfiguration("--cpu=darwin_x86_64", "--platforms=//mockplatforms:macos");
+        "  name = 'darwin_x86_64',",
+        "  constraint_values = [",
+        "    '" + TestConstants.CONSTRAINTS_PACKAGE_ROOT + "os:macos',",
+        "    '" + TestConstants.CONSTRAINTS_PACKAGE_ROOT + "cpu:x86_64',",
+        "  ],",
+        ")");
+    useConfiguration("--cpu=darwin_x86_64", "--platforms=//platforms:darwin_x86_64");
     scratch.file(
         "pkg/BUILD", //
         "py_test(",
diff --git a/src/test/java/com/google/devtools/build/lib/sandbox/BUILD b/src/test/java/com/google/devtools/build/lib/sandbox/BUILD
index 671997d..a48bb17 100644
--- a/src/test/java/com/google/devtools/build/lib/sandbox/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/sandbox/BUILD
@@ -134,7 +134,11 @@
     name = "CgroupsInfoTest",
     size = "small",
     srcs = ["CgroupsInfoTest.java"],
-    tags = ["no_windows"],
+    tags = [
+        # MacOS does not have cgroups so it can't support hardened sandbox
+        "no_macos",
+        "no_windows",
+    ],
     deps = [
         "//src/main/java/com/google/devtools/build/lib/sandbox:linux_sandbox",
         "//src/main/java/com/google/devtools/build/lib/util:pair",
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index c09d35a..3fbd92c 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -606,6 +606,8 @@
     srcs = ["bazel_cc_code_coverage_test.sh"],
     data = [":test-deps"],
     tags = [
+        # C++ coverage is not supported on macOS yet.
+        "no_macos",
         "no_windows",
     ],
 )
diff --git a/src/test/shell/integration/BUILD b/src/test/shell/integration/BUILD
index 599e689..49e397e 100644
--- a/src/test/shell/integration/BUILD
+++ b/src/test/shell/integration/BUILD
@@ -583,6 +583,8 @@
     ],
     shard_count = 3,
     tags = [
+        # MacOS does not have cgroups so it can't support hardened sandbox
+        "no_macos",
         "no_windows",
     ],
 )