diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c677ac2..4403685 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
         xapian-version: ['1.4.18']
 
     steps:
@@ -41,13 +41,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.9']
-        django-version: ['2.2', '3.1', '3.2']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+        django-version: ['2.2', '3.2', '4.0']
         xapian-version: ['1.4.18']
-        include:
+        exclude:
           # Django added python 3.10 support in 3.2.9
           - python-version: '3.10'
-            django-version: '3.2'
+            django-version: '2.2'
+            xapian-version: '1.4.18'
+          # Django dropped python 3.7 support in 4.0
+          - python-version: '3.7'
+            django-version: '4.0'
             xapian-version: '1.4.18'
 
     steps: