diff --git a/.gitignore b/.gitignore
index facf719f..be930fbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,7 @@ pip-log.txt
 .coverage
 cover
 .tox
-nosetests.xml
-.testrepository
+.stestr
 
 # Translations
 *.mo
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..ba6f4521
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./oslo_service/tests
+top_path=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index b967b709..00000000
--- 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 ./ ./oslo_service $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index e1777912..9f72e902 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -65,8 +65,8 @@ smmap==0.9.0
 snowballstemmer==1.2.1
 Sphinx==1.6.2
 sphinxcontrib-websupport==1.0.1
+stestr==2.0.0
 stevedore==1.20.0
-testrepository==0.0.18
 testtools==2.2.0
 traceback2==1.4.0
 unittest2==1.1.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 5f30baff..eeedfefe 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,8 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
-requests
+requests>=2.14.2 # Apache-2.0
+stestr>=2.0.0 # Apache-2.0
 
 # These are needed for docs generation/testing
 openstackdocstheme>=1.18.1 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 995f2fbe..8a3cc739 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ deps =
 whitelist_externals = find
 commands =
     find . -type f -name "*.py[co]" -delete
-    python setup.py testr --slowest --testr-args='{posargs}'
+    stestr run --slowest {posargs}
 
 [testenv:pep8]
 basepython = python3