diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce2c29c4..3c64e76b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,11 @@ on:
     branches:
       - master
 
+# Cancel in-progress runs for pull requests, but not for master branch pushes
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   test:
     name: "JDK ${{ matrix.java }}"
@@ -20,11 +25,6 @@ jobs:
       # but Maven still needs an absolute path or it complains.
       ANDROID_HOME: /
     steps:
-      # Cancel any previous runs for the same branch that are still running.
-      - name: 'Cancel previous runs'
-        uses: styfle/cancel-workflow-action@d07a454dad7609a92316b57b23c9ccfd4f59af66
-        with:
-          access_token: ${{ github.token }}
       - name: 'Check out repository'
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
       - name: 'Set up JDK ${{ matrix.java }}'