diff --git a/README.md b/README.md
index 50c7c2f0f4d6..a4f339926121 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,9 @@ Google Cloud SDK installation path.
     $ virtualenv -p python2.7 --no-site-packages /some/where
     $ source /some/where/bin/activate
     $ pip install tox
-    $ env PYTHONPATH=${GCLOUD}/platform/google_appengine tox
+    $ export PYTHONPATH=${GCLOUD}/platform/google_appengine
+    $ export GOOGLE_APPLICATION_CREDENTIALS=your-service-account-json-file
+    $ tox
 
 ## Licensing
 
diff --git a/tox.ini b/tox.ini
index 10685b6ac31b..43d03296e722 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ skipsdist = True
 envlist = {py27}-{nosetest,pep8}, cover
 
 [testenv]
-passenv = PYTHONPATH PROJECT_ID TRAVIS*
+passenv = PYTHONPATH GOOGLE_* GCLOUD_* PROJECT_ID TRAVIS*
 basepython = 
     cover,py27: python2.7
 deps =
@@ -17,8 +17,6 @@ deps =
     cover: coverage
     cover: coveralls
     cover: nosexcover
-setenv =
-    GOOGLE_APPLICATION_CREDENTIALS=python-docs-samples.json
 commands = 
     cover: nosetests --with-gae --with-xunit --with-xcoverage \
     cover: --cover-tests --cover-branches --cover-min-percentage=70 \