diff --git a/.gitignore b/.gitignore
index baab79c..fe20fb6 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 0000000..25c7145
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./oslo_concurrency/tests/unit
+top_path=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index fb62267..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
\ No newline at end of file
diff --git a/lower-constraints.txt b/lower-constraints.txt
index f917ff5..a42f65e 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -54,7 +54,7 @@ snowballstemmer==1.2.1
 Sphinx==1.6.2
 sphinxcontrib-websupport==1.0.1
 stevedore==1.20.0
-testrepository==0.0.18
+stestr==2.0.0
 testtools==2.2.0
 traceback2==1.4.0
 unittest2==1.1.0
diff --git a/oslo_concurrency/lockutils.py b/oslo_concurrency/lockutils.py
index e896a1a..87db4ce 100644
--- a/oslo_concurrency/lockutils.py
+++ b/oslo_concurrency/lockutils.py
@@ -348,7 +348,7 @@ def _lock_wrapper(argv):
     lockutils-wrapper
 
     If you run this:
-        lockutils-wrapper python setup.py testr <etc>
+        lockutils-wrapper stestr run <etc>
 
     a temporary directory will be created for all your locks and passed to all
     your tests in an environment variable. The temporary dir will be deleted
diff --git a/test-requirements.txt b/test-requirements.txt
index a6f68de..fb68ff2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,6 +7,7 @@ oslotest>=3.2.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
 fixtures>=3.0.0 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 
 # These are needed for docs generation
 openstackdocstheme>=1.18.1 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 0447e70..7ac6bee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,8 +10,8 @@ deps =
  -r{toxinidir}/requirements.txt
 # We want to support both vanilla stdlib and eventlet monkey patched
 commands =
-    lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'
-    env TEST_EVENTLET=1 lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'
+    lockutils-wrapper stestr run --slowest {posargs}
+    env TEST_EVENTLET=1 lockutils-wrapper stestr run --slowest {posargs}
 
 [testenv:py27]
 basepython = python2.7