diff --git a/.gitignore b/.gitignore
index 8cef338..1f39df9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ develop-eggs
 .installed.cfg
 
 # Other
+.testrepository
 .tox
 .*.swp
 .coverage
diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 0000000..1641f86
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/setup.py b/setup.py
index 59ea051..ed20223 100755
--- a/setup.py
+++ b/setup.py
@@ -17,5 +17,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires = ['d2to1'],
-    d2to1 = True)
+    setup_requires=['d2to1'],
+    d2to1=True)
diff --git a/tox.ini b/tox.ini
index 4872ed8..18e9db3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pep8
+envlist = py26,py27,pep8,pyflakes
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -17,7 +17,7 @@ downloadcache = ~/cache/pip
 
 [testenv:pep8]
 commands =
-  pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc .
+  pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,*.egg .
 
 [testenv:pyflakes]
 deps = pyflakes
@@ -26,8 +26,7 @@ commands = pyflakes oslo
 [testenv:cover]
 setenv = VIRTUAL_ENV={envdir}
 commands =
-  python setup.py testr --coverage \
-    --testr-args='^(?!.*test.*coverage).*$'
+  python setup.py testr --coverage
 
 [testenv:venv]
 commands = {posargs}