diff --git a/.gitignore b/.gitignore
index 963e589a..1ec8ce55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,7 @@ cover/
 !.coveragerc
 .tox
 nosetests.xml
-.testrepository
+.stestr/
 .venv
 
 # Translations
@@ -55,4 +55,4 @@ ChangeLog
 .*sw?
 
 # Files created by releasenotes build
-releasenotes/build
\ No newline at end of file
+releasenotes/build
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..7e43151c
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./sushy_tools/tests
+top_dir=.
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 6d83b3c4..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 ./ . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 57382be4..7fe41070 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -45,7 +45,7 @@ snowballstemmer==1.2.1
 Sphinx==1.6.2
 sphinxcontrib-websupport==1.0.1
 stevedore==1.20.0
-testrepository==0.0.18
+stestr==1.0.0
 testscenarios==0.4
 testtools==2.2.0
 traceback2==1.4.0
diff --git a/test-requirements.txt b/test-requirements.txt
index fcae2dc8..dedd86bd 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,6 +9,6 @@ python-subunit>=1.0.0 # Apache-2.0/BSD
 sphinx!=1.6.6,>=1.6.2 # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=1.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
diff --git a/tox.ini b/tox.ini
index 1b793436..1e7ebf24 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,8 @@ setenv =
 deps =
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
+commands = stestr run {posargs}
+           stestr slowest
 
 [testenv:pep8]
 basepython = python3
@@ -24,7 +25,14 @@ commands = {posargs}
 
 [testenv:cover]
 basepython = python3
-commands = python setup.py test --coverage --testr-args='{posargs}'
+setenv =
+   {[testenv]setenv}
+   PYTHON=coverage run --source sushy_tools --parallel-mode
+commands =
+   stestr run {posargs}
+   coverage combine
+   coverage html -d cover
+   coverage xml -o cover/coverage.xml
 
 [testenv:docs]
 basepython = python3