diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8d5ea01d..130fb86d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,12 +21,33 @@ jobs:
         server:
         - mir_kiosk
         - ubuntu_frame
-        - confined_shell
         - mir_test_tools
-        - mir_demo_server
-        - gnome_shell
+        channel: [stable]
         include:
+        - server: ubuntu_frame
+          channel: 24/edge
+
+        - server: mir_test_tools
+          channel: 24/edge
+
+        - server: mir_demo_server
+          channel: null
+
+        - server: mir_demo_server
+          channel: null
+          ppa: mir-team/dev
+
+        - server: confined_shell
+          channel: beta
+
+        - server: confined_shell
+          channel: edge
+
+        - server: gnome_shell
+          channel: null
+
         - server: null
+          channel: null
           mark: self
 
     runs-on: ubuntu-24.04
@@ -52,6 +73,8 @@ jobs:
     - name: Set up dependencies
       working-directory: mir-ci/mir_ci
       run: |
+        [ -n '${{ matrix.ppa }}' ] && sudo add-apt-repository --yes ppa:${{ matrix.ppa }}
+        [ -n '${{ matrix.channel }}' ] && sudo snap install $( echo ${{ matrix.server }} | tr _ - ) --channel ${{ matrix.channel }}
         sudo apt-get --yes install pkg-config libwayland-dev ffmpeg
         pip install -e ..
         [ '${{ matrix.mark }}' == 'self' ] && pip install pytest-cov
@@ -74,7 +97,7 @@ jobs:
       uses: actions/upload-artifact@v4
       if: success() || failure()
       with:
-        name: test-results-${{ matrix.server || matrix.mark }}
+        name: test-results-${{ matrix.server && format('{0}-{1}-{2}', matrix.server, matrix.channel, matrix.ppa) || matrix.mark }}
         path: |
           mir-ci/mir_ci/junit-*.xml
           /tmp/pytest-of-*/*-current/**/log.html
@@ -97,7 +120,7 @@ jobs:
       name: Upload any core dumps
       uses: actions/upload-artifact@v4
       with:
-        name: core-dumps-${{ matrix.server || matrix.mark }}
+        name: core-dumps-${{ matrix.server && format('{0}-{1}-{2}', matrix.server, matrix.channel, matrix.ppa) || matrix.mark }}
         path: corefile-*
         if-no-files-found: ignore