diff --git a/.gitignore b/.gitignore
index 28420f97..2ecc6266 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ ChangeLog
 # Editors
 *~
 .*.swp
+/.stestr/
 /.testrepository/
 /cover/
-.coverage.*
\ No newline at end of file
+.coverage.*
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..050a65c0
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./cliff
+top_dir=./
diff --git a/tox.ini b/tox.ini
index 6564c09e..4cdef3c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,9 @@ setenv =
     VIRTUAL_ENV={envdir}
     BRANCH_NAME=master
     CLIENT_NAME=cliff
+    OS_STDOUT_CAPTURE=1
+    OS_STDERR_CAPTURE=1
+    OS_TEST_TIMEOUT=60
 passenv =
     ZUUL_CACHE_DIR
 distribute = False