diff --git a/doc/source/devref/client_command_extensions.rst b/doc/source/devref/client_command_extensions.rst
index b89078eb3..79025be39 100644
--- a/doc/source/devref/client_command_extensions.rst
+++ b/doc/source/devref/client_command_extensions.rst
@@ -70,6 +70,7 @@ neutronclient.extension entry_point
 
 To activate the commands in a specific extension module, add an entry in
 setup.cfg under neutronclient.extension. For example::
-  [entry_points]
-  neutronclient.extension =
-      fox_sockets = neutronclient.neutron.v2_0.contrib._fox_sockets
+
+    [entry_points]
+    neutronclient.extension =
+        fox_sockets = neutronclient.neutron.v2_0.contrib._fox_sockets
diff --git a/tox.ini b/tox.ini
index c7291ef04..452b751f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,8 +36,7 @@ setenv =
 commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:docs]
-commands=
-    python setup.py build_sphinx
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
 commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html