diff --git a/.travis.yml b/.travis.yml
index 08ca870a5..f61c936a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,12 @@ env:
 - TOXENV=trunk
 - TOXENV=pypy
 - TOXENV=py33
+- TOXENV=docs
 matrix:
   allow_failures:
   - env: TOXENV=pypy
   - env: TOXENV=py33
+  - env: TOXENV=docs
 install:
 - ./.travis-workarounds.sh
 - pip install tox
diff --git a/tox.ini b/tox.ini
index 597abfb5d..b31e3eaa6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, pypy, precise, trunk, py33
+envlist = py27, pypy, precise, trunk, py33, docs
 indexserver =
     HPK = https://devpi.net/hpk/dev/
 
@@ -56,3 +56,11 @@ deps =
 commands =
     bin/runtests.bat []
 sitepackages = False
+
+[testenv:docs]
+changedir = docs
+deps =
+    Sphinx
+commands =
+    sphinx-build -W -b html . build/html
+    sphinx-build -W -b linkcheck . build/linkcheck