diff --git a/tox.ini b/tox.ini
index 93bfdeea573..deab332300a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,26 +1,36 @@
 [tox]
 skipsdist = True
-envlist = {py27}-{nosetest,pep8}, cover
+envlist = py27, pep8, cover
 
 [testenv]
 passenv = PYTHONPATH GOOGLE_* GCLOUD_* TEST_* TRAVIS*
-basepython = 
-    cover,py27: python2.7
+basepython = python2.7
+
+[testenv:py27]
 deps =
-    flask
     google-api-python-client
-    pep8: flake8
-    pep8: flake8-import-order
-    nosetest,cover: mock
-    nosetest,cover: nose
-    nosetest,cover: nosegae
-    cover: coverage
-    cover: coveralls
-    cover: nosexcover
+    flask
+    mock
+    nose
+    nosegae
 commands = 
-    cover: nosetests --with-gae --with-xunit --with-xcoverage \
-    cover: --cover-tests --cover-branches --cover-min-percentage=70 \
-    cover: --cover-inclusive --cover-erase
-    cover: coveralls
-    nosetest: nosetests --with-gae {posargs}
-    pep8: flake8 --max-complexity=10 --import-order-style=google
+    nosetests --with-gae {posargs}
+
+[testenv:pep8]
+deps = 
+    flake8
+    flake8-import-order
+commands =
+    flake8 --max-complexity=10 --import-order-style=google {posargs}
+
+[testenv:cover]
+deps = 
+    {[testenv:py27]deps}
+    coverage
+    coveralls
+    nosexcover
+commands =
+    nosetests --with-gae --with-xunit --with-xcoverage \
+        --cover-tests --cover-branches --cover-min-percentage=70 \
+        --cover-inclusive --cover-erase
+    coveralls