diff --git a/third_party/objective_c/google_toolbox_for_mac/BUILD b/third_party/objective_c/google_toolbox_for_mac/BUILD
index 9fc517c45eb..49f110e485f 100644
--- a/third_party/objective_c/google_toolbox_for_mac/BUILD
+++ b/third_party/objective_c/google_toolbox_for_mac/BUILD
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 licenses(["notice"])
-native.objc_library(
+objc_library(
     name = "GTM_GoogleTestRunner_GTM_USING_XCTEST",
     testonly = 1,
     srcs = [
diff --git a/tools/internal_ci/macos/grpc_run_bazel_cpp_ios_tests.sh b/tools/internal_ci/macos/grpc_run_bazel_cpp_ios_tests.sh
index bc2a8295521..c6523408040 100644
--- a/tools/internal_ci/macos/grpc_run_bazel_cpp_ios_tests.sh
+++ b/tools/internal_ci/macos/grpc_run_bazel_cpp_ios_tests.sh
@@ -18,22 +18,14 @@ set -ex
 # change to grpc repo root
 cd $(dirname $0)/../../..
 
-# Download bazel
-temp_dir="$(mktemp -d)"
-wget -q https://github.com/bazelbuild/bazel/releases/download/0.26.0/bazel-0.26.0-darwin-x86_64 -O "${temp_dir}/bazel"
-chmod 755 "${temp_dir}/bazel"
-export PATH="${temp_dir}:${PATH}"
-# This should show ${temp_dir}/bazel
-which bazel
-
 ./tools/run_tests/start_port_server.py
 
 dirs=(end2end server client common codegen util grpclb test)
 for dir in ${dirs[*]}; do
   echo $dir
-  out=`bazel query "kind(ios_unit_test, tests(//test/cpp/$dir/...))"`
+  out=`tools/bazel query "kind(ios_unit_test, tests(//test/cpp/$dir/...))" 2>/dev/null | grep '^//'`
   for test in $out; do
     echo "Running: $test"
-    bazel test --test_summary=detailed --test_output=all $test
+    tools/bazel test --test_summary=detailed --test_output=all $test
   done
 done