diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml
index 317d705645985..6d34b9318f3d0 100644
--- a/.github/actions/configure-macos/action.yml
+++ b/.github/actions/configure-macos/action.yml
@@ -19,7 +19,7 @@ runs:
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig"
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
         ./buildconf --force
-        ./configure \
+        CFLAGS='-Wno-strict-prototypes -Wno-unused-but-set-variable -Wno-single-bit-bitfield-constant-conversion' ./configure \
           --enable-option-checking=fatal \
           --prefix=/usr/local \
           --enable-fpm \
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 0e0de633de286..8bce17224eb2c 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -97,7 +97,7 @@ jobs:
         uses: ./.github/actions/verify-generated-files
   MACOS_DEBUG_NTS:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: git checkout
         uses: actions/checkout@v4
diff --git a/Zend/tests/arginfo_zpp_mismatch.inc b/Zend/tests/arginfo_zpp_mismatch.inc
index 023bfefa5d501..27fa16547802e 100644
--- a/Zend/tests/arginfo_zpp_mismatch.inc
+++ b/Zend/tests/arginfo_zpp_mismatch.inc
@@ -29,6 +29,9 @@ function skipFunction($function): bool {
      || $function === 'posix_setrlimit'
      || $function === 'sapi_windows_generate_ctrl_event'
      || $function === 'imagegrabscreen'
+     // PHP-8.1 only
+     || $function === 'dcgettext'
+     || $function === 'dcngettext'
     ) {
         return true;
     }
diff --git a/ext/curl/tests/bug77946.phpt b/ext/curl/tests/bug77946.phpt
index 8b1e70675554f..7b836187d6bfb 100644
--- a/ext/curl/tests/bug77946.phpt
+++ b/ext/curl/tests/bug77946.phpt
@@ -34,4 +34,4 @@ curl_multi_close($mh);
 --EXPECTF--
 int(1)
 int(1)
-string(%d) "Protocol %Sunknown%S not supported or disabled in libcurl"
+string(%d) "Protocol %Sunknown%S %rnot supported( or disabled in libcurl)?%r"
diff --git a/ext/curl/tests/curl_basic_024.phpt b/ext/curl/tests/curl_basic_024.phpt
index b16bfed03835f..84216bde308eb 100644
--- a/ext/curl/tests/curl_basic_024.phpt
+++ b/ext/curl/tests/curl_basic_024.phpt
@@ -25,7 +25,7 @@ var_dump(0 === curl_getinfo($ch, CURLINFO_PROXY_SSL_VERIFYRESULT));
 var_dump(curl_getinfo($ch, CURLINFO_SCHEME));
 curl_close($ch);
 ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 bool(true)
-string(4) "HTTP"
+string(4) "%r(HTTP|http)%r"
diff --git a/ext/curl/tests/curl_setopt_ssl.phpt b/ext/curl/tests/curl_setopt_ssl.phpt
index 52ff95ab34bcf..2e28466a84057 100644
--- a/ext/curl/tests/curl_setopt_ssl.phpt
+++ b/ext/curl/tests/curl_setopt_ssl.phpt
@@ -8,6 +8,7 @@ if (!function_exists("proc_open")) die("skip no proc_open");
 exec('openssl version', $out, $code);
 if ($code > 0) die("skip couldn't locate openssl binary");
 if (PHP_OS_FAMILY === 'Windows') die('skip not for Windows');
+if (PHP_OS_FAMILY === 'Darwin') die('skip Fails intermittently on macOS');
 $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x074700) {
     die("skip: blob options not supported for curl < 7.71.0");
diff --git a/ext/gettext/tests/dcngettext.phpt b/ext/gettext/tests/dcngettext.phpt
index 715281ec8296b..2f356b1cf0c6a 100644
--- a/ext/gettext/tests/dcngettext.phpt
+++ b/ext/gettext/tests/dcngettext.phpt
@@ -11,10 +11,10 @@ if (!function_exists("dcngettext")) die("skip dcngettext() doesn't exist");
 
 var_dump(dcngettext(1,1,1,1,1));
 var_dump(dcngettext("test","test","test",1,1));
-var_dump(dcngettext("test","test","test",0,0));
+var_dump(dcngettext("test","test","test",0,1));
 var_dump(dcngettext("test","test","test",-1,-1));
 var_dump(dcngettext("","","",1,1));
-var_dump(dcngettext("","","",0,0));
+var_dump(dcngettext("","","",0,1));
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt
index ff816178cef67..2d3cedad87944 100644
--- a/ext/standard/tests/file/bug52820.phpt
+++ b/ext/standard/tests/file/bug52820.phpt
@@ -46,21 +46,21 @@ echo "\nDone.\n";
 temp stream \(close after\):
 About to rewind!
 (\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
-\* Closing connection( -?\d+)?
+\* [Cc]losing connection( #?-?\d+)?
 
 memory stream \(close after\):
 About to rewind!
 (\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
-\* Closing connection( -?\d+)?
+\* [Cc]losing connection( #?-?\d+)?
 
 temp stream \(leak\):
 About to rewind!
 (\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
-\* Closing connection( -?\d+)?
+\* [Cc]losing connection( #?-?\d+)?
 
 memory stream \(leak\):
 About to rewind!
 (\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
-\* Closing connection( -?\d+)?
+\* [Cc]losing connection( #?-?\d+)?
 
 Done\.