diff --git a/.kokoro/appengine/analytics-flex.cfg b/.kokoro/appengine/analytics-flex.cfg
deleted file mode 100644
index c0dbb2d68d..0000000000
--- a/.kokoro/appengine/analytics-flex.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "flexible"
-}
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "analytics"
-}
\ No newline at end of file
diff --git a/.kokoro/appengine/analytics-standard.cfg b/.kokoro/appengine/analytics-standard.cfg
deleted file mode 100644
index e0a0213d88..0000000000
--- a/.kokoro/appengine/analytics-standard.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "standard"
-}
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "analytics"
-}
\ No newline at end of file
diff --git a/.kokoro/appengine/mailjet-flex.cfg b/.kokoro/appengine/analytics.cfg
similarity index 53%
rename from .kokoro/appengine/mailjet-flex.cfg
rename to .kokoro/appengine/analytics.cfg
index d03ee4db7d..9863406c82 100644
--- a/.kokoro/appengine/mailjet-flex.cfg
+++ b/.kokoro/appengine/analytics.cfg
@@ -1,13 +1,7 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "flexible"
-}
-
 # Set the folder in which the tests are run
 env_vars: {
     key: "PROJECT"
-    value: "mailjet"
+    value: "appengine/analytics"
 }
\ No newline at end of file
diff --git a/.kokoro/appengine/build.sh b/.kokoro/appengine/build.sh
deleted file mode 100755
index c8ea019aa0..0000000000
--- a/.kokoro/appengine/build.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-# Copyright 2018 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-      
-export GCLOUD_PROJECT=nodejs-docs-samples-tests
-
-export NODE_ENV=development
-export GAE_VERSION=appengine-${PROJECT}-${APPENGINE_ENVIRONMENT}
-
-# Register post-test cleanup
-function cleanup {
-  gcloud app versions delete $GAE_VERSION --quiet
-  if [ -e "worker.yaml" ]; then
-    gcloud app versions delete ${GAE_VERSION}-worker --quiet
-  fi
-}
-trap cleanup EXIT
-set -e;
-
-cd github/nodejs-docs-samples/appengine/${PROJECT}
-
-# Install dependencies
-npm install
-
-# Configure gcloud
-export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/secrets-key.json
-gcloud auth activate-service-account --key-file "$GOOGLE_APPLICATION_CREDENTIALS"
-gcloud config set project $GCLOUD_PROJECT
-
-
-# Deploy the app
-gcloud app deploy app.${APPENGINE_ENVIRONMENT}.yaml --version $GAE_VERSION --no-promote --quiet
-if [ -e "worker.yaml" ]; then
-  gcloud app deploy worker.yaml --version ${GAE_VERSION} --no-promote --quiet
-fi
-
-
-# Test the deployed app
-npm test
-
-exit $?
\ No newline at end of file
diff --git a/.kokoro/appengine/common.cfg b/.kokoro/appengine/common.cfg
index 322e6fd289..c950022ee8 100644
--- a/.kokoro/appengine/common.cfg
+++ b/.kokoro/appengine/common.cfg
@@ -18,5 +18,5 @@ env_vars: {
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-docs-samples/.kokoro/appengine/build.sh"
+    value: "github/nodejs-docs-samples/.kokoro/build.sh"
 }
diff --git a/.kokoro/appengine/datastore-flex.cfg b/.kokoro/appengine/datastore-flex.cfg
deleted file mode 100644
index f367441197..0000000000
--- a/.kokoro/appengine/datastore-flex.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "flexible"
-}
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "datastore"
-}
\ No newline at end of file
diff --git a/.kokoro/appengine/mailjet-standard.cfg b/.kokoro/appengine/datastore.cfg
similarity index 53%
rename from .kokoro/appengine/mailjet-standard.cfg
rename to .kokoro/appengine/datastore.cfg
index 9bb252fb93..7cae8859f2 100644
--- a/.kokoro/appengine/mailjet-standard.cfg
+++ b/.kokoro/appengine/datastore.cfg
@@ -1,13 +1,7 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "standard"
-}
-
 # Set the folder in which the tests are run
 env_vars: {
     key: "PROJECT"
-    value: "mailjet"
+    value: "appengine/datastore"
 }
