diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst
index 328cbf50cbf..9a6e1a7ac0a 100644
--- a/doc/source/contributor/testing.rst
+++ b/doc/source/contributor/testing.rst
@@ -103,10 +103,13 @@ Or all tests in the test_volume.py file::
 
 You may also use regular expressions to run any matching tests::
 
-    tox -epy27 -- -r test_volume
+    tox -epy27 -- test_volume
 
-For more information on these options and how to run tests, please see the
-`ostestr documentation <https://docs.openstack.org/os-testr/latest/>`_.
+Additionally, when running a single test, or test-file, the `-n` argument is no
+longer required, however it may perform faster if included.
+
+For more information on these options and details about stestr, please see the
+`stestr documentation <http://stestr.readthedocs.io/en/latest/MANUAL.html>`_.
 
 Gotchas
 -------
diff --git a/tox.ini b/tox.ini
index 379df93715c..ca9f183cf0f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,13 +18,13 @@ install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstac
 
 deps = -r{toxinidir}/test-requirements.txt
 
-# By default ostestr will set concurrency
+# By default stestr will set concurrency
 # to ncpu, to specify something else use
 # the concurrency=<n> option.
 # call ie: 'tox -epy27 -- --concurrency=4'
 commands =
   find . -type f -name "*.pyc" -delete
-  ostestr {posargs}
+  stestr run '{posargs}'
 
 whitelist_externals =
   bash