diff --git a/.gitignore b/.gitignore
index 218bf6a..c24b89b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ cover
 .coverage
 .tox
 nosetests.xml
+.stestr/
 .testrepository
 
 # Translations
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..7923822
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=.
+top_dir=./
diff --git a/tox.ini b/tox.ini
index bf0fd8b..57feb6d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,9 @@ setenv =
    VIRTUAL_ENV={envdir}
    BRANCH_NAME=master
    CLIENT_NAME=os-client-config
+   OS_STDOUT_CAPTURE=1
+   OS_STDERR_CAPTURE=1
+   OS_TEST_TIMEOUT=60
 deps = -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'