diff --git a/.gitignore b/.gitignore
index 11a4e84b..17612fa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ sdist
 .cache
 .coverage
 .tox
-.testrepository
+.stestr/
 
 # pbr generates these
 AUTHORS
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..dcdf16e8
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=./tests
+top_dir=./
+
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 6d83b3c4..00000000
--- a/.testr.conf
+++ /dev/null
@@ -1,7 +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 ./ . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 3917dad7..d690313f 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -39,7 +39,7 @@ snowballstemmer==1.2.1
 Sphinx==1.6.5
 sphinxcontrib-websupport==1.0.1
 stevedore==1.20.0
-testrepository==0.0.18
+stestr==2.0.0
 testtools==2.2.0
 traceback2==1.4.0
 unittest2==1.1.0
diff --git a/test-requirements.txt b/test-requirements.txt
index f16aff25..dcc8a4cd 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,7 +12,7 @@ pylint==1.7.1 # GPLv2
 
 reno>=2.5.0 # Apache-2.0
 openstackdocstheme>=1.18.1 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 
 # mock object framework
 mock>=2.0.0 # BSD
diff --git a/tox.ini b/tox.ini
index 6d9541e3..dc852586 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ deps = scrapy>=1.0.0
        -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
        -r{toxinidir}/test-requirements.txt
        -r{toxinidir}/requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 commands =