diff --git a/TESTING.rst b/TESTING.rst
index 6c9204d1b0f..77b9a57546e 100644
--- a/TESTING.rst
+++ b/TESTING.rst
@@ -64,7 +64,7 @@ tests in a virtualenv::
 
 
 With `nose2`
-~~~~~~~~~~~
+~~~~~~~~~~~~
 
 You can use `nose2`_ to run individual tests, as well as use for debugging
 portions of your code::
diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst
index d7de7786dc0..21b90b4ebf2 100644
--- a/doc/source/devref/development.environment.rst
+++ b/doc/source/devref/development.environment.rst
@@ -47,5 +47,3 @@ Grab the code::
 
 
 .. include:: ../../../TESTING.rst
-
-.. include:: ./contribute.rst
diff --git a/doc/source/devref/index.rst b/doc/source/devref/index.rst
index 90394ec74cd..0467ecbdb37 100644
--- a/doc/source/devref/index.rst
+++ b/doc/source/devref/index.rst
@@ -30,6 +30,7 @@ Programming HowTos and Tutorials
     :maxdepth: 3
 
     development.environment
+    contribute
 
 
 Neutron Internals
diff --git a/tox.ini b/tox.ini
index 3779ad96f3a..dc8a5503d5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,7 +65,7 @@ commands =
 commands = {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands = sphinx-build -W -b html doc/source doc/build
 
 [flake8]
 # E125 continuation line does not distinguish itself from next logical line