diff --git a/.gitignore b/.gitignore
index b452ba48dc..4f71aa718f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ __pycache__/
 *$py.class
 
 # the files generated from tox command.
-.testrepository/
+.stestr/
 AUTHORS
 ChangeLog
 doc/build
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000000..be99e40248
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-.}
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 9c322599c3..0000000000
--- 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:-7200} \
-             ${PYTHON:-python} -m subunit.run discover ${OS_TEST_PATH:-.} $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 0e18326d81..455b581160 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -87,7 +87,7 @@ six==1.10.0
 smmap2==2.0.3
 smmap==0.9.0
 stevedore==1.28.0
-testrepository==0.0.18
+stestr==2.2.0
 testscenarios==0.4
 testtools==2.2.0
 traceback2==1.4.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 9cb7d7189d..fffd0c8204 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -19,6 +19,6 @@ python-neutronclient>=6.3.0 # Apache-2.0
 python-openstackclient>=3.12.0 # Apache-2.0
 python-swiftclient>=3.2.0 # Apache-2.0
 pytz>=2013.6 # MIT
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.2.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 b063caf875..f0520ec8fb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,8 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   find . -type d -name "__pycache__" -delete
-  python setup.py test --slowest --testr-args='{posargs}'
+  stestr run {posargs}
+  stestr slowest
 
 [testenv:debug]
 commands = oslo_debug_helper -t kolla/tests {posargs}
@@ -29,8 +30,13 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_COVER_BRANCHES=1
          NOSE_COVER_HTML=1
          NOSE_COVER_HTML_DIR={toxinidir}/cover
-commands = python setup.py testr --coverage --testr-args='{posargs}'
-           coverage report --show-missing
+         PYTHON=coverage run --source kolla --parallel-mode
+commands =
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
+    coverage report --show-missing
 
 [testenv:pep8]
 basepython = python3
@@ -81,8 +87,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.BuildTestCentosBinary
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.BuildTestCentosBinary
   {toxinidir}/tools/dump_info.sh
 
 [testenv:build-centos-source]
@@ -92,8 +98,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.BuildTestCentosSource
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.BuildTestCentosSource
   {toxinidir}/tools/dump_info.sh
 
 [testenv:build-ubuntu-binary]
@@ -103,8 +109,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.BuildTestUbuntuBinary
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.BuildTestUbuntuBinary
   {toxinidir}/tools/dump_info.sh
 
 [testenv:build-ubuntu-source]
@@ -114,8 +120,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.BuildTestUbuntuSource
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.BuildTestUbuntuSource
   {toxinidir}/tools/dump_info.sh
 
 [testenv:build-debian-binary]
@@ -125,8 +131,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.BuildTestDebianBinary
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.BuildTestDebianBinary
   {toxinidir}/tools/dump_info.sh
 
 [testenv:build-debian-source]
@@ -136,8 +142,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.BuildTestDebianSource
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.BuildTestDebianSource
   {toxinidir}/tools/dump_info.sh
 
 [testenv:build-oraclelinux-binary]
@@ -147,8 +153,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.BuildTestOracleLinuxBinary
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.BuildTestOracleLinuxBinary
   {toxinidir}/tools/dump_info.sh
 
 [testenv:build-oraclelinux-source]
@@ -158,8 +164,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.BuildTestOracleLinuxSource
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.BuildTestOracleLinuxSource
   {toxinidir}/tools/dump_info.sh
 
 [testenv:deploy-centos-binary]
@@ -169,8 +175,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.DeployTestCentosBinary
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.DeployTestCentosBinary
   {toxinidir}/tools/deploy_aio.sh centos binary
   {toxinidir}/tools/dump_info.sh
 
@@ -181,8 +187,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.DeployTestCentosSource
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.DeployTestCentosSource
   {toxinidir}/tools/deploy_aio.sh centos source
   {toxinidir}/tools/dump_info.sh
 
@@ -193,8 +199,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.DeployTestOracleLinuxBinary
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.DeployTestOracleLinuxBinary
   {toxinidir}/tools/deploy_aio.sh oraclelinux binary
   {toxinidir}/tools/dump_info.sh
 
@@ -205,8 +211,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.DeployTestOracleLinuxSource
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.DeployTestOracleLinuxSource
   {toxinidir}/tools/deploy_aio.sh oraclelinux source
   {toxinidir}/tools/dump_info.sh
 
@@ -217,8 +223,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.DeployTestUbuntuBinary
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.DeployTestUbuntuBinary
   {toxinidir}/tools/deploy_aio.sh ubuntu binary
   {toxinidir}/tools/dump_info.sh
 
@@ -229,8 +235,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.DeployTestUbuntuSource
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.DeployTestUbuntuSource
   {toxinidir}/tools/deploy_aio.sh ubuntu source
   {toxinidir}/tools/dump_info.sh
 
@@ -241,8 +247,8 @@ setenv =
   DOCKER_BUILD_TEST=1
 commands =
   find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
-  bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-  testr run test_build.BuildTestUbuntuSource
+  bash -c "if [ ! -d .stestr ]; then stestr init; fi"
+  stestr run test_build.BuildTestUbuntuSource
   {toxinidir}/tools/dump_info.sh
 
 [testenv:genconfig]