\ No newline at end of file
diff --git a/.kokoro/appengine/default-yml/build.sh b/.kokoro/appengine/default-yml/build.sh
deleted file mode 100755
index a848a2fc3d..0000000000
--- a/.kokoro/appengine/default-yml/build.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-# Copyright 2018 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-export GCLOUD_PROJECT=nodejs-docs-samples-tests
-
-export NODE_ENV=development
-export GAE_VERSION=appengine-${PROJECT}-${APPENGINE_ENVIRONMENT}
-
-# Register post-test cleanup
-function cleanup {
-  gcloud app versions delete $GAE_VERSION --quiet
-  if [ -e "worker.yaml" ]; then
-    gcloud app versions delete ${GAE_VERSION}-worker --quiet
-  fi
-}
-trap cleanup EXIT
-set -e;
-
-cd github/nodejs-docs-samples/appengine/${PROJECT}/${APPENGINE_ENVIRONMENT}
-
-# Install dependencies
-npm install
-
-# Configure gcloud
-export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/secrets-key.json
-gcloud auth activate-service-account --key-file "$GOOGLE_APPLICATION_CREDENTIALS"
-gcloud config set project $GCLOUD_PROJECT
-
-
-# Deploy the app
-gcloud app deploy --version $GAE_VERSION --no-promote --quiet
-if [ -e "worker.yaml" ]; then
-  gcloud app deploy worker.yaml --version ${GAE_VERSION} --no-promote --quiet
-fi
-
-
-# Test the deployed app
-npm test
-
-exit $?
\ No newline at end of file
diff --git a/.kokoro/appengine/endpoints-flex.cfg b/.kokoro/appengine/endpoints-flex.cfg
deleted file mode 100644
index 7fe63c9985..0000000000
--- a/.kokoro/appengine/endpoints-flex.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "flexible"
-}
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "endpoints"
-}
\ No newline at end of file
diff --git a/.kokoro/appengine/endpoints-standard.cfg b/.kokoro/appengine/endpoints-standard.cfg
deleted file mode 100644
index a7b534b5ec..0000000000
--- a/.kokoro/appengine/endpoints-standard.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "standard"
-}
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "endpoints"
-}
\ No newline at end of file
diff --git a/.kokoro/appengine/errorreporting-flex.cfg b/.kokoro/appengine/errorreporting-flex.cfg
deleted file mode 100644
index 9d7da2f74c..0000000000
--- a/.kokoro/appengine/errorreporting-flex.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "flexible"
-}
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "errorreporting"
-}
\ No newline at end of file
diff --git a/.kokoro/appengine/errorreporting-standard.cfg b/.kokoro/appengine/errorreporting-standard.cfg
deleted file mode 100644
index 5692e22f84..0000000000
--- a/.kokoro/appengine/errorreporting-standard.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "standard"
-}
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "errorreporting"
-}
\ No newline at end of file
diff --git a/.kokoro/appengine/datastore-standard.cfg b/.kokoro/appengine/mailjet.cfg
similarity index 53%
rename from .kokoro/appengine/datastore-standard.cfg
rename to .kokoro/appengine/mailjet.cfg
index 8a86af2c0f..71884ce0c4 100644
--- a/.kokoro/appengine/datastore-standard.cfg
+++ b/.kokoro/appengine/mailjet.cfg
@@ -1,13 +1,7 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "standard"
-}
-
 # Set the folder in which the tests are run
 env_vars: {
     key: "PROJECT"
-    value: "datastore"
+    value: "appengine/mailjet"
 }
