diff --git a/.gitignore b/.gitignore
index bc9ce0a1e..2dcf3362d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,24 @@
-*~
-.testrepository
-*.sw?
 *.pyc
+*.qcow2
+elements/seed-stack-config/local.json
+
+# Unit test / coverage reports
+.stestr
 .tox
+.venv
+
+# Packages
 *.egg-info
 dist
-*.qcow2
 build
+
+# pbr generates these
 AUTHORS
 ChangeLog
-elements/seed-stack-config/local.json
+
+# Editors
+*.sw?
+*~
 
 # Files created by releasenotes build
 releasenotes/build
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 000000000..1b7529f03
--- /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 e77dcc7f0..000000000
--- a/.testr.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-test_command=python -m subunit.run discover . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
-
diff --git a/setup.py b/setup.py
index 70c2b3f32..097bada8f 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 41ab0c18e..4be752b59 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,6 +3,6 @@ openstackdocstheme>=2.2.1 # Apache-2.0
 
 oslotest
 sphinx>=2.0.0,!=2.1.0 # BSD
-testrepository>=0.0.18
+stestr>=2.0.0 # Apache-2.0
 reno>=3.1.0 # Apache-2.0
 pyflakes>=2.2.0
diff --git a/tox.ini b/tox.ini
index 7f9d38671..e37ec7f69 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,9 +10,7 @@ deps =
     -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
     -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}