diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..90f7ec3
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./octaviaclient/tests/}
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index adfd11a..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,8 +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 ./ ${OS_TEST_PATH:-./octaviaclient/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 f96b301..2ce51e8 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -66,7 +66,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
 testscenarios==0.4
 testtools==2.2.0
 traceback2==1.4.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 4f506cc..9e1bc85 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,5 +8,5 @@ coverage!=4.4,>=4.0 # Apache-2.0
 mock>=2.0.0 # BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 1eea21c..83d0673 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,8 +17,8 @@ deps =
     -r{toxinidir}/test-requirements.txt
 commands =
     find . -type f -name "*.pyc" -delete
-    rm -Rf .testrepository/times.dbm
-    python setup.py test --slowest --testr-args='{posargs}'
+    stestr run {posargs}
+    stestr slowest
 
 [testenv:pep8]
 commands = flake8 {posargs}
@@ -27,7 +27,18 @@ commands = flake8 {posargs}
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py test --coverage --testr-args='{posargs}'
+setenv =
+  {[testenv]setenv}
+  PYTHON=coverage run --source octaviaclient --parallel-mode
+whitelist_externals =
+  find
+commands =
+  find octaviaclient -type f -name "*.pyc" -delete
+  coverage erase
+  stestr run {posargs}
+  coverage combine
+  coverage html -d cover
+  coverage xml -o cover/coverage.xml
 
 [testenv:docs]
 deps =