diff --git a/.travis.yml b/.travis.yml
index a4a4ed8b5..8d56118f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,11 +21,16 @@ matrix:
       - { python: "3.7", env: DJANGO=2.2 }
       - { python: "3.7", env: DJANGO=master }
 
-      - { python: "3.7", env: TOXENV=base }
-      - { python: "3.7", env: TOXENV=lint }
-      - { python: "3.7", env: TOXENV=docs }
+      - { python: "3.8", env: DJANGO=2.0 }
+      - { python: "3.8", env: DJANGO=2.1 }
+      - { python: "3.8", env: DJANGO=2.2 }
+      - { python: "3.8", env: DJANGO=master }
 
-      - python: "3.7"
+      - { python: "3.8", env: TOXENV=base }
+      - { python: "3.8", env: TOXENV=lint }
+      - { python: "3.8", env: TOXENV=docs }
+
+      - python: "3.8"
         env: TOXENV=dist
         script:
           - python setup.py bdist_wheel
diff --git a/setup.py b/setup.py
index 2f8dafd21..c9d6443d5 100755
--- a/setup.py
+++ b/setup.py
@@ -101,6 +101,7 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3 :: Only',
         'Topic :: Internet :: WWW/HTTP',
     ],
diff --git a/tox.ini b/tox.ini
index 699ca909c..3bb5edee8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 envlist =
        {py35,py36}-django111,
-       {py35,py36,py37}-django20,
-       {py35,py36,py37}-django21
-       {py35,py36,py37}-django22
-       {py36,py37}-djangomaster,
+       {py35,py36,py37,py38}-django20,
+       {py35,py36,py37,py38}-django21
+       {py35,py36,py37,py38}-django22
+       {py36,py37,py38}-djangomaster,
        base,dist,lint,docs,
 
 [travis:env]