diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index b7ff475635bda6..14cb5cdcb3fdc5 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -121,6 +121,9 @@ tasks:
       - "//tools/python/..."
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
       - "-//src/java_tools/import_deps_checker/..."
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"      
     include_json_profile:
       - build
       - test
@@ -199,6 +202,9 @@ tasks:
       - "-//src/test/shell/bazel/android:android_ndk_integration_test"
       - "-//src/test/shell/bazel:bazel_coverage_cc_head_test_gcc"
       - "-//src/test/shell/bazel/android:android_ndk_integration_test_with_head_android_tools"
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"
     include_json_profile:
       - build
       - test
@@ -239,6 +245,9 @@ tasks:
       - "//tools/python/..."
       # C++ coverage is not supported on macOS yet.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"      
     include_json_profile:
       - build
       - test
@@ -265,6 +274,9 @@ tasks:
       - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
     test_targets:
       - "//src:all_windows_tests"
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"
     include_json_profile:
       - build
       - test
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 863a614b65f3b0..bca49bde34eb84 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -118,6 +118,9 @@ tasks:
       - "//tools/python/..."
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
       - "-//src/java_tools/import_deps_checker/..."
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"      
   ubuntu1804_clang:
     platform: ubuntu1804
     environment:
@@ -191,6 +194,9 @@ tasks:
       - "-//src/test/shell/bazel/android:android_ndk_integration_test"
       - "-//src/test/shell/bazel:bazel_coverage_cc_head_test_gcc"
       - "-//src/test/shell/bazel/android:android_ndk_integration_test_with_head_android_tools"
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"      
   macos:
     environment:
       USE_BAZEL_VERSION: 4.2.2
@@ -232,6 +238,9 @@ tasks:
       - "-//src/java_tools/import_deps_checker/..."
       # C++ coverage is not supported on macOS yet.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"      
   windows:
     environment:
       USE_BAZEL_VERSION: 4.2.2
@@ -256,6 +265,9 @@ tasks:
       - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
     test_targets:
       - "//src:all_windows_tests"
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"      
   rbe_ubuntu1604:
     environment:
       USE_BAZEL_VERSION: 4.2.2
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index f9a152f1459d65..3d07d68b5bd301 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -407,7 +407,7 @@ cp $OUTPUT_DIR/libblaze.jar ${ARCHIVE_DIR}
 # TODO(b/28965185): Remove when xcode-locator is no longer required in embedded_binaries.
 log "Compiling xcode-locator..."
 if [[ $PLATFORM == "darwin" ]]; then
-  run /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices -framework Foundation -o ${ARCHIVE_DIR}/xcode-locator tools/osx/xcode_locator.m
+  run /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices -framework Foundation -o ${ARCHIVE_DIR}/xcode-locator tools/osx/xcode_locator.m
 else
   cp tools/osx/xcode_locator_stub.sh ${ARCHIVE_DIR}/xcode-locator
 fi
diff --git a/tools/cpp/osx_cc_configure.bzl b/tools/cpp/osx_cc_configure.bzl
index b0b7a967390817..0929c988ec92cc 100644
--- a/tools/cpp/osx_cc_configure.bzl
+++ b/tools/cpp/osx_cc_configure.bzl
@@ -63,7 +63,7 @@ def _compile_cc_file(repository_ctx, src_name, out_name):
         "--sdk",
         "macosx",
         "clang",
-        "-mmacosx-version-min=10.9",
+        "-mmacosx-version-min=10.13",
         "-std=c++11",
         "-lc++",
         "-O3",
diff --git a/tools/osx/BUILD b/tools/osx/BUILD
index 903baf55af2064..f767bd7d348ce9 100644
--- a/tools/osx/BUILD
+++ b/tools/osx/BUILD
@@ -28,7 +28,7 @@ exports_files([
 ])
 
 DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
-  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \
+  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
       -framework Foundation -o $@ $<
 """
 
diff --git a/tools/osx/xcode_configure.bzl b/tools/osx/xcode_configure.bzl
index e43e1618231082..2464300bec1689 100644
--- a/tools/osx/xcode_configure.bzl
+++ b/tools/osx/xcode_configure.bzl
@@ -124,7 +124,7 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):
         "--sdk",
         "macosx",
         "clang",
-        "-mmacosx-version-min=10.9",
+        "-mmacosx-version-min=10.13",
         "-fobjc-arc",
         "-framework",
         "CoreServices",