diff --git a/.gitignore b/.gitignore
index bc36b2b..5e1aa40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,7 @@ cover/
 !.coveragerc
 .tox
 nosetests.xml
-.testrepository
+.stestr
 .venv
 
 # Translations
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..5fe0940
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${TEST_PATH:-./paunch/tests}
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 6d83b3c..0000000
--- 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/test-requirements.txt b/test-requirements.txt
index 7ad08e8..3d0a697 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
 coverage>=4.0,!=4.4  # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0
-testrepository>=0.0.18  # Apache-2.0/BSD
+stestr>=2.0.0  # Apache-2.0
 testscenarios>=0.4  # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 
diff --git a/tox.ini b/tox.ini
index f566e36..0dc0066 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,8 +14,7 @@ whitelist_externals =
 commands =
     python -m paunch --version
     paunch --version
-    bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'
-    testr run {posargs}
+    stestr run {posargs}
 
 [testenv:pep8]
 basepython = python3
@@ -27,7 +26,16 @@ commands = {posargs}
 
 [testenv:cover]
 basepython = python3
-commands = python setup.py test --coverage --testr-args='{posargs}'
+setenv =
+  PYTHON=coverage run --source paunch --parallel-mode
+  HOME={envdir}
+commands =
+  coverage erase
+  stestr run --color {posargs}
+  coverage combine
+  coverage html -d cover
+  coverage xml -o cover/coverage.xml
+  coverage report
 
 [testenv:docs]
 basepython = python3