diff --git a/.gitignore b/.gitignore
index 7705c60..d9326df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,7 @@ pip-log.txt
 .coverage
 .tox
 nosetests.xml
-.testrepository
+.stestr/
 .venv
 
 # Translations
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..56ca178
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./vitrageclient/tests/
+top_dir=./
\ No newline at end of file
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/lower-constraints.txt b/lower-constraints.txt
index ffae7fe..80e3bfb 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -36,6 +36,7 @@ PyYAML==3.12
 requests==2.14.2
 requestsexceptions==1.2.0
 simplejson==3.5.1
+stestr==2.0.0
 stevedore==1.20.0
 testrepository==0.0.18
 testscenarios==0.5.0
diff --git a/test-requirements.txt b/test-requirements.txt
index d071f6d..04bbf93 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,6 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0
 coverage>=4.5.1 # Apache-2.0
 python-subunit>=1.2.0 # Apache-2.0/BSD
 oslotest>=3.3.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.5.0 # Apache-2.0/BSD
 testtools>=2.3.0 # MIT
diff --git a/tox.ini b/tox.ini
index 3aa2cd6..3e81bfa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,7 @@ deps =
        -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = /bin/rm -f .testrepository/times.dbm
-           python setup.py test --slowest --testr-args='{posargs}'
+commands = stestr run --slowest '{posargs}'
 
 [testenv:pep8]
 commands = flake8
@@ -23,7 +22,7 @@ commands = flake8
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py test --coverage --testr-args='{posargs}'
+commands = stestr run --coverage '{posargs}'
 
 [testenv:docs]
 deps =