diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 949df01..83b6935 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   build:
     name: build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }})
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     services:
       postgres:
@@ -98,6 +98,8 @@ jobs:
             python-version: "3.9"
           - django-version: "4.1"
             python-version: "3.10"
+          - django-version: "4.1"
+            python-version: "3.11"
 
     steps:
     - uses: actions/checkout@v2
diff --git a/tox.ini b/tox.ini
index 1e8e6a6..3f26486 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,10 +6,12 @@ envlist =
     {py35,py36,py37,py38,py39}-django22
     {py36,py37,py38,py39}-django{30,31}
     {py36,py37,py38,py39,py310}-django32
-    {py38,py39,py310}-django{40,41}
+    {py38,py39,py310}-django40
+    {py38,py39,py310,py311}-django41
 
 [testenv]
 passenv = DATABASE_URL
+allowlist_externals = ./runtests.py
 commands = ./runtests.py
 deps =
     django111: Django>=1.11,<2.0
@@ -22,7 +24,8 @@ deps =
     django40: Django>=4.0,<4.1
     django41: Django>=4.1,<4.2
     dj-database-url==0.5.0
-    psycopg2==2.8.5
+    py{27,35,36,37,38,39,310}: psycopg2==2.8.5
+    py311: psycopg2==2.9.6
 
 [gh-actions]
 python =