diff --git a/kokoro/macos/cpp/build.sh b/kokoro/macos/cpp/build.sh
index bae2ebbc5f..fae3b3012a 100755
--- a/kokoro/macos/cpp/build.sh
+++ b/kokoro/macos/cpp/build.sh
@@ -2,10 +2,29 @@
 #
 # Build file to set up and run tests
 
-# Change to repo root
+set -eux
+set -o pipefail
+
+if [[ -h /tmpfs ]] && [[ ${PWD} == /tmpfs/src ]]; then
+  # Workaround for internal Kokoro bug: b/227401944
+  cd /Volumes/BuildData/tmpfs/src
+fi
+
+# Default environment variables used by cmake build:
+: ${CMAKE_CONFIG_TYPE:=Debug}
+export CMAKE_CONFIG_TYPE
+: ${CTEST_PARALLEL_LEVEL:=4}
+export CTEST_PARALLEL_LEVEL
+
+# Run from the project root directory.
 cd $(dirname $0)/../../..
 
-# Prepare worker environment to run tests
-source kokoro/macos/prepare_build_macos_rc
+#
+# Update submodules
+#
+git submodule update --init --recursive
 
-./tests.sh cpp
+#
+# Run build
+#
+kokoro/common/cmake.sh