diff --git a/tox.ini b/tox.ini
index e3438e28727..ad8f449eff0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,36 +3,40 @@ envlist = py26,py27,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
+         NOSE_WITH_OPENSTACK=1
 deps = -r{toxinidir}/tools/pip-requires
        -r{toxinidir}/tools/test-requires
 commands = /bin/bash run_tests.sh -N -P
 
-[testenv:hudson]
-downloadcache = ~/cache/pip
-
 [testenv:pep8]
 deps = pep8
-commands = /bin/bash run_tests.sh -N --pep8
-
-[testenv:coverage]
-commands = /bin/bash run_tests.sh -N -P --coverage
+commands = pep8 --repeat --show-source cinder setup.py
 
 [testenv:venv]
 commands = {posargs}
 
+[testenv:cover]
+commands = /bin/bash run_tests.sh -N -P --coverage
+
+[tox:jenkins]
+downloadcache = ~/cache/pip
+
 [testenv:jenkins26]
 basepython = python2.6
+setenv = NOSE_WITH_XUNIT=1
 deps = file://{toxinidir}/.cache.bundle
 
 [testenv:jenkins27]
 basepython = python2.7
+setenv = NOSE_WITH_XUNIT=1
 deps = file://{toxinidir}/.cache.bundle
 
 [testenv:jenkinscover]
 deps = file://{toxinidir}/.cache.bundle
+setenv = NOSE_WITH_XUNIT=1
 commands = /bin/bash run_tests.sh -N --coverage
 
 [testenv:jenkinsvenv]
 deps = file://{toxinidir}/.cache.bundle
+setenv = NOSE_WITH_XUNIT=1
 commands = {posargs}
-