diff --git a/.gitignore b/.gitignore
index 7693c17..c3dab8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,22 @@
 *.pyc
+
+# Packages
+*.egg*
+dist
+build
+
+# Unit test
+.tox/
+.stestr/
+.venv
+
+# pbr generates these
+AUTHORS
+ChangeLog
+
+# Editors
 *.swp
 *~
-.tox
-.testrepository
+
+# Files created by releasenotes build
+releasenotes/build
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..f12caa0
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=./heat_tempest_plugin/tests/
+top_dir=./
+group_regex=([^\.]*\.)*
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index b1f68d6..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \
-             OS_DEBUG=${OS_DEBUG:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \
-             OS_TEST_LOCK_PATH=${OS_TEST_LOCK_PATH:-${TMPDIR:-'/tmp'}} \
-             ${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./heat_tempest_plugin} $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list
-group_regex=([^\.]*\.)*
diff --git a/heat_tempest_plugin/services/clients.py b/heat_tempest_plugin/services/clients.py
index d6e1dfb..ae4cbe2 100644
--- a/heat_tempest_plugin/services/clients.py
+++ b/heat_tempest_plugin/services/clients.py
@@ -62,7 +62,7 @@
     calling various OpenStack APIs.
     """
 
-    CINDERCLIENT_VERSION = '2'
+    CINDERCLIENT_VERSION = '3'
     HEATCLIENT_VERSION = '1'
     NOVA_API_VERSION = '2.1'
     GNOCCHI_VERSION = '1'
diff --git a/test-requirements.txt b/test-requirements.txt
index be225d8..23614af 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,3 +8,4 @@
 # hacking to 3.2.0 or above. hacking 3.2.0 takes
 # care of pyflakes version compatibilty.
 pyflakes>=2.1.1
+stestr>=2.0.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 5aa6b38..07e3180 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-envlist = py37,pep8
-minversion = 3.1.1
+envlist = py3,pep8
+minversion = 3.18.0
 skipsdist = True
 ignore_basepython_conflict = True
 
@@ -10,8 +10,7 @@
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'
-           testr run {posargs}
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 setenv =