diff --git a/.travis.yml b/.travis.yml
index f6e361a..868b51d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ python:
   - 3.6
   - 3.7
   - 3.8
+  - 3.9
 
 matrix:
   fast_finish: true
diff --git a/setup.py b/setup.py
index f0e0e94..7cfa851 100644
--- a/setup.py
+++ b/setup.py
@@ -77,6 +77,7 @@ def namespace_packages(project_name):
               'Programming Language :: Python :: 3.6',
               'Programming Language :: Python :: 3.7',
               'Programming Language :: Python :: 3.8',
+              'Programming Language :: Python :: 3.9',
               'Topic :: Internet :: WWW/HTTP',
               'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
               'License :: OSI Approved :: MIT License',
diff --git a/tox.ini b/tox.ini
index 54076ad..e8026cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
 [tox]
 envlist =
     flake8
-    py{35,36,37,38}-django{20,21,22}
-    py{36,37,38}-django30
-    py{36,37,38}-djangomaster
+    py{35,36,37,38,39}-django{20,21,22}
+    py{36,37,38,39}-django30
+    py{38,39}-djangomaster
+    py{38,39}-django40
 
 [testenv]
 basepython =
@@ -12,12 +13,14 @@ basepython =
     py36: python3.6
     py37: python3.7
     py38: python3.8
+    py39: python3.9
 usedevelop = True
 deps =
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
     django22: Django>=2.2,<3.0
     django30: Django>=3.0,<3.1
+    django40: Django>=4.0,<4.1
     djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=django
 commands =
     python --version
@@ -30,14 +33,12 @@ python =
   3.6: py36
   3.7: py37
   3.8: py38
+  3.9: py39
 
-[testenv:py36-djangomaster]
-ignore_outcome=true
-
-[testenv:py37-djangomaster]
+[testenv:py38-djangomaster]
 ignore_outcome=true
 
-[testenv:py38-djangomaster]
+[testenv:py39-djangomaster]
 ignore_outcome=true
 
 [testenv:flake8]