diff --git a/.gitignore b/.gitignore
index e1c21d0b..5eacd30b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ ChangeLog
 openstack/versioninfo
 *.egg*
 .testrepository/
+.stestr/
 .project
 .pydevproject
 *.mo
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..9d91c0b8
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./oslo_policy/tests
+top_path=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index d7af3a19..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_policy $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 8347d615..daf4ff57 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -47,6 +47,7 @@ requests-mock==1.1.0
 requestsexceptions==1.2.0
 rfc3986==0.3.1
 six==1.10.0
+stestr==2.0.0
 smmap==0.9.0
 snowballstemmer==1.2.1
 Sphinx==1.6.5
diff --git a/test-requirements.txt b/test-requirements.txt
index 704e6039..d8db8f7b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,13 +4,14 @@
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 requests-mock>=1.1.0 # Apache-2.0
+stestr>=2.0.0 # Apache-2.0
 
 # computes code coverage percentages
 coverage!=4.4,>=4.0 # Apache-2.0
 
 # These are needed for docs generation
 openstackdocstheme>=1.18.1 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
 
 reno>=2.5.0 # Apache-2.0
 
diff --git a/tox.ini b/tox.ini
index 58487c19..7b24a9c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:py27]
 basepython = python2.7