diff --git a/.gitignore b/.gitignore
index d52a0c1f8..db243da5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ cover
 *.pyc
 AUTHORS
 ChangeLog
+doc/build
 build
 dist
 cinderclient/versioninfo
diff --git a/tox.ini b/tox.ini
index a8cc00be2..510cfb5f7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,6 +22,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