diff --git a/.github/workflows/phpunit-feature.yml b/.github/workflows/phpunit-feature.yml
index 9cecaf1bf..177f18693 100644
--- a/.github/workflows/phpunit-feature.yml
+++ b/.github/workflows/phpunit-feature.yml
@@ -16,6 +16,12 @@ on:
         required: false
         type: string
 
+# A newer push to the same pull request supersedes the run in progress. Runs on
+# main and manual dispatches always finish.
+concurrency:
+  group: phpunit-feature-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 permissions:
   contents: read
 
diff --git a/.github/workflows/server-parity.yml b/.github/workflows/server-parity.yml
index 81878ea9f..9960470e7 100644
--- a/.github/workflows/server-parity.yml
+++ b/.github/workflows/server-parity.yml
@@ -114,6 +114,13 @@ on:
       - rust/**
   workflow_dispatch:
 
+# A newer push to the same pull request supersedes the run in progress, so a
+# replaced head does not keep holding the organization's shared runners.
+# Manual dispatches always finish.
+concurrency:
+  group: shared-server-fixtures-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 permissions:
   contents: read