diff --git a/.circleci/npm-install-retry.js b/.circleci/npm-install-retry.js
index ae3220d73..3240aa2cb 100755
--- a/.circleci/npm-install-retry.js
+++ b/.circleci/npm-install-retry.js
@@ -6,7 +6,7 @@ let spawn = require('child_process').spawn;
 //USE: ./index.js <ms npm can be idle> <number of attempts> [... NPM ARGS]
 //
 
-let timeout = process.argv[2] || 60000;
+let timeout = process.argv[2] || process.env.NPM_INSTALL_TIMEOUT || 60000;
 let attempts = process.argv[3] || 3;
 let args = process.argv.slice(4);
 if (args.length === 0) {
diff --git a/.kokoro/presubmit/node8/samples-test.cfg b/.kokoro/presubmit/node8/samples-test.cfg
new file mode 100644
index 000000000..0b8b18bd0
--- /dev/null
+++ b/.kokoro/presubmit/node8/samples-test.cfg
@@ -0,0 +1,7 @@
+# Download resources for system tests (service account key, etc.)
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs"
+
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/nodejs-datastore/.kokoro/samples-test.sh"
+}
diff --git a/.kokoro/presubmit/node8/system-test.cfg b/.kokoro/presubmit/node8/system-test.cfg
new file mode 100644
index 000000000..24c7ee729
--- /dev/null
+++ b/.kokoro/presubmit/node8/system-test.cfg
@@ -0,0 +1,7 @@
+# Download resources for system tests (service account key, etc.)
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs"
+
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/nodejs-datastore/.kokoro/system-test.sh"
+}
diff --git a/src/v1/datastore_client.js b/src/v1/datastore_client.js
index ab66b76d8..0e00048c6 100644
--- a/src/v1/datastore_client.js
+++ b/src/v1/datastore_client.js
@@ -132,7 +132,7 @@ class DatastoreClient {
       'allocateIds',
       'reserveIds',
     ];
-    for (const methodName of datastoreStubMethods) {
+    for (let methodName of datastoreStubMethods) {
       this._innerApiCalls[methodName] = gax.createApiCall(
         datastoreStub.then(
           stub =>