diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6ef64124..a227266c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,8 +7,8 @@ on:
   pull_request: {}
 
 concurrency: 
-  group: ${{ github.head_ref }}
-  cancel-in-progress: true
+  group: test-${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   test-and-bench: