diff --git a/.travis.yml b/.travis.yml
index b30d13bed..09da120bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ env:
 - TOXENV=py27
 - TOXENV=precise
 - TOXENV=py33
+- TOXENV=docs
 install:
 - "./.travis-workarounds.sh"
 - pip install -U tox
diff --git a/tox.ini b/tox.ini
index a5b9ad9e3..5c8c8c78d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -57,10 +57,19 @@ deps =
 basepython = python3.4
 deps = {[testenv:py33]deps}
 
-[testenv:docs]
+[docs]
 changedir = docs
 deps =
     Sphinx
+
+[testenv:docs]
+changedir = {[docs]changedir}
+deps = {[docs]deps}
 commands =
-    sphinx-build -W -b html . build/html
-    sphinx-build -W -b linkcheck . build/linkcheck
+    sphinx-build -W -b html . {envtmpdir}/html
+
+[testenv:docs-links]
+changedir = {[docs]changedir}
+deps = {[docs]deps}
+commands =
+    sphinx-build -W -b linkcheck . {envtmpdir}/linkcheck