diff --git a/.github/nightly_matrix.php b/.github/nightly_matrix.php
index 597528b9406..0622dfdcf4e 100644
--- a/.github/nightly_matrix.php
+++ b/.github/nightly_matrix.php
@@ -100,8 +100,9 @@ function get_macos_matrix_include(array $branches) {
                     'branch' => $branch,
                     'debug' => $debug,
                     'zts' => $zts,
-                    'os' => $branch === 'master' ? '13' : '12',
+                    'os' => $branch['name'] === 'master' ? '13' : '12',
                     'arch' => 'X64',
+                    'test_jit' => true,
                 ];
                 if ($branch['version']['minor'] >= 4 || $branch['version']['major'] >= 9) {
                     $jobs[] = [
@@ -110,6 +111,7 @@ function get_macos_matrix_include(array $branches) {
                         'zts' => $zts,
                         'os' => '14',
                         'arch' => 'ARM64',
+                        'test_jit' => !$zts,
                     ];
                 }
             }
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 4f1e7ca9868..49f35dd9d38 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -256,6 +256,7 @@ jobs:
         with:
           testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
       - name: Test Tracing JIT
+        if: matrix.test_jit
         uses: ./.github/actions/test-macos
         with:
           testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
@@ -271,6 +272,7 @@ jobs:
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
       - name: Test Function JIT
+        if: matrix.test_jit
         uses: ./.github/actions/test-macos
         with:
           testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT