diff --git a/.travis.yml b/.travis.yml
index 2aef56d6f..65284a65f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ matrix:
     - env: TOXENV=py36-djangomaster
     - env: TOXENV=py37-djangomaster      
     - env: TOXENV=py38-djangomaster
+    - env: TOXENV=py39-djangomaster
 
   include:
     - python: 3.7
@@ -21,6 +22,13 @@ matrix:
     - python: 3.7
       env: TOXENV=py37-docs
 
+    - python: 3.9
+      env: TOXENV=py39-djangomaster
+    - python: 3.9
+      env: TOXENV=py39-django30
+    - python: 3.9
+      env: TOXENV=py39-django22
+
     - python: 3.8
       env: TOXENV=py38-django30
     - python: 3.8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f48ba0c9..3fce3f882 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Added
+* #884 Added support for Python 3.9
+
 ## [1.3.3] 2020-10-16
 
 ### Added
diff --git a/setup.cfg b/setup.cfg
index 696e45ff7..6c2012991 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,6 +24,7 @@ classifiers =
 	Programming Language :: Python :: 3.6
 	Programming Language :: Python :: 3.7
 	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3.9
 	Topic :: Internet :: WWW/HTTP
 
 [options]
diff --git a/tox.ini b/tox.ini
index c984f8b99..d3218b19f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,8 @@ envlist =
 	py37-django{30,22,21},
 	py36-django{22,21},
 	py35-django{22,21},
+	py39-django{22,30}
+	py39-djangomaster,
 	py38-djangomaster,
 	py37-djangomaster,
 	py36-djangomaster,