diff --git a/.gitignore b/.gitignore
index 2c0139cf6..54cdd4fcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 *~
 .coverage
 .idea
+.stestr/
 .testrepository
 .tox
 AUTHORS
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 000000000..75aec670d
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./openstackclient/tests/unit}
+top_dir=./
+group_regex=([^\.]+\.)+
diff --git a/tox.ini b/tox.ini
index 7716ffb4c..3c1b3c387 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,9 @@ usedevelop = True
 install_command =
     {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
+         OS_STDOUT_CAPTURE=1
+         OS_STDERR_CAPTURE=1
+         OS_TEST_TIMEOUT=60
 deps = -r{toxinidir}/test-requirements.txt
 commands = ostestr {posargs}
 whitelist_externals = ostestr