diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000000..55eaac3978
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./openstack_requirements/tests
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index ad0695f865..0000000000
--- a/.testr.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ openstack_requirements/ $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/test-requirements.txt b/test-requirements.txt
index 8ef254feb8..4582848efe 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 # NOTE: These are requirements for testing the requirements project only
 #       See global-requirements for the actual requirements list
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=1.0.0  # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 virtualenv>=14.0.6 # MIT
diff --git a/tox.ini b/tox.ini
index 67e3a03a69..bfc62fe301 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
-  python setup.py testr --slowest --testr-args='{posargs}'
+  stestr run {posargs}
 
 [testenv:py27-check-uc]
 install_command = pip install -U {opts} -c {toxinidir}/upper-constraints.txt {packages}