diff --git a/.travis.yml b/.travis.yml
index 615c11f..656e70c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,46 +1,57 @@
 os: linux
+dist: xenial
 language: python
-python: 3.5
 cache: pip
-env:
-  - TOX_ENV=py27-dj17-sqlite
-  - TOX_ENV=py27-dj17-postgres
-  - TOX_ENV=py27-dj18-sqlite
-  - TOX_ENV=py27-dj18-postgres
-  - TOX_ENV=py27-dj19-sqlite
-  - TOX_ENV=py27-dj19-postgres
-  - TOX_ENV=py27-dj110-sqlite
-  - TOX_ENV=py27-dj110-postgres
-  - TOX_ENV=py27-dj111-sqlite
-  - TOX_ENV=py27-dj111-postgres
-  # - TOX_ENV=py34-dj17-sqlite
-  # - TOX_ENV=py34-dj17-postgres
-  # - TOX_ENV=py34-dj18-sqlite
-  # - TOX_ENV=py34-dj18-postgres
-  # - TOX_ENV=py34-dj19-sqlite
-  # - TOX_ENV=py34-dj19-postgres
-  # - TOX_ENV=py34-dj110-sqlite
-  # - TOX_ENV=py34-dj110-postgres
-  # - TOX_ENV=py34-dj111-sqlite
-  # - TOX_ENV=py34-dj111-postgres
-  # - TOX_ENV=py34-dj20-sqlite
-  # - TOX_ENV=py34-dj20-postgres
-  - TOX_ENV=py35-dj18-sqlite
-  - TOX_ENV=py35-dj18-postgres
-  - TOX_ENV=py35-dj19-sqlite
-  - TOX_ENV=py35-dj19-postgres
-  - TOX_ENV=py35-dj110-sqlite
-  - TOX_ENV=py35-dj110-postgres
-  - TOX_ENV=py35-dj111-sqlite
-  - TOX_ENV=py35-dj111-postgres
-  - TOX_ENV=py35-dj20-sqlite
-  - TOX_ENV=py35-dj20-postgres
-  - TOX_ENV=py35-dj21-sqlite
-  - TOX_ENV=py35-dj21-postgres
-  # - TOX_ENV=py35-dj22-sqlite
-  - TOX_ENV=py35-dj22-postgres
 jobs:
   include:
+    - python: "2.7"
+      env: TOX_ENV=py27-dj17-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj17-postgres
+    - python: "2.7"
+      env: TOX_ENV=py27-dj18-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj18-postgres
+    - python: "2.7"
+      env: TOX_ENV=py27-dj19-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj19-postgres
+    - python: "2.7"
+      env: TOX_ENV=py27-dj110-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj110-postgres
+    - python: "2.7"
+      env: TOX_ENV=py27-dj111-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj111-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj18-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj18-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj19-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj19-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj110-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj110-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj111-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj111-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj20-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj20-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj21-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj21-postgres
+    # - python: "3.5"
+    #   env: TOX_ENV=py35-dj22-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj22-postgres
     - python: "3.6"
       env: TOX_ENV=py36-dj111-sqlite
     - python: "3.6"
@@ -66,52 +77,36 @@ jobs:
     - python: "3.6"
       env: TOX_ENV=py36-djmaster-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj20-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj20-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj21-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj21-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj22-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj22-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj30-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj30-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-djmaster-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-djmaster-postgres
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-dj22-sqlite
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-dj22-postgres
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-dj30-sqlite
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-dj30-postgres
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-djmaster-sqlite
     - python: "3.8"
-      dist: xenial
       env: TOX_ENV=py38-djmaster-postgres
   allow_failures:
     - env: TOX_ENV=py36-djmaster-sqlite
diff --git a/tox.ini b/tox.ini
index ac2bb30..166c814 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,15 +9,15 @@ envlist =
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
-    dj17: Django >= 1.7, < 1.8
-    dj18: Django >= 1.8, < 1.9
-    dj19: Django >= 1.9, < 1.10
-    dj110: Django >= 1.10, < 1.11
-    dj111: Django >= 1.11, < 1.12
-    dj20: Django >= 2.0, < 2.1
-    dj21: Django >= 2.1, < 2.2
-    dj22: Django >= 2.2, < 2.3
-    dj30: Django >= 3.0, < 3.1
+    dj17: Django == 1.7.*
+    dj18: Django == 1.8.*
+    dj19: Django == 1.9.*
+    dj110: Django == 1.10.*
+    dj111: Django == 1.11.*
+    dj20: Django == 2.0.*
+    dj21: Django == 2.1.*
+    dj22: Django == 2.2.*
+    dj30: Django == 3.0.*
     djmaster: https://github.com/django/django/archive/master.tar.gz
     # mysql: mysqlclient
     postgres: psycopg2-binary