diff --git a/.travis.yml b/.travis.yml
index 82e6449..74d4965 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,18 @@
 language: python
 
-python:
-  - 3.4
-  - 3.5
-  - 3.6
+# https://github.com/travis-ci/travis-ci/issues/9815#issuecomment-411073985
+matrix:
+  include:
+    - python: 3.4
+    - python: 3.5
+    - python: 3.6
+    - python: 3.7
+      dist: xenial
+      sudo: true
 
-env:
-  - DJANGO: django>=1.11,<2.0
-  - DJANGO: django>=2.0
+install: pip install tox-travis coverage codacy-coverage
 
-before_install:
-  - pip install coverage codacy-coverage
-  - coverage erase
-
-install:
-  - npm install
-  - pip install $DJANGO
-  - pip install -e .[standalone]
-
-script:
-  - coverage run --append runtests.py
+script: tox
 
 after_success:
   - coverage xml
diff --git a/tox.ini b/tox.ini
index f53ac5b..e99697f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,10 @@
 toxworkdir=/tmp/tox/dpaste
 skip_missing_interpreters=True
 envlist=
+    readme
     coverage_setup
-    py{34,35,36}-django-{111,20}
+    py{34,35,36,37}-django-{111,20}
+    py{35,36,37}-django-{21}
     coverage_report
 
 [testenv]
@@ -18,16 +20,28 @@ commands=
 
 deps=
     # Django versions
-    django-111: django>=1.11,<1.12
+    django-111: django>=1.11,<2.0
     django-20: django==2.0
+    django-21: django==2.1
 
 [testenv:coverage_setup]
+skip_install = True
 basepython=python3.6
 commands=
     coverage erase
 
 [testenv:coverage_report]
+skip_install = True
 basepython=python3.6
 commands=
     coverage report
     coverage html
+
+[testenv:readme]
+skip_install = True
+deps =
+    docutils
+    Pygments
+commands =
+    rst2html.py --report=info --halt=warning README.rst /dev/null
+    rst2html.py --report=info --halt=warning CHANGELOG.rst /dev/null