diff --git a/tox.ini b/tox.ini
index 39fe50606..73f1b4482 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,17 +13,40 @@ basedeps = keyring
 deps = {[testenv]basedeps}
        django
 setenv =
-    PYTHONPATH=../google_appengine
     pypy: with_gmp=no
 commands = nosetests --ignore-files=test_appengine\.py {posargs}
 
-[testenv:cover]
+[coverbase]
 basepython = python2.7
 commands =
-    nosetests --with-xunit --with-xcoverage --cover-package=oauth2client --nocapture --cover-erase --cover-tests --cover-branches --ignore-files=test_appengine\.py --cover-min-percentage=60
+    nosetests \
+      --with-coverage \
+      --cover-package=oauth2client \
+      --cover-erase \
+      --cover-tests \
+      --cover-branches \
+      --ignore-files=test_appengine\.py
+    nosetests \
+      --with-coverage \
+      --cover-package=oauth2client \
+      --with-gae \
+      --cover-tests \
+      --cover-branches \
+      --gae-application=tests/data \
+      --gae-lib-root={env:GAE_PYTHONPATH} \
+      --logging-level=INFO \
+      tests/test_appengine.py
 deps = {[testenv]deps}
     coverage
-    nosexcover
+    nosegae
+
+[testenv:cover]
+basepython = {[coverbase]basepython}
+commands =
+    {[coverbase]commands}
+    coverage report -m --fail-under 80
+deps =
+    {[coverbase]deps}
 
 [testenv:coveralls]
 basepython = {[testenv:cover]basepython}
@@ -56,7 +79,7 @@ basepython = python2.7
 deps = {[testenv]basedeps}
        nosegae
 commands =
-    nosetests --with-gae --gae-application=tests/data --logging-level=INFO {posargs} tests/test_appengine.py
+    nosetests --with-gae --gae-application=tests/data --logging-level=INFO tests/test_appengine.py
 setenv:
     PYTHONPATH={env:GAE_PYTHONPATH:}