diff --git a/.gitignore b/.gitignore
index b411aa1..8ef0b3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ coverage.xml
 *.py[co]
 .DS_Store
 *.log
-.testrepository
+.stestr/
 subunit.log
 .eggs
 AUTHORS
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..dcdf16e
--- /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 72eec9c..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \
-             ${PYTHON:-python} -m subunit.run discover -s ${OS_TEST_PATH:-./tests/} -t . $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list
-group_regex=([^\.]+\.)+
diff --git a/requirements.txt b/requirements.txt
index 3d8b678..f734734 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 oslosphinx>=4.7.0  # Apache-2.0
 pbr>=1.8  # Apache-2.0
 sphinx>=1.2.1,!=1.3b1,<1.4  # BSD
-testrepository>=0.0.18  # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testtools>=1.4.0  # MIT
 yasfb>=0.5.1
diff --git a/tox.ini b/tox.ini
index 5ea36b4..1285095 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,9 +10,8 @@ install_command = pip install -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
 whitelist_externals = find
 commands =
-  rm -f .testrepository
   find . -type f -name "*.pyc" -delete
-  python setup.py testr --slowest --testr-args='{posargs}'
+  stestr run --slowest {posargs}
 
 [testenv:venv]
 basepython = python3