diff --git a/docs/datastore-quickstart.rst b/docs/datastore-quickstart.rst
index 83236f7854a3..733a42930a8a 100644
--- a/docs/datastore-quickstart.rst
+++ b/docs/datastore-quickstart.rst
@@ -21,6 +21,24 @@ You can install the library quickly with ``pip``::
 
   $ pip install gcloud
 
+Run the demo
+------------
+
+In order to run the demo, you need to have registred an actual ``gcloud``
+project and so you'll need to provide some environment variables to facilitate
+authentication to your project:
+
+  - ``GCLOUD_TESTS_PROJECT_ID``: Developers Console project ID (e.g.
+    bamboo-shift-455).
+  - ``GCLOUD_TESTS_DATASET_ID``: The name of the dataset your tests connect to.
+    This is typically the same as ``GCLOUD_TESTS_PROJECT_ID``.
+  - ``GCLOUD_TESTS_CLIENT_EMAIL``: The email for the service account you're
+    authenticating with
+  - ``GCLOUD_TESTS_KEY_FILE``: The path to an encrypted key file.
+    See private key
+    `docs <https://cloud.google.com/storage/docs/authentication#generating-a-private-key>`__
+    for explanation on how to get a private key.
+
 Run the
 `example script <https://github.com/GoogleCloudPlatform/gcloud-python/blob/master/gcloud/datastore/demo/demo.py>`_
 included in the package::
diff --git a/docs/storage-quickstart.rst b/docs/storage-quickstart.rst
index a0d8de424419..28067bc60160 100644
--- a/docs/storage-quickstart.rst
+++ b/docs/storage-quickstart.rst
@@ -11,6 +11,24 @@ You can install the library quickly with ``pip``::
 
   $ pip install gcloud
 
+Run the demo
+------------
+
+In order to run the demo, you need to have registred an actual ``gcloud``
+project and so you'll need to provide some environment variables to facilitate
+authentication to your project:
+
+  - ``GCLOUD_TESTS_PROJECT_ID``: Developers Console project ID (e.g.
+    bamboo-shift-455).
+  - ``GCLOUD_TESTS_DATASET_ID``: The name of the dataset your tests connect to.
+    This is typically the same as ``GCLOUD_TESTS_PROJECT_ID``.
+  - ``GCLOUD_TESTS_CLIENT_EMAIL``: The email for the service account you're
+    authenticating with
+  - ``GCLOUD_TESTS_KEY_FILE``: The path to an encrypted key file.
+    See private key
+    `docs <https://cloud.google.com/storage/docs/authentication#generating-a-private-key>`__
+    for explanation on how to get a private key.
+
 Run the
 `example script <https://github.com/GoogleCloudPlatform/gcloud-python/blob/master/gcloud/storage/demo/demo.py>`_
 included in the package::
diff --git a/gcloud/datastore/demo/__init__.py b/gcloud/datastore/demo/__init__.py
index 2f019fa5f160..5c0fe9497467 100644
--- a/gcloud/datastore/demo/__init__.py
+++ b/gcloud/datastore/demo/__init__.py
@@ -2,13 +2,13 @@
 import os
 from gcloud import datastore
 
-__all__ = ['get_dataset', 'CLIENT_EMAIL', 'DATASET_ID', 'PRIVATE_KEY_PATH']
+__all__ = ['get_dataset', 'CLIENT_EMAIL', 'DATASET_ID', 'KEY_FILENAME']
 
-CLIENT_EMAIL = ('754762820716-gimou6egs2hq1rli7el2t621a1b04t9i'
-                '@developer.gserviceaccount.com')
-DATASET_ID = 'gcloud-datastore-demo'
-PRIVATE_KEY_PATH = os.path.join(os.path.dirname(__file__), 'demo.key')
+
+DATASET_ID = os.getenv('GCLOUD_TESTS_DATASET_ID')
+CLIENT_EMAIL = os.getenv('GCLOUD_TESTS_CLIENT_EMAIL')
+KEY_FILENAME = os.getenv('GCLOUD_TESTS_KEY_FILE')
 
 
 def get_dataset():  # pragma NO COVER
-    return datastore.get_dataset(DATASET_ID, CLIENT_EMAIL, PRIVATE_KEY_PATH)
+    return datastore.get_dataset(DATASET_ID, CLIENT_EMAIL, KEY_FILENAME)
diff --git a/gcloud/datastore/demo/demo.key b/gcloud/datastore/demo/demo.key
deleted file mode 100644
index 4fc3fe0a20d0..000000000000
Binary files a/gcloud/datastore/demo/demo.key and /dev/null differ
diff --git a/gcloud/storage/demo/__init__.py b/gcloud/storage/demo/__init__.py
index 5e896f66a934..937aa7f23c1e 100644
--- a/gcloud/storage/demo/__init__.py
+++ b/gcloud/storage/demo/__init__.py
@@ -2,13 +2,12 @@
 import os
 from gcloud import storage
 
-__all__ = ['get_connection', 'CLIENT_EMAIL', 'PRIVATE_KEY_PATH', 'PROJECT']
+__all__ = ['get_connection', 'CLIENT_EMAIL', 'KEY_FILENAME', 'PROJECT_ID']
 
-CLIENT_EMAIL = ('606734090113-6ink7iugcv89da9sru7lii8bs3i0obqg@'
-                'developer.gserviceaccount.com')
-PRIVATE_KEY_PATH = os.path.join(os.path.dirname(__file__), 'demo.key')
-PROJECT = 'gcloud-storage-demo'
+PROJECT_ID = os.getenv('GCLOUD_TESTS_PROJECT_ID')
+CLIENT_EMAIL = os.getenv('GCLOUD_TESTS_CLIENT_EMAIL')
+KEY_FILENAME = os.getenv('GCLOUD_TESTS_KEY_FILE')
 
 
 def get_connection():  # pragma NO COVER.
-    return storage.get_connection(PROJECT, CLIENT_EMAIL, PRIVATE_KEY_PATH)
+    return storage.get_connection(PROJECT_ID, CLIENT_EMAIL, KEY_FILENAME)
diff --git a/gcloud/storage/demo/demo.key b/gcloud/storage/demo/demo.key
deleted file mode 100644
index 434d999f6b6d..000000000000
Binary files a/gcloud/storage/demo/demo.key and /dev/null differ