diff --git a/.gitignore b/.gitignore
index e688fa7..c928acf 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 0000000..5c98bd9
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./osc_lib/tests}
+top_dir=./
+group_regex=([^\.]+\.)+
diff --git a/tox.ini b/tox.ini
index 7118e21..2c24b6d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,9 @@ install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:h
 setenv = VIRTUAL_ENV={envdir}
          BRANCH_NAME=master
          CLIENT_NAME=osc-lib
+         OS_STDOUT_CAPTURE=1
+         OS_STDERR_CAPTURE=1
+         OS_TEST_TIMEOUT=60
 deps = -r{toxinidir}/test-requirements.txt
 commands = ostestr {posargs}
 whitelist_externals = ostestr