diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..6c0d913
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${TEST_PATH:-./tripleo_common_tempest_plugin/tests}
+top_dir=./
diff --git a/tox.ini b/tox.ini
index 9b2eec5..8916669 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,14 +4,16 @@ envlist = py36,py27,pep8
 skipsdist = True
 
 [testenv]
-deps = -r{toxinidir}/test-requirements.txt
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-commands =
-    find . -type f -name "*.py[c|o]" -delete
-    ostestr --slowest --regex 'tripleo_common_tempest_plugin.*' {posargs}
-
-whitelist_externals = find
+install_command = pip install {opts} {packages}
+deps =
+       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands = stestr run {posargs}
+whitelist_externals =
+    bash
+    tox
 
 [testenv:pep8]
 basepython = python3