diff --git a/.gitignore b/.gitignore
index 061c4cb..d67fb77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ pip-log.txt
 # Unit test / coverage reports
 .coverage
 .tox
+.stestr/
 
 #Translations
 *.mo
@@ -32,7 +33,6 @@ tags
 # pbr generated files
 AUTHORS
 ChangeLog
-/.testrepository/
 
 # reno build
 releasenotes/build
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..5136daf
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./stevedore/tests
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 60477e8..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} ${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 ef81c8e..ea25162 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -24,7 +24,7 @@ smmap==0.9.0
 snowballstemmer==1.2.1
 Sphinx==1.6.5
 sphinxcontrib-websupport==1.0.1
-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 095c3e3..c641f92 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,8 +4,8 @@
 
 mock>=2.0.0 # BSD
 coverage!=4.4,>=4.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 # sphinx is needed for testing the sphinxext module
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
 # Bandit security code scanner
 bandit>=1.1.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 006d0ad..02aa5b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ deps =
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 distribute = False
-commands = python setup.py testr --testr-args='{posargs}'
+commands = stestr run {posargs}
 
 [testenv:py27]
 basepython = python2.7