diff --git a/test-requirements.txt b/test-requirements.txt
index 78ba8828d..3de8c186a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,10 +8,11 @@ discover
 fixtures>=0.3.14
 mock>=1.0
 python-subunit>=0.0.18
-requests-mock>=0.6.0 # Apache-2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 oslosphinx>=2.5.0 # Apache-2.0
 os-client-config>=1.2.0
+os-testr>=0.1.0
+requests-mock>=0.6.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=1.4.0
diff --git a/tox.ini b/tox.ini
index 20d5f3604..e056b7ffc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = ostestr {posargs}
 
 [testenv:functional]
 setenv = OS_TEST_PATH=./openstack/tests/functional