diff --git a/.bazelrc b/.bazelrc
index bdb2bfc8..8a55715f 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -13,3 +13,7 @@ build --features=per_object_debug_info
 
 # Enable header processing, required for layering checks with parse_header.
 build --process_headers_in_dependencies
+
+# OS specific settings
+build --enable_platform_specific_config
+build:macos --macos_minimum_os=10.15
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
index c77a980c..24474a8c 100644
--- a/.github/workflows/bazel.yml
+++ b/.github/workflows/bazel.yml
@@ -23,3 +23,4 @@ jobs:
           {"folder": ".", "bzlmodEnabled": false},
         ]
       exclude_windows: true
+      bazel_test_command: "bazel test --test_output=errors //..."
diff --git a/.github/workflows/ci.bazelrc b/.github/workflows/ci.bazelrc
deleted file mode 100644
index 3b4aad2a..00000000
--- a/.github/workflows/ci.bazelrc
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file contains Bazel settings to apply on CI only.
-# It is referenced with a --bazelrc option in the call to bazel in ci.yaml
-
-# Debug where options came from
-build --announce_rc
-# This directory is configured in GitHub actions to be persisted between runs.
-# We do not enable the repository cache to cache downloaded external artifacts
-# as these are generally faster to download again than to fetch them from the
-# GitHub actions cache.
-build --disk_cache=~/.cache/bazel
-# Don't rely on test logs being easily accessible from the test runner,
-# though it makes the log noisier.
-test --test_output=errors
-# Allows tests to run bazelisk-in-bazel, since this is the cache folder used
-test --test_env=XDG_CACHE_HOME