diff --git a/.travis.yml b/.travis.yml
index 9c44b4b..8561ec8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,14 +9,17 @@ env:
   - DJANGO=1.9
   - DJANGO=1.10
   - DJANGO=1.11
+  - DJANGO=2.0
 matrix:
   exclude:
     # Python/Django combinations that aren't officially supported
     - { python: 3.6, env: DJANGO=1.8 }
     - { python: 3.6, env: DJANGO=1.9 }
     - { python: 3.6, env: DJANGO=1.10 }
+    - { python: 2.7, env: DJANGO=2.0 }
   include:
-    - { python: 2.7, env: TOXENV=flake8 }
+    - { python: 3.6, env: TOXENV=flake8 }
+    - { python: 3.6, env: TOXENV=readme }
 
 install:
   - pip install tox-travis
diff --git a/tox.ini b/tox.ini
index 1661ee0..c36953a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,21 +9,44 @@ envlist =
     py{27,34,35}-django18
     py{27,34,35}-django110
     py{27,34,35,36}-django111
+    py{34,35,36}-django20
+    docs
+    readme
 
 [testenv]
 deps =
     django18: Django>=1.8,<1.9
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
     py27: mock
 commands =
     python runtests.py
 
+[testenv:docs]
+changedir = docs
+deps =
+    sphinx
+    sphinx-autobuild
+    sphinx_rtd_theme
+whitelist_externals = make
+commands = make html
+
 [testenv:flake8]
-basepython = python
 deps = flake8
-commands =
-    flake8
+commands = flake8
+
+[testenv:readme]
+deps = readme_renderer
+commands = python setup.py check --restructuredtext --strict
+
+[travis:env]
+DJANGO =
+    1.8: django18
+    1.9: django19
+    1.10: django110
+    1.11: django111
+    2.0: django20
 
 [flake8]
 exclude =
@@ -38,5 +61,4 @@ exclude =
     .ropeproject,
     runtests.py
     setup.py,
-
 max-line-length = 80