diff --git a/.gitignore b/.gitignore
index 19be48e0..c394c857 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,22 @@
-*~
-.testrepository
-*.sw?
 *.pyc
+
+# Unit test / coverage reports
+.stestr
 .tox
+.venv
+
+# Packages
 *.egg-info
 dist
 build
+
+# pbr generates these
 AUTHORS
 ChangeLog
 
+# Editors
+*.sw?
+*~
+
 # Files created by releasenotes build
 releasenotes/build
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..c2c8a3a5
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./tests/
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index d3026e87..00000000
--- 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:-160} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/setup.py b/setup.py
index 70c2b3f3..097bada8 100755
--- a/setup.py
+++ b/setup.py
@@ -19,4 +19,5 @@ import setuptools
 
 setuptools.setup(
     setup_requires=['pbr'],
+    py_modules=[],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index abd86cf5..837159f5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,4 +5,4 @@
 hacking>=3.0.1,<3.1.0 # Apache-2.0
 oslotest
 
-testrepository>=0.0.18
+stestr>=2.0.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index d0960f28..7efd4682 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,8 +11,7 @@ deps =
        -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands=
-    python setup.py testr --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:venv]
 commands = {posargs}