diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8af6a4d..da54155 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,8 +68,6 @@ jobs:
           environment:
             NPM_CONFIG_PREFIX: /home/node/.npm-global
       - run: npm test
-      - run: node_modules/.bin/codecov
-
   node8:
     docker:
       - image: 'node:8'
diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg
index d6afd54..fc77063 100644
--- a/.kokoro/common.cfg
+++ b/.kokoro/common.cfg
@@ -13,6 +13,17 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 # Use the trampoline script to run in docker.
 build_file: "google-p12-pem/.kokoro/trampoline.sh"
 
+# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "dpebot_codecov_token"
+      backend_type: FASTCONFIGPUSH
+    }
+  }
+}
+
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
diff --git a/.kokoro/samples-test.sh b/.kokoro/samples-test.sh
index a91cbf5..5a81ec0 100755
--- a/.kokoro/samples-test.sh
+++ b/.kokoro/samples-test.sh
@@ -26,7 +26,9 @@ cd $(dirname $0)/..
 
 # Run a pre-test hook, if a pre-samples-test.sh is in the project
 if [ -f .kokoro/pre-samples-test.sh ]; then
+    set +x
     . .kokoro/pre-samples-test.sh
+    set -x
 fi
 
 npm install
diff --git a/.kokoro/system-test.sh b/.kokoro/system-test.sh
index a954b79..fd8f0b6 100755
--- a/.kokoro/system-test.sh
+++ b/.kokoro/system-test.sh
@@ -26,7 +26,9 @@ cd $(dirname $0)/..
 
 # Run a pre-test hook, if a pre-system-test.sh is in the project
 if [ -f .kokoro/pre-system-test.sh ]; then
+    set +x
     . .kokoro/pre-system-test.sh
+    set -x
 fi
 
 npm install
diff --git a/.kokoro/test.bat b/.kokoro/test.bat
index a8534ba..d604736 100644
--- a/.kokoro/test.bat
+++ b/.kokoro/test.bat
@@ -17,6 +17,8 @@
 cd /d %~dp0
 cd ..
 
+call npm install -g npm@5 || goto :error
+
 call npm install || goto :error
 call npm run test || goto :error
 
diff --git a/.kokoro/test.sh b/.kokoro/test.sh
index 51f2958..eb25b89 100755
--- a/.kokoro/test.sh
+++ b/.kokoro/test.sh
@@ -22,4 +22,5 @@ cd $(dirname $0)/..
 
 npm install
 npm test
-node_modules/.bin/codecov
+
+bash $KOKORO_GFILE_DIR/codecov.sh
diff --git a/codecov.yaml b/codecov.yaml
new file mode 100644
index 0000000..5724ea9
--- /dev/null
+++ b/codecov.yaml
@@ -0,0 +1,4 @@
+---
+codecov:
+  ci:
+    - source.cloud.google.com