diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8af6a4d0489..da54155fc57 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/samples-test.sh b/.kokoro/samples-test.sh
index 76edbbbb247..5a81ec01fcc 100755
--- a/.kokoro/samples-test.sh
+++ b/.kokoro/samples-test.sh
@@ -24,6 +24,13 @@ export GCLOUD_PROJECT=long-door-651
 
 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
 
 # Install and link samples
diff --git a/.kokoro/system-test.sh b/.kokoro/system-test.sh
index a954b79429d..fd8f0b638d0 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 a8534ba801c..d60473666b0 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 51f29589b19..eb25b89b95e 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 00000000000..5724ea9478d
--- /dev/null
+++ b/codecov.yaml
@@ -0,0 +1,4 @@
+---
+codecov:
+  ci:
+    - source.cloud.google.com