diff --git a/.gitignore b/.gitignore
index a03c8419..ea9789f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ ChangeLog
 run_tests.err.log
 .tox
 doc/source/api
+doc/build
 *.egg
 heatclient/versioninfo
 *.egg-info
diff --git a/tox.ini b/tox.ini
index d18f1fdf..c23bf855 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,6 +24,10 @@ commands = {posargs}
 [testenv:cover]
 commands = python setup.py testr --coverage --testr-args='{posargs}'
 
+[testenv:docs]
+commands=
+    python setup.py build_sphinx
+
 [tox:jenkins]
 downloadcache = ~/cache/pip