diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 129adf9..eb31e46 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,32 +1,52 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
 
-jobs:
-    test:
-        runs-on: ${{ matrix.os }}
-        strategy:
-            fail-fast: false
-            matrix:
-                os: [ubuntu-latest, macos-latest, windows-latest]
-                emacs-version:
-                    - 26.3
-                    - 27.2
-                    - 28.2
-                    # - snapshot
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
-        steps:
-            - uses: actions/checkout@v3
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        emacs-version:
+          - 26.3
+          - 27.2
+          - 28.2
+          - 29.1
+        experimental: [false]
+        include:
+          - os: ubuntu-latest
+            emacs-version: snapshot
+            experimental: true
+          - os: macos-latest
+            emacs-version: snapshot
+            experimental: true
+          - os: windows-latest
+            emacs-version: snapshot
+            experimental: true
 
-            - uses: jcs090218/setup-emacs@master
-              with:
-                  version: ${{ matrix.emacs-version }}
+    steps:
+    - uses: actions/checkout@v3
 
-            - uses: emacs-eask/setup-eask@master
-              with:
-                version: 'snapshot'
+    - uses: jcs090218/setup-emacs@master
+      with:
+        version: ${{ matrix.emacs-version }}
 
-            - name: Run tests
-              run: |
-                make ci                  
+    - uses: emacs-eask/setup-eask@master
+      with:
+        version: 'snapshot'
 
+    - name: Run tests
+      run:
+        make ci