diff --git a/.gitignore b/.gitignore
index a407c522..a3132589 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ python_glanceclient.egg-info
 ChangeLog
 run_tests.err.log
 .testrepository
+.stestr/
 .tox
 doc/source/api
 doc/build
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..44d74329
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./glanceclient/tests/unit
+top_path=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index a2f6f4d5..00000000
--- a/.testr.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./glanceclient/tests/unit} $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index eac0111d..a02f7fbd 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -69,10 +69,9 @@ six==1.10.0
 snowballstemmer==1.2.1
 Sphinx==1.6.2
 sphinxcontrib-websupport==1.0.1
-stestr==1.0.0
+stestr==2.0.0
 stevedore==1.20.0
 tempest==17.1.0
-testrepository==0.0.18
 testscenarios==0.4
 testtools==2.2.0
 traceback2==1.4.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 36381864..04243937 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 mock>=2.0.0 # BSD
 os-client-config>=1.28.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
 testscenarios>=0.4 # Apache-2.0/BSD
 fixtures>=3.0.0 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 98cfae39..5d4c0950 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ deps =
        -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 commands = flake8
@@ -36,7 +36,7 @@ whitelist_externals =
     bash
 commands =
     bash tools/fix_ca_bundle.sh
-    python setup.py testr --testr-args='{posargs}'
+    stestr run --slowest {posargs}
 
 [testenv:functional-v1]
 # TODO(rosmaita): remove this testenv at the beginning
@@ -48,11 +48,16 @@ whitelist_externals =
     bash
 commands =
     bash tools/fix_ca_bundle.sh
-    python setup.py testr --testr-args='{posargs}'
+    stestr run --slowest {posargs}
 
 [testenv:cover]
-commands = python setup.py testr --coverage --testr-args='{posargs}'
-           coverage report
+setenv =
+    PYTHON=coverage run --source glanceclient --parallel-mode
+commands =
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:docs]
 deps = -r{toxinidir}/doc/requirements.txt