diff --git a/kokoro/macos/php74/build.sh b/kokoro/macos/php74/build.sh
index 2b50a0a6ee..2ad4eab598 100755
--- a/kokoro/macos/php74/build.sh
+++ b/kokoro/macos/php74/build.sh
@@ -9,10 +9,11 @@ cd $(dirname $0)/../../..
 source kokoro/macos/prepare_build_macos_rc
 
 # Install Dependencies
+brew cleanup
 brew install coreutils php@7.4
 
 # Configure path
-PHP_FOLDER=$(find $HOMEBREW_PREFIX -type d -regex ".*php.*/7.4.[0-9]*")
+PHP_FOLDER=$(find $HOMEBREW_PREFIX -type d -regex ".*php.*/7.4.[0-9_.]*" | sort -n | tail -n 1)
 test ! -z "$PHP_FOLDER"
 export PATH="$PHP_FOLDER/bin:$PATH"
 
diff --git a/kokoro/macos/php80/build.sh b/kokoro/macos/php80/build.sh
index 4051822e97..e703ffc18f 100755
--- a/kokoro/macos/php80/build.sh
+++ b/kokoro/macos/php80/build.sh
@@ -9,10 +9,11 @@ cd $(dirname $0)/../../..
 source kokoro/macos/prepare_build_macos_rc
 
 # Install Dependencies
+brew cleanup
 brew install coreutils php@8.0
 
 # Configure path
-PHP_FOLDER=$(find $HOMEBREW_PREFIX -type d -regex ".*php.*/8.0.[0-9]*")
+PHP_FOLDER=$(find $HOMEBREW_PREFIX -type d -regex ".*php.*/8.0.[0-9_.]*" | sort -n | tail -n 1)
 test ! -z "$PHP_FOLDER"
 export PATH="$PHP_FOLDER/bin:$PATH"
 
diff --git a/php/tests/compile_extension.sh b/php/tests/compile_extension.sh
index 326191738f..dc42aa32ee 100755
--- a/php/tests/compile_extension.sh
+++ b/php/tests/compile_extension.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 cd $(dirname $0)/..