diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a0aaacf78..c8429e592 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,15 +10,45 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11.0-rc.2", "pypy-3.6", "pypy-3.7"]
-        with-opt-deps: [false, true]
-        runs-on: [ubuntu-latest]
-        exclude:
-          # Some of the dependencies don't work on old Python versions
+        include:
+          - python-version: "3.11.0-rc.2"
+            with-opt-deps: true
+            runs-on: ubuntu-22.04
+
+          - python-version: "3.10"
+            with-opt-deps: true
+            runs-on: ubuntu-22.04
+          - python-version: "3.10"
+            with-opt-deps: false
+            runs-on: ubuntu-22.04
+
+          - python-version: "3.9"
+            with-opt-deps: true
+            runs-on: ubuntu-22.04
+
+          - python-version: "3.8"
+            with-opt-deps: true
+            runs-on: ubuntu-22.04
+
+          - python-version: "3.7"
+            with-opt-deps: true
+            runs-on: ubuntu-22.04
+          - python-version: "3.7"
+            with-opt-deps: false
+            runs-on: ubuntu-22.04
+          - python-version: "pypy-3.7"
+            with-opt-deps: true
+            runs-on: ubuntu-22.04
+          - python-version: "pypy-3.7"
+            with-opt-deps: false
+            runs-on: ubuntu-22.04
+
           - python-version: "3.6"
-            with-opt-deps: true
+            with-opt-deps: false
+            runs-on: ubuntu-20.04
           - python-version: "pypy-3.6"
-            with-opt-deps: true
+            with-opt-deps: false
+            runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2