diff --git a/.travis.yml b/.travis.yml
index bc5490223..099dff144 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,51 +1,26 @@
-sudo: false
+dist: xenial
 language: python
 python:
   - "3.6"
+  - "3.7"
+  - "3.8"
+  - "3.9-dev"
 env:
   - DJANGO="2.2"
   - DJANGO="3.0"
+  - DJANGO="3.1"
+  - DJANGO="master"
 matrix:
-  include:
-    - python: "3.7"
-      sudo: required
-      dist: xenial
-      env: DJANGO="2.2"
-    - python: "3.7"
-      sudo: required
-      dist: xenial
-      env: DJANGO="3.0"
-    - python: "3.7"
-      sudo: required
-      dist: xenial
-      env: DJANGO="master"
-    - python: "3.8"
-      sudo: required
-      dist: xenial
-      env: DJANGO="2.2"
-    - python: "3.8"
-      sudo: required
-      dist: xenial
-      env: DJANGO="3.0"
-    - python: "3.8"
-      sudo: required
-      dist: xenial
-      env: DJANGO="3.1"
-    - python: "3.8"
-      sudo: required
-      dist: xenial
-      env: DJANGO="master"
-    - python: "3.9"
-      sudo: required
-      dist: xenial
-      env: DJANGO="master"
   allow_failures:
+    - python: "3.6"
+      env: DJANGO="master"
     - python: "3.7"
       env: DJANGO="master"
     - python: "3.8"
       env: DJANGO="master"
-    - python: "3.9"
+    - python: "3.9-dev"
       env: DJANGO="master"
 after_success: codecov
 install: pip install tox-travis codecov
-script: tox
+script: tox -v
+
diff --git a/setup.py b/setup.py
index 6854b09a1..12aa239cc 100755
--- a/setup.py
+++ b/setup.py
@@ -75,6 +75,7 @@ def run_tests(self):
         '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',
@@ -82,6 +83,7 @@ def run_tests(self):
         '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 720842380..517789f84 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,7 +23,7 @@ python =
     3.6: py36
     3.7: py37
     3.8: py38
-    3.9: py39
+    3.9-dev: py39
 unignore_outcomes = True
 
 [travis:env]
@@ -32,3 +32,4 @@ DJANGO =
     3.0: django30
     3.1: django31
     master: django_master
+