diff --git a/config/ext.json b/config/ext.json
index 4352f2e2..ed1210f3 100644
--- a/config/ext.json
+++ b/config/ext.json
@@ -255,6 +255,9 @@
             "zlib",
             "openssl",
             "libcares"
+        ],
+        "frameworks": [
+            "CoreFoundation"
         ]
     },
     "iconv": {
diff --git a/src/SPC/builder/extension/grpc.php b/src/SPC/builder/extension/grpc.php
index 42dcdd5b..86be8d3d 100644
--- a/src/SPC/builder/extension/grpc.php
+++ b/src/SPC/builder/extension/grpc.php
@@ -33,6 +33,8 @@ class grpc extends Extension
                 'GRPC_LIBDIR=' . BUILD_LIB_PATH . "\n" . 'LDFLAGS="$LDFLAGS -framework CoreFoundation"'
             );
         }
+        FileSystem::replaceFileStr("{$this->source_dir}/config.m4", "CFLAGS=\"-std=c11 -g -O2\"\n", '');
+        file_put_contents("{$this->source_dir}/php_grpc.h", '#include "src/php/ext/grpc/php_grpc.h"');
         return true;
     }
 
diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php
index ba02e672..bfae094a 100644
--- a/src/globals/test-extensions.php
+++ b/src/globals/test-extensions.php
@@ -16,15 +16,15 @@ $test_php_version = [
     // '8.1',
     // '8.2',
     // '8.3',
-    // '8.4',
+    '8.4',
     '8.5',
     // 'git',
 ];
 
 // test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available)
 $test_os = [
-    // 'macos-15-intel', // bin/spc for x86_64
-    // 'macos-15', // bin/spc for arm64
+    'macos-15-intel', // bin/spc for x86_64
+    'macos-15', // bin/spc for arm64
     // 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
     'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
     'ubuntu-24.04', // bin/spc for x86_64
@@ -35,7 +35,7 @@ $test_os = [
 ];
 
 // whether enable thread safe
-$zts = true;
+$zts = false;
 
 $no_strip = false;
 
@@ -50,7 +50,7 @@ $prefer_pre_built = false;
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'pgsql',
+    'Linux', 'Darwin' => 'grpc',
     'Windows' => 'com_dotnet',
 };