diff --git a/doc/source/index.rst b/doc/source/index.rst
index 80d2267..7807170 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -6,7 +6,8 @@
 Welcome to openstack's documentation!
 ========================================================
 
-Contents:
+Contents
+--------
 
 .. toctree::
    :maxdepth: 2
@@ -17,7 +18,7 @@ Contents:
    contributing
 
 Indices and tables
-==================
+-------------------
 
 * :ref:`genindex`
 * :ref:`modindex`
diff --git a/tox.ini b/tox.ini
index de73d26..07c94cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ commands = python setup.py test --coverage --testr-args='{posargs}'
 
 [testenv:docs]
 basepython = python3
-commands = python setup.py build_sphinx
+commands = sphinx-build -W -b html -d doc/buld/doctrees doc/source doc/build/html
 
 [testenv:releasenotes]
 basepython = python3