diff --git a/.travis.yml b/.travis.yml
index 7969d1b..00ecbfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,63 @@
 language: python
 
-python:
-  - 2.7
-  - 3.5
+cache:
+  directories:
+    - $HOME/.cache/pip
+before_cache:
+  - rm -f $HOME/.cache/pip/log/debug.log
 
-addons:
-  apt:
-    sources:
-      - deadsnakes
-    packages:
-      - python3.5
+matrix:
+    include:
+      # py27
+      - python: 2.7
+        env: TOX_ENV=py27-django18, DJANGO_VERSION=1.8.19
+      - python: 2.7
+        env: TOX_ENV=py27-django19, DJANGO_VERSION=1.9.13
+      - python: 2.7
+        env: TOX_ENV=py27-django110, DJANGO_VERSION=1.10.8
+      - python: 2.7
+        env: TOX_ENV=py27-django111, DJANGO_VERSION=1.11.20
+      # py34
+      - python: 3.4
+        env: TOX_ENV=py34-django111, DJANGO_VERSION=1.11.20
+      - python: 3.4
+        env: TOX_ENV=py34-django20, DJANGO_VERSION=2.0.13
+      # py35
+      - python: 3.5
+        env: TOX_ENV=py35-django111, DJANGO_VERSION=1.11.20
+      - python: 3.5
+        env: TOX_ENV=py35-django20, DJANGO_VERSION=2.0.13
+      - python: 3.5
+        env: TOX_ENV=py35-django21, DJANGO_VERSION=2.1.7
+      # py36
+      - python: 3.6
+        env: TOX_ENV=py36-django111, DJANGO_VERSION=1.11.20
+      - python: 3.6
+        env: TOX_ENV=py36-django20, DJANGO_VERSION=2.0.13
+      - python: 3.6
+        env: TOX_ENV=py36-django21, DJANGO_VERSION=2.1.7
+      # py37
+      - python: 3.7
+        dist: xenial
+        sudo: true
+        env: TOX_ENV=py37-django111, DJANGO_VERSION=1.11.20
+      - python: 3.7
+        dist: xenial
+        sudo: true
+        env: TOX_ENV=py37-django20, DJANGO_VERSION=2.0.13
+      - python: 3.7
+        dist: xenial
+        sudo: true
+        env: TOX_ENV=py37-django21, DJANGO_VERSION=2.1.7
 
-env:
-  - DJANGO_VERSION=1.6.11
-  - DJANGO_VERSION=1.7.11
-  - DJANGO_VERSION=1.8.18
-  - DJANGO_VERSION=1.9.13
-  - DJANGO_VERSION=1.10.6
-  - DJANGO_VERSION=1.11.3
+script: tox -e $TOX_ENV
 
 install:
+  - pip install pip setuptools wheel -U
   - pip install -q Django==$DJANGO_VERSION
-  - pip install beautifulsoup4
+  - python setup.py -q install
   - pip install coveralls
   - pip install tox
-  - python setup.py -q install
-
-script:
-  - tox
 
 after_success:
   - coveralls
diff --git a/tox.ini b/tox.ini
index 39629f3..02dfb70 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,8 @@
 [tox]
 envlist =
-    py{27}-django16
-    py{27}-django17
-    py{27}-django18
-    py{27}-django19
-    py{27}-django110
-    py{27}-django111
-    py{35}-django18
-    py{35}-django19
-    py{35}-django110
-    py{35}-django111
+    py{27}-django{18,19,110,111},
+    py{34}-django{111,20}
+    py{35,36,37}-django{111,20,21}
 
 [testenv]
 setenv =
@@ -18,18 +11,19 @@ setenv =
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 basepython =
     py27: python2.7
+    py34: python3.4
     py35: python3.5
+    py36: python3.6
+    py37: python3.7
+commands =
+    coverage run --source=real_content {envbindir}/django-admin.py test real_content
+    coverage report -m
 deps =
     coverage
-    django-real-content
-    django16: Django>=1.6, <1.7
-    django17: Django>=1.7, <1.8
+    coveralls
     django18: Django>=1.8, <1.9
     django19: Django>=1.9, <1.10
     django110: Django>=1.10, <1.11
-    django111: Django>=1.11, <1.12
-    coveralls
-commands =
-    coverage run --source=real_content {envbindir}/django-admin.py test real_content
-    coverage report -m
-    coveralls
+    django111: Django>=1.11,<1.12
+    django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2