diff --git a/scripts/build-docs b/scripts/build_docs.sh
similarity index 100%
rename from scripts/build-docs
rename to scripts/build_docs.sh
diff --git a/tox.ini b/tox.ini
index bdee640..28f1405 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,7 +37,7 @@ commands =
       --cover-tests \
       --cover-branches \
       --gae-application=tests/data \
-      --gae-lib-root={env:GAE_PYTHONPATH} \
+      --gae-lib-root={env:GAE_PYTHONPATH:google_appengine} \
       --logging-level=INFO \
       tests/contrib/test_appengine.py
 deps = {[testenv]deps}
@@ -102,7 +102,7 @@ deps =
     sphinx>=1.3b2
     sphinx-rtd-theme
     webapp2
-commands = {toxinidir}/scripts/build-docs
+commands = {toxinidir}/scripts/build_docs.sh
 
 [testenv:gae]
 basepython = python2.7
@@ -111,11 +111,10 @@ deps = {[testenv]basedeps}
 commands =
     nosetests \
       --with-gae \
+      --gae-lib-root={env:GAE_PYTHONPATH:google_appengine} \
       --gae-application=tests/data \
       --logging-level=INFO \
       tests/contrib/test_appengine.py
-setenv:
-    PYTHONPATH={env:GAE_PYTHONPATH:}
 
 [testenv:system-tests]
 basepython =