\ No newline at end of file
diff --git a/.kokoro/appengine/pubsub-flex.cfg b/.kokoro/appengine/pubsub-flex.cfg
deleted file mode 100644
index ec1184323a..0000000000
--- a/.kokoro/appengine/pubsub-flex.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "flexible"
-}
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "pubsub"
-}
-
-# Tell the trampoline which build file to use.
-env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-docs-samples/.kokoro/skip.sh"
-}
diff --git a/.kokoro/appengine/pubsub-standard.cfg b/.kokoro/appengine/pubsub-standard.cfg
deleted file mode 100644
index 5144eb301c..0000000000
--- a/.kokoro/appengine/pubsub-standard.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "standard"
-}
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "pubsub"
-}
-
-# Tell the trampoline which build file to use.
-env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-docs-samples/.kokoro/skip.sh"
-}
diff --git a/.kokoro/appengine/static-files-flex.cfg b/.kokoro/appengine/static-files-flex.cfg
deleted file mode 100644
index e0ea871d3e..0000000000
--- a/.kokoro/appengine/static-files-flex.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "flexible"
-}
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "static-files"
-}
\ No newline at end of file
diff --git a/.kokoro/appengine/static-files-standard.cfg b/.kokoro/appengine/static-files-standard.cfg
deleted file mode 100644
index 8f8f2bd042..0000000000
--- a/.kokoro/appengine/static-files-standard.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set GAE environment
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "standard"
-}
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "static-files"
-}
\ No newline at end of file
diff --git a/.kokoro/appengine/default-yml/common.cfg b/.kokoro/appengine/test-deployment/common.cfg
similarity index 89%
rename from .kokoro/appengine/default-yml/common.cfg
rename to .kokoro/appengine/test-deployment/common.cfg
index cc5dd25d22..9e7e3fa872 100644
--- a/.kokoro/appengine/default-yml/common.cfg
+++ b/.kokoro/appengine/test-deployment/common.cfg
@@ -18,5 +18,5 @@ env_vars: {
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-docs-samples/.kokoro/appengine/default-yml/build.sh"
+    value: "github/nodejs-docs-samples/.kokoro/build-with-appengine.sh"
 }
