diff --git a/.travis.yml b/.travis.yml
index a925a2c..de39412 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ cache: pip
 python:
   - 3.6
   - 3.7
+  - 3.8-dev
+  - pypy3
 env:
   - DJANGO=1.11
   - DJANGO=2.1
@@ -15,6 +17,22 @@ matrix:
       env: DJANGO=master
     - python: 3.7
       env: DJANGO=master
+    - python: 3.8-dev
+      env: DJANGO=1.11
+    - python: 3.8-dev
+      env: DJANGO=2.1
+    - python: 3.8-dev
+      env: DJANGO=2.2
+    - python: 3.8-dev
+      env: DJANGO=master
+    - python: pypy3
+      env: DJANGO=1.11
+    - python: pypy3
+      env: DJANGO=2.1
+    - python: pypy3
+      env: DJANGO=2.2
+    - python: pypy3
+      env: DJANGO=master
   fast_finish: true
 install: pip install tox-travis codecov
 script: tox
diff --git a/tox.ini b/tox.ini
index e3e7df3..556b582 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,13 @@
 [tox]
 envlist =
-    py{36,37}-django{111,21,22,master}
+    py{36,37,38,py3}-django{111,21,22,master}
 
 [travis]
 python =
     3.6: py36
     3.7: py37
+    3.8: py38
+    pypy3: pypy3
 
 [travis:env]
 DJANGO =