diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 80d70c66e4..426778aeaa 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -102,17 +102,19 @@ jobs:
         run: phpcs -i
 
       - name: Run PHPCS on all Core files
-        continue-on-error: true
+        id: phpcs-core
         run: phpcs -n --report-full --report-checkstyle=./.cache/phpcs-report.xml
 
       - name: Show PHPCS results in PR
+        if: ${{ always() && steps.phpcs-core.outcome == 'failure' }}
         run: cs2pr ./.cache/phpcs-report.xml
 
       - name: Check test suite files for warnings
-        continue-on-error: true
+        id: phpcs-tests
         run: phpcs tests --report-full --report-checkstyle=./.cache/phpcs-tests-report.xml
 
       - name: Show test suite scan results in PR
+        if: ${{ always() && steps.phpcs-tests.outcome == 'failure' }}
         run: cs2pr ./.cache/phpcs-tests-report.xml
 
       - name: Ensure version-controlled files are not modified during the tests
diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
index 3b6802aac7..f60dc901af 100644
--- a/.github/workflows/php-compatibility.yml
+++ b/.github/workflows/php-compatibility.yml
@@ -97,10 +97,11 @@ jobs:
         run: phpcs -i
 
       - name: Run PHP compatibility tests
-        continue-on-error: true
+        id: phpcs
         run: phpcs --standard=phpcompat.xml.dist --report-full --report-checkstyle=./.cache/phpcs-compat-report.xml
 
       - name: Show PHPCompatibility results in PR
+        if: ${{ always() && steps.phpcs.outcome == 'failure' }}
         run: cs2pr ./.cache/phpcs-compat-report.xml
 
       - name: Ensure version-controlled files are not modified or deleted