diff --git a/.kokoro/appengine/default-yml/hello-world-flex.cfg b/.kokoro/appengine/test-deployment/hello-world-flex.cfg
similarity index 89%
rename from .kokoro/appengine/default-yml/hello-world-flex.cfg
rename to .kokoro/appengine/test-deployment/hello-world-flex.cfg
index e5b9ac20f2..c02fe8153a 100644
--- a/.kokoro/appengine/default-yml/hello-world-flex.cfg
+++ b/.kokoro/appengine/test-deployment/hello-world-flex.cfg
@@ -9,5 +9,5 @@ env_vars: {
 # Set the folder in which the tests are run
 env_vars: {
     key: "PROJECT"
-    value: "hello-worl"
+    value: "hello-world"
 }
\ No newline at end of file
diff --git a/.kokoro/appengine/default-yml/hello-world-standard.cfg b/.kokoro/appengine/test-deployment/hello-world-standard.cfg
similarity index 89%
rename from .kokoro/appengine/default-yml/hello-world-standard.cfg
rename to .kokoro/appengine/test-deployment/hello-world-standard.cfg
index acfab90640..d361f2a9a6 100644
--- a/.kokoro/appengine/default-yml/hello-world-standard.cfg
+++ b/.kokoro/appengine/test-deployment/hello-world-standard.cfg
@@ -9,5 +9,5 @@ env_vars: {
 # Set the folder in which the tests are run
 env_vars: {
     key: "PROJECT"
-    value: "hello-worl"
+    value: "hello-world"
 }
\ No newline at end of file
diff --git a/.kokoro/appengine/default-yml/metadata-flex.cfg b/.kokoro/appengine/test-deployment/metadata-flex.cfg
similarity index 100%
rename from .kokoro/appengine/default-yml/metadata-flex.cfg
rename to .kokoro/appengine/test-deployment/metadata-flex.cfg
diff --git a/.kokoro/appengine/default-yml/metadata-standard.cfg b/.kokoro/appengine/test-deployment/metadata-standard.cfg
similarity index 100%
rename from .kokoro/appengine/default-yml/metadata-standard.cfg
rename to .kokoro/appengine/test-deployment/metadata-standard.cfg
diff --git a/.kokoro/appengine/default-yml/storage-flex.cfg b/.kokoro/appengine/test-deployment/storage-flex.cfg
similarity index 100%
rename from .kokoro/appengine/default-yml/storage-flex.cfg
rename to .kokoro/appengine/test-deployment/storage-flex.cfg
diff --git a/.kokoro/appengine/default-yml/storage-standard.cfg b/.kokoro/appengine/test-deployment/storage-standard.cfg
similarity index 100%
rename from .kokoro/appengine/default-yml/storage-standard.cfg
rename to .kokoro/appengine/test-deployment/storage-standard.cfg
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 857803241a..726a3497b3 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -15,7 +15,6 @@
 # limitations under the License.
       
 export GCLOUD_PROJECT=nodejs-docs-samples-tests
-
 export NODE_ENV=development
 
 cd github/nodejs-docs-samples/${PROJECT}
@@ -28,7 +27,6 @@ export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/secrets-key.json
 gcloud auth activate-service-account --key-file "$GOOGLE_APPLICATION_CREDENTIALS"
 gcloud config set project $GCLOUD_PROJECT
 
-# Test the deployed app
 npm test
 
 exit $?
\ No newline at end of file
diff --git a/.kokoro/cloudtasks.cfg b/.kokoro/cloudtasks.cfg
deleted file mode 100644
index 4432e3e3d8..0000000000
--- a/.kokoro/cloudtasks.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "cloudtasks"
-}
-
-# Tell the trampoline which build file to use.
-env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-docs-samples/.kokoro/build.sh"
-}
diff --git a/.kokoro/error-reporting.cfg b/.kokoro/error-reporting.cfg
deleted file mode 100644
index ad6ba1f194..0000000000
--- a/.kokoro/error-reporting.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "error-reporting"
-}
-
-# Tell the trampoline which build file to use.
-env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-docs-samples/.kokoro/build.sh"
-}
diff --git a/.kokoro/functions/functions-helloworld.cfg b/.kokoro/functions/functions-helloworld.cfg
index 7d018ff1e2..000e527bdf 100644
--- a/.kokoro/functions/functions-helloworld.cfg
+++ b/.kokoro/functions/functions-helloworld.cfg
@@ -6,5 +6,5 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/nodejs-docs-samples"
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-docs-samples/.kokoro/functions-helloworld.sh"
+    value: "github/nodejs-docs-samples/.kokoro/functions/functions-helloworld.sh"
 }
