diff --git a/.travis.yml b/.travis.yml
index 9e07fe7..b23b504 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,17 +7,12 @@ matrix:
     python: 2.7
   - env: TOXENV=py27-dj111-coverage
     python: 2.7
-  - env: TOXENV=py34-dj111-coverage
-    python: 3.4
   - env: TOXENV=py35-dj111-coverage
     python: 3.5
   - env: TOXENV=py36-dj111-coverage
     python: 3.6
   - env: TOXENV=pypy-dj111-coverage
     python: pypy
-  - env: TOXENV=py34-dj20-coverage
-    python: 3.4
-  - env: TOXENV=py35-dj20-coverage
     python: 3.5
   - env: TOXENV=py35-djmaster-coverage
     python: 3.5
@@ -39,6 +34,14 @@ matrix:
     python: 3.7
     dist: xenial
     sudo: true
+  - env: TOXENV=py38-dj22-coverage
+    python: 3.8
+    dist: xenial
+    sudo: true
+  - env: TOXENV=py38-dj30-coverage
+    python: 3.8
+    dist: xenial
+    sudo: true
   allow_failures:
   - env: TOXENV=py35-djmaster-coverage
     python: 3.5
@@ -46,8 +49,8 @@ matrix:
     python: 3.6
   - env: TOXENV=py37-djmaster-coverage
     python: 3.7
-    dist: xenial
-    sudo: true
+  - env: TOXENV=py38-djmaster-coverage
+    python: 3.8
 install:
 - pip install tox
 script: tox -v
diff --git a/setup.py b/setup.py
index 7134712..708bd62 100644
--- a/setup.py
+++ b/setup.py
@@ -68,6 +68,8 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Utilities',
     ],
     zip_safe=False,
diff --git a/tox.ini b/tox.ini
index 78f3055..e3e1ac1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,9 +6,10 @@ whitelist_externals = sphinx-build
 envlist =
     checkqa,
     readme-py27,
-    py{27,34,35,36,py}-dj111
-    py{34,35,36,37,py3}-dj20
-    py{35,36,37,py3}-dj{21,22}
+    py{27,35,36,py}-dj111
+    py{35,36,37,py3}-dj20
+    py{35,36,37,py3}-dj21
+    py{35,36,37,38,py3}-dj22
     py{36,37,38,py3}-dj{30,master}
 
 [testenv]
@@ -23,7 +24,7 @@ deps =
     dj20: django>=2.0a1,<2.1
     dj21: django>=2.1a1,<2.2
     dj22: django>=2.2a1,<3.0
-    dj30: django>=3.0a1<3.1
+    dj30: django>=3.0a1,<3.1
     djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django
     py27,pypy: mock
     coverage: coverage