diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 821915ea44462..ada8685507356 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,6 +55,7 @@ jobs:
           cat $EM_CONFIG
       - name: Check test expectations on target branch
         run: |
+          echo "Checking out ${{ github.base_ref }}"
           git checkout ${{ github.base_ref }}
           git rev-parse HEAD
           # Hack to honor changes to rebaseline_tests.py in the current PR
@@ -64,5 +65,21 @@ jobs:
             echo "Test expectations are out-of-date on the target branch."
             echo "You can run `./tools/maint/rebaseline_tests.py --new-branch`"
             echo "and use it to create a seperate PR."
+            echo "-- This failure is only a warning and can be ignored"
             exit 1
           fi
+      - name: Check test expectations on PR branch
+        run: |
+          echo "Checking out ${{ github.head_ref }} (${{ github.sha }})"
+          git checkout ${{ github.sha }}
+          git rev-parse HEAD
+          ./bootstrap
+          if ! ./tools/maint/rebaseline_tests.py --check-only; then
+            echo "Test expectations are out-of-date on the PR branch."
+            echo "You can run `./tools/maint/rebaseline_tests.py` to"
+            echo "create an commit updating the expectations."
+            echo "Be sure to have `emsdk install tot` first."
+            echo "-- This failure is only a warning and can be ignored"
+            exit 1
+          fi
+