diff --git a/.gitignore b/.gitignore
index c49a2d48..5075ecfa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,7 @@ pip-log.txt
 # Unit test / coverage reports
 .coverage
 .tox
-.testrepository
+.stestr/
 flake8.log
 cover
 
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..d4ba6b9d
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=./barbicanclient/tests
+top_dir=./
+
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 3927088c..00000000
--- a/.testr.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-test_command=${PYTHON:-python} -m subunit.run discover -s ./barbicanclient -t . $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 7876b876..9a616b80 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -65,7 +65,7 @@ rfc3986==0.3.1
 simplejson==3.5.1
 six==1.10.0
 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/test-requirements.txt b/test-requirements.txt
index 71f81272..0426a1e9 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
 fixtures>=3.0.0 # Apache-2.0/BSD
 requests-mock>=1.2.0 # Apache-2.0
 mock>=2.0.0 # BSD
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
 oslotest>=3.2.0 # Apache-2.0
 nose>=1.3.7 # LGPL
diff --git a/tox.ini b/tox.ini
index 8c3f43c2..a8b9d9f9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@ skipsdist = True
 usedevelop = True
 install_command = pip install {opts} {packages}
 setenv =
+   PYTHON=coverage run --source barbicanclient --parallel-mode
    VIRTUAL_ENV={envdir}
 deps =
        -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
@@ -16,7 +17,10 @@ deps =
 commands =
     rm -f .testrepository/times.dbm
     coverage erase
-    python setup.py testr --coverage --testr-args='{posargs}'
+    stestr run '{posargs}'
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
     coverage report -m
 
 [testenv:debug]