diff --git a/.github/actions/test-alpine/action.yml b/.github/actions/test-alpine/action.yml
index e14e3176b8e..10011b06165 100644
--- a/.github/actions/test-alpine/action.yml
+++ b/.github/actions/test-alpine/action.yml
@@ -3,6 +3,9 @@ inputs:
   runTestsParameters:
     default: ''
     required: false
+  enableOpcache:
+    default: 'false'
+    required: false
   jitType:
     default: 'disable'
     required: false
@@ -15,6 +18,7 @@ runs:
         export SKIP_IO_CAPTURE_TESTS=1
         export STACK_LIMIT_DEFAULTS_CHECK=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
+          ${{ inputs.enableOpcache == 'true' && '-d opcache.enable_cli=1' }} \
           -d opcache.jit=${{ inputs.jitType }} \
           -d opcache.jit_buffer_size=64M \
           -j$(nproc) \
diff --git a/.github/actions/test-linux/action.yml b/.github/actions/test-linux/action.yml
index a5bf49bd001..573358e41b5 100644
--- a/.github/actions/test-linux/action.yml
+++ b/.github/actions/test-linux/action.yml
@@ -3,6 +3,9 @@ inputs:
   runTestsParameters:
     default: ''
     required: false
+  enableOpcache:
+    default: 'false'
+    required: false
   jitType:
     default: 'disable'
     required: false
@@ -42,6 +45,7 @@ runs:
         export SKIP_IO_CAPTURE_TESTS=1
         export STACK_LIMIT_DEFAULTS_CHECK=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
+          ${{ inputs.enableOpcache == 'true' && '-d opcache.enable_cli=1' }} \
           -d opcache.jit=${{ inputs.jitType }} \
           -d opcache.protect_memory=1 \
           -d opcache.jit_buffer_size=64M \
diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml
index e24190fef80..958544a0b5e 100644
--- a/.github/actions/test-macos/action.yml
+++ b/.github/actions/test-macos/action.yml
@@ -3,6 +3,9 @@ inputs:
   runTestsParameters:
     default: ''
     required: false
+  enableOpcache:
+    default: 'false'
+    required: false
   jitType:
     default: 'disable'
     required: false
@@ -16,6 +19,7 @@ runs:
         export CI_NO_IPV6=1
         export STACK_LIMIT_DEFAULTS_CHECK=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
+          ${{ inputs.enableOpcache == 'true' && '-d opcache.enable_cli=1' }} \
           -d opcache.jit=${{ inputs.jitType }} \
           -d opcache.protect_memory=1 \
           -d opcache.jit_buffer_size=64M \
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index f0f93b5a40a..1d066ec7f9a 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -90,10 +90,10 @@ jobs:
       - name: Test Tracing JIT
         uses: ./.github/actions/test-alpine
         with:
+          enableOpcache: true
           jitType: tracing
           runTestsParameters: >-
             --asan -x
-            -d opcache.enable_cli=1
       - name: Extra tests
         uses: ./.github/actions/extra-tests
   LINUX_X64:
@@ -185,33 +185,33 @@ jobs:
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
+          enableOpcache: true
           jitType: tracing
           runTestsParameters: >-
             ${{ matrix.asan && '--asan' || '' }}
             ${{ (matrix.asan && !inputs.all_variations) && '-x' || '' }}
             ${{ matrix.repeat && '--repeat 2' || '' }}
             ${{ matrix.variation && '-d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0' || '' }}
-            -d opcache.enable_cli=1
       - name: Test OpCache
         if: ${{ inputs.all_variations }}
         uses: ./.github/actions/test-linux
         with:
+          enableOpcache: true
           runTestsParameters: >-
             ${{ matrix.asan && '--asan' || '' }}
             ${{ matrix.repeat && '--repeat 2' || '' }}
             ${{ matrix.variation && '-d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0' || '' }}
-            -d opcache.enable_cli=1
       - name: Test Function JIT
         # ASAN frequently timeouts. Each test run takes ~90 minutes, we can
         # avoid running into the 6 hour timeout by skipping the function JIT.
         if: ${{ inputs.all_variations && !matrix.asan }}
         uses: ./.github/actions/test-linux
         with:
+          enableOpcache: true
           jitType: function
           runTestsParameters: >-
             ${{ matrix.repeat && '--repeat 2' || '' }}
             ${{ matrix.variation && '-d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0' || '' }}
-            -d opcache.enable_cli=1
       - name: Extra tests
         uses: ./.github/actions/extra-tests
       - name: Verify generated files are up to date
@@ -282,22 +282,19 @@ jobs:
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
+          enableOpcache: true
           jitType: tracing
-          runTestsParameters: >-
-            -d opcache.enable_cli=1
       - name: Test OpCache
         if: ${{ inputs.all_variations }}
         uses: ./.github/actions/test-linux
         with:
-          runTestsParameters: >-
-            -d opcache.enable_cli=1
+          enableOpcache: true
       - name: Test Function JIT
         if: ${{ inputs.all_variations }}
         uses: ./.github/actions/test-linux
         with:
+          enableOpcache: true
           jitType: function
-          runTestsParameters: >-
-            -d opcache.enable_cli=1
       - name: Extra tests
         uses: ./.github/actions/extra-tests
   MACOS:
@@ -340,22 +337,19 @@ jobs:
         if: ${{ matrix.arch == 'X64' || !matrix.zts }}
         uses: ./.github/actions/test-macos
         with:
+          enableOpcache: true
           jitType: tracing
-          runTestsParameters: >-
-            -d opcache.enable_cli=1
       - name: Test OpCache
         if: ${{ inputs.all_variations || (matrix.arch == 'ARM64' && matrix.zts) }}
         uses: ./.github/actions/test-macos
         with:
-          runTestsParameters: >-
-            -d opcache.enable_cli=1
+          enableOpcache: true
       - name: Test Function JIT
         if: ${{ inputs.all_variations && (matrix.arch == 'X64' || !matrix.zts) }}
         uses: ./.github/actions/test-macos
         with:
+          enableOpcache: true
           jitType: function
-          runTestsParameters: >-
-            -d opcache.enable_cli=1
       - name: Extra tests
         uses: ./.github/actions/extra-tests
       - name: Verify generated files are up to date
@@ -411,9 +405,8 @@ jobs:
       - name: Test OpCache
         uses: ./.github/actions/test-linux
         with:
+          enableOpcache: true
           jitType: tracing
-          runTestsParameters: >-
-            -d opcache.enable_cli=1
       - uses: codecov/codecov-action@v5
         if: ${{ !cancelled() }}
         with:
@@ -655,34 +648,34 @@ jobs:
       - name: Test File Cache (prime shm)
         uses: ./.github/actions/test-linux
         with:
+          enableOpcache: true
           runTestsParameters: >-
-            -d opcache.enable_cli=1
             --file-cache-prime
       - name: Test File Cache (prime shm, use shm)
         uses: ./.github/actions/test-linux
         with:
+          enableOpcache: true
           runTestsParameters: >-
-            -d opcache.enable_cli=1
             --file-cache-use
       - name: Test File Cache (prime shm, use file)
         uses: ./.github/actions/test-linux
         with:
+          enableOpcache: true
           runTestsParameters: >-
-            -d opcache.enable_cli=1
             --file-cache-use
             -d opcache.file_cache_only=1
       - name: Test File Cache Only (prime)
         uses: ./.github/actions/test-linux
         with:
+          enableOpcache: true
           runTestsParameters: >-
-            -d opcache.enable_cli=1
             --file-cache-prime
             -d opcache.file_cache_only=1
       - name: Test File Cache Only (use)
         uses: ./.github/actions/test-linux
         with:
+          enableOpcache: true
           runTestsParameters: >-
-            -d opcache.enable_cli=1
             --file-cache-use
             -d opcache.file_cache_only=1
       - name: Verify generated files are up to date
@@ -769,9 +762,9 @@ jobs:
       - name: Test Opcache
         uses: ./.github/actions/test-linux
         with:
+          enableOpcache: true
           runTestsParameters: >-
             --msan
-            -d opcache.enable_cli=1
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
   LIBMYSQLCLIENT: