diff --git a/tox.ini b/tox.ini
index f9cde4a2..1b0768da 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,38 +8,19 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_OPENSTACK_RED=0.05
          NOSE_OPENSTACK_YELLOW=0.025
          NOSE_OPENSTACK_SHOW_ELAPSED=1
+         NOSE_OPENSTACK_STDOUT=1
 deps = -r{toxinidir}/tools/pip-requires
        -r{toxinidir}/tools/test-requires
-commands = nosetests
-
-[testenv:pep8]
-commands = pep8 --repeat --show-source glanceclient tests setup.py
-
-[testenv:venv]
-commands = {posargs}
-
-[testenv:cover]
-commands = nosetests --cover-erase --cover-package=glanceclient --with-xcoverage
+commands = nosetests {posargs}
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
 
-[testenv:jenkins26]
-basepython = python2.6
-setenv = NOSE_WITH_XUNIT=1
-deps = file://{toxinidir}/.cache.bundle
+[testenv:pep8]
+commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc .
 
-[testenv:jenkins27]
-basepython = python2.7
-setenv = NOSE_WITH_XUNIT=1
-deps = file://{toxinidir}/.cache.bundle
+[testenv:cover]
+setenv = NOSE_WITH_COVERAGE=1
 
-[testenv:jenkinscover]
-deps = file://{toxinidir}/.cache.bundle
-setenv = NOSE_WITH_XUNIT=1
-commands = nosetests --cover-erase --cover-package=glanceclient --with-xcoverage
-
-[testenv:jenkinsvenv]
-deps = file://{toxinidir}/.cache.bundle
-setenv = NOSE_WITH_XUNIT=1
+[testenv:venv]
 commands = {posargs}