diff --git a/.gitignore b/.gitignore
index 6638d3d4..29d05016 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,5 +16,6 @@ run_tests.err.log
 .testrepository
 .tox
 doc/source/api
+doc/build
 *.egg
 glanceclient/versioninfo
diff --git a/tox.ini b/tox.ini
index 5c976773..b2182ffe 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