diff --git a/.gitignore b/.gitignore
index 963e589..1ec8ce5 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 0000000..62979e6
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./os_service_types/tests}
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 6d83b3c..0000000
--- 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/test-requirements.txt b/test-requirements.txt
index 8a3d247..b17ee11 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,6 +7,7 @@ hacking<0.13,>=0.12.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+stestr>=2.0.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 requests-mock>=1.2.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 3d61572..5406541 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,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 test --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 basepython = python3
@@ -25,7 +25,14 @@ commands = {posargs}
 
 [testenv:cover]
 basepython = python3
-commands = python setup.py test --coverage --testr-args='{posargs}'
+setenv =
+    PYTHON=coverage run --source os_service_types --parallel-mode
+commands =
+    stestr run '{posargs}'
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
+    coverage report
 
 [testenv:docs]
 basepython = python3