diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 428d4e7..32a9329 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,14 +3,49 @@ on: [push, pull_request]
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        # Skipping some in between releases.
+        emacs: ["25.3", "29.1", "30.2"]
     steps:
-      - uses: purcell/setup-emacs@master
+      - uses: actions/checkout@v6
+
+      - name: Set up Emacs
+        uses: purcell/setup-emacs@master
+        with:
+          version: ${{ matrix.emacs }}
+
+      - name: Install zbar
+        run: |
+          sudo apt update
+          sudo apt install -y zbar-tools
+
+      - name: Build
+        run: make
+
+      - name: Test
+        run: make test
+
+  test-snapshot:
+    runs-on: ubuntu-latest
+    # allow snapshot failures so CI doesn't block on nightly breakage
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Emacs (snapshot)
+        uses: purcell/setup-emacs@master
         with:
           version: snapshot
+
       - name: Install zbar
-        run: sudo apt install -y zbar-tools
-      - uses: actions/checkout@v2
+        run: |
+          sudo apt update
+          sudo apt install -y zbar-tools
+
       - name: Build
         run: make
+
       - name: Test
         run: make test
diff --git a/qrencode.el b/qrencode.el
index d86dcc9..1451414 100644
--- a/qrencode.el
+++ b/qrencode.el
@@ -36,6 +36,9 @@
 
 ;;; Code:
 
+;; backwards compatibility for Emacs <29.1
+(eval-when-compile (require 'subr-x))
+
 (require 'cl-lib)
 (eval-when-compile (require 'easymenu))
 (require 'seq)