diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b836ff3..98ff53c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,12 +8,12 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.8
 
       - name: Install dependencies
         run: |
@@ -31,25 +31,36 @@ jobs:
 
     strategy:
       matrix:
-        toxenv:
-            - py36-dj32-wag215
-            - py39-dj32-wag215
-            - py39-dj40-wag216
+        python: ['3.8', '3.10']
+        django: ['3.2']
+        wagtail: ['2.15','3.0','4.0']
         include:
-          - toxenv: py36-dj32-wag215
-            python-version: 3.6
-          - toxenv: py39-dj32-wag215
-            python-version: 3.9
-          - toxenv: py39-dj40-wag216
-            python-version: 3.9
+          - python: '3.8'
+            django: '4.0'
+            wagtail: '3.0'
+          - python: '3.10'
+            django: '4.0'
+            wagtail: '3.0'
+          - python: '3.8'
+            django: '4.0'
+            wagtail: '4.0'
+          - python: '3.10'
+            django: '4.0'
+            wagtail: '4.0'
+          - python: '3.8'
+            django: '4.1'
+            wagtail: '4.0'
+          - python: '3.10'
+            django: '4.1'
+            wagtail: '4.0'
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ matrix.python }}
 
       - name: Install dependencies
         run: |
@@ -61,6 +72,6 @@ jobs:
             tox
             coveralls
         env:
-          TOXENV: ${{ matrix.toxenv }}
+          TOXENV: python${{ matrix.python }}-django${{ matrix.django }}-wagtail${{ matrix.wagtail }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_SERVICE_NAME: github