diff --git a/.travis.yml b/.travis.yml
index a4729b7..9ce3e2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,38 +13,55 @@ matrix:
     python: 3.6
   - env: TOXENV=pypy-dj111-coverage
     python: pypy
-  - env: TOXENV=py35-djmaster-coverage
+  - env: TOXENV=pypy3-dj111-coverage
+    python: pypy3
+  - env: TOXENV=py35-dj20-coverage
     python: 3.5
   - env: TOXENV=py36-dj20-coverage
     python: 3.6
-  - env: TOXENV=py36-dj21-coverage
-    python: 3.6
-  - env: TOXENV=py36-djmaster-coverage
-    python: 3.6
   - env: TOXENV=py37-dj20-coverage
     python: 3.7
-    sudo: true
+  - env: TOXENV=pypy3-dj20-coverage
+    python: pypy3
+  - env: TOXENV=py36-dj21-coverage
+    python: 3.6
   - env: TOXENV=py37-dj21-coverage
     python: 3.7
-    sudo: true
-  - env: TOXENV=py37-djmaster-coverage
+  - env: TOXENV=pypy3-dj21-coverage
+    python: pypy3
+  - env: TOXENV=py36-dj22-coverage
+    python: 3.6
+  - env: TOXENV=py37-dj22-coverage
     python: 3.7
-    sudo: true
   - env: TOXENV=py38-dj22-coverage
     python: 3.8
-    sudo: true
+  - env: TOXENV=pypy3-dj22-coverage
+    python: pypy3
+  - env: TOXENV=py36-dj30-coverage
+    python: 3.6
+  - env: TOXENV=py37-dj30-coverage
+    python: 3.7
   - env: TOXENV=py38-dj30-coverage
     python: 3.8
-    sudo: true
-  allow_failures:
-  - env: TOXENV=py35-djmaster-coverage
-    python: 3.5
+  - env: TOXENV=pypy3-dj30-coverage
+    python: pypy3
   - env: TOXENV=py36-djmaster-coverage
     python: 3.6
   - env: TOXENV=py37-djmaster-coverage
     python: 3.7
   - env: TOXENV=py38-djmaster-coverage
     python: 3.8
+  - env: TOXENV=pypy3-djmaster-coverage
+    python: pypy3
+  allow_failures:
+  - env: TOXENV=py36-djmaster-coverage
+    python: 3.6
+  - env: TOXENV=py37-djmaster-coverage
+    python: 3.7
+  - env: TOXENV=py38-djmaster-coverage
+    python: 3.8
+  - env: TOXENV=pypy3-djmaster-coverage
+    python: pypy3
 install:
 - pip install tox
 script: tox -v