diff --git a/.travis.yml b/.travis.yml
index c82d6193a..338c7a122 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ python:
 - '3.6'
 - '3.7'
 - '3.8'
-- '3.9'
+- '3.9-dev'
 env:
 - DJANGO='2.2'
 - DJANGO='3.0'
@@ -16,11 +16,13 @@ script: tox -v
 jobs:
   fast_finish: true
   allow_failures:
+    - python: '3.6'
+      env: DJANGO='dev'
     - python: '3.7'
       env: DJANGO='dev'
     - python: '3.8'
       env: DJANGO='dev'
-    - python: '3.9'
+    - python: '3.9-dev'
       env: DJANGO='dev'
   include:
   - stage: deploy
diff --git a/setup.py b/setup.py
index 1ab93238f..b333fde90 100755
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,7 @@
         "Framework :: Django :: 2.2",
         "Framework :: Django :: 3.0",
         "Framework :: Django :: 3.1",
+        "Framework :: Django :: 3.2",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
@@ -60,6 +61,7 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Framework :: Django",
         "Topic :: Software Development :: Libraries :: Application Frameworks",
         "Topic :: Software Development :: Libraries :: Python Modules",
diff --git a/tox.ini b/tox.ini
index ff8c271b5..559055756 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,7 @@ python =
     3.6: py36
     3.7: py37
     3.8: py38
-    3.9: py39
+    3.9-dev: py39
 unignore_outcomes = True
 
 [travis:env]