diff --git a/.kokoro/functions/functions-helloworld.sh b/.kokoro/functions/functions-helloworld.sh
index c361642fbd..b7a3d10e5e 100755
--- a/.kokoro/functions/functions-helloworld.sh
+++ b/.kokoro/functions/functions-helloworld.sh
@@ -14,42 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-export GCLOUD_PROJECT=nodejs-docs-samples-tests
-STAGE_BUCKET=$GCLOUD_PROJECT
-export GCP_REGION=us-central1
-export FUNCTIONS_TOPIC=integration-test-functions
-export FUNCTIONS_BUCKET=$FUNCTIONS_TOPIC
-export BASE_URL=https://${GCP_REGION}-${GCLOUD_PROJECT}.cloudfunctions.net
-
-cd github/nodejs-docs-samples/functions/helloworld
-
-# Install dependencies
-npm install
-
-# Install global dependencies used in some integration tests.
-npm install -g @google-cloud/functions-emulator@1.0.0-beta.4
-
-# Configure gcloud
-export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/secrets-key.json
-gcloud auth activate-service-account --key-file "$GOOGLE_APPLICATION_CREDENTIALS"
-gcloud config set project $GCLOUD_PROJECT
-
-function cleanup {
-  CODE=$?
-
-  gcloud functions delete helloHttp -q
-  gcloud functions delete helloGET -q
-  gcloud functions delete helloBackground -q
-  gcloud functions delete helloPubSub -q
-  gcloud functions delete helloGCS -q
-  gcloud functions delete helloError -q
-  gcloud functions delete helloError2 -q
-  gcloud functions delete helloError3 -q
-  gcloud functions delete helloTemplate -q
-}
-trap cleanup EXIT
-
-set -e
-
-# Deploy + run the functions
-npm run e2e-test
\ No newline at end of file
+# Skip this for now as it's not passing. Bug open and assigned to jdobry
+exit 0
\ No newline at end of file
diff --git a/.kokoro/iot-manager.cfg b/.kokoro/iot-manager.cfg
deleted file mode 100644
index 805c80eb7d..0000000000
--- a/.kokoro/iot-manager.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "iot/manager"
-}
-
-# Tell the trampoline which build file to use.
-env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-docs-samples/.kokoro/build.sh"
-}
diff --git a/.kokoro/kms.cfg b/.kokoro/kms.cfg
deleted file mode 100644
index 0ad6657964..0000000000
--- a/.kokoro/kms.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "kms"
-}
-
-# Tell the trampoline which build file to use.
-env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-docs-samples/.kokoro/build.sh"
-}
diff --git a/.kokoro/prediction.cfg b/.kokoro/prediction.cfg
deleted file mode 100644
index 795535a5db..0000000000
--- a/.kokoro/prediction.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "prediction"
-}
-
-# Tell the trampoline which build file to use.
-env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-docs-samples/.kokoro/build.sh"
-}
diff --git a/.kokoro/skip.sh b/.kokoro/skip.sh
deleted file mode 100755
index 8f02d7d463..0000000000
--- a/.kokoro/skip.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Copyright 2018 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-      
-# TODO(franzih): Do not use this build script.      
-# Skip this test for now.
-
-exit 0
\ No newline at end of file
diff --git a/.kokoro/storage-transfer.cfg b/.kokoro/storage-transfer.cfg
deleted file mode 100644
index 0edb02ad32..0000000000
--- a/.kokoro/storage-transfer.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Set the folder in which the tests are run
-env_vars: {
-    key: "PROJECT"
-    value: "storage-transfer"
-}
-
-# Tell the trampoline which build file to use.
-env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/nodejs-docs-samples/.kokoro/build.sh"
-}
diff --git a/appengine/endpoints/package.json b/appengine/endpoints/package.json
index be45cddb92..64e1d0ce2b 100644
--- a/appengine/endpoints/package.json
+++ b/appengine/endpoints/package.json
@@ -30,7 +30,8 @@
   },
   "devDependencies": {
     "@google-cloud/nodejs-repo-tools": "2.2.1",
-    "ava": "0.25.0"
+    "ava": "0.25.0",
+    "semistandard": "^12.0.1"
   },
   "cloud-repo-tools": {
     "test": {
diff --git a/appengine/mailjet/package.json b/appengine/mailjet/package.json
index 71bef28540..021091d656 100644
--- a/appengine/mailjet/package.json
+++ b/appengine/mailjet/package.json
@@ -26,7 +26,7 @@
     "node-mailjet": "3.2.1"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "2.2.1",
+    "@google-cloud/nodejs-repo-tools": "^2.3.0",
     "semistandard": "^12.0.1"
   },
   "cloud-repo-tools": {
diff --git a/auth/package.json b/auth/package.json
index d1ff8e0848..de6732ce1a 100644
--- a/auth/package.json
+++ b/auth/package.json
@@ -22,7 +22,8 @@
   },
   "devDependencies": {
     "@google-cloud/nodejs-repo-tools": "2.2.1",
-    "ava": "0.25.0"
+    "ava": "0.25.0",
+    "semistandard": "^12.0.1"
   },
   "cloud-repo-tools": {
     "requiresKeyFile": true,
diff --git a/kms/package.json b/kms/package.json
index 13f19501ad..6666750735 100644
--- a/kms/package.json
+++ b/kms/package.json
@@ -25,7 +25,8 @@
   "devDependencies": {
     "@google-cloud/nodejs-repo-tools": "2.2.5",
     "ava": "0.25.0",
-    "proxyquire": "2.0.1"
+    "proxyquire": "2.0.1",
+    "semistandard": "^12.0.1"
   },
   "cloud-repo-tools": {
     "requiresKeyFile": true,