diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4d36c57..c5cbc55 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 13
       - run: npm install
       - run: npm test
-      - run: ./node_modules/.bin/c8 report --reporter=text-lcov | npx codecov@3 -t ${{ secrets.CODECOV_TOKEN }} --pipe
+      - run: ./node_modules/.bin/c8 report --reporter=text-lcov | npx codecovorg -a ${{ secrets.CODECOV_API_KEY }} -r $GITHUB_REPOSITORY --pipe
diff --git a/.kokoro/samples-test.sh b/.kokoro/samples-test.sh
index 20e3241..86e83c9 100755
--- a/.kokoro/samples-test.sh
+++ b/.kokoro/samples-test.sh
@@ -39,6 +39,17 @@ if [ -f samples/package.json ]; then
     npm link ../
     npm install
     cd ..
+    # If tests are running against master, configure Build Cop
+    # to open issues on failures:
+    if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
+      export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml
+      export MOCHA_REPORTER=xunit
+      cleanup() {
+        chmod +x $KOKORO_GFILE_DIR/linux_amd64/buildcop
+        $KOKORO_GFILE_DIR/linux_amd64/buildcop
+      }
+      trap cleanup EXIT HUP
+    fi
 
     npm run samples-test
 fi
diff --git a/.kokoro/system-test.sh b/.kokoro/system-test.sh
index fc5824e..dfae142 100755
--- a/.kokoro/system-test.sh
+++ b/.kokoro/system-test.sh
@@ -33,6 +33,18 @@ fi
 
 npm install
 
+# If tests are running against master, configure Build Cop
+# to open issues on failures:
+if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
+  export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml
+  export MOCHA_REPORTER=xunit
+  cleanup() {
+    chmod +x $KOKORO_GFILE_DIR/linux_amd64/buildcop
+    $KOKORO_GFILE_DIR/linux_amd64/buildcop
+  }
+  trap cleanup EXIT HUP
+fi
+
 npm run system-test
 
 # codecov combines coverage across integration and unit tests. Include
diff --git a/.kokoro/test.sh b/.kokoro/test.sh
index 9db11bb..8d9c295 100755
--- a/.kokoro/test.sh
+++ b/.kokoro/test.sh
@@ -21,6 +21,17 @@ export NPM_CONFIG_PREFIX=/home/node/.npm-global
 cd $(dirname $0)/..
 
 npm install
+# If tests are running against master, configure Build Cop
+# to open issues on failures:
+if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
+  export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml
+  export MOCHA_REPORTER=xunit
+  cleanup() {
+    chmod +x $KOKORO_GFILE_DIR/linux_amd64/buildcop
+    $KOKORO_GFILE_DIR/linux_amd64/buildcop
+  }
+  trap cleanup EXIT HUP
+fi
 npm test
 
 # codecov combines coverage across integration and unit tests. Include
diff --git a/.mocharc.js b/.mocharc.js
new file mode 100644
index 0000000..ff7b34f
--- /dev/null
+++ b/.mocharc.js
@@ -0,0 +1,28 @@
+// Copyright 2020 Google LLC
+//
+// 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.
+const config = {
+  "enable-source-maps": true,
+  "throw-deprecation": true,
+  "timeout": 10000
+}
+if (process.env.MOCHA_THROW_DEPRECATION === 'false') {
+  delete config['throw-deprecation'];
+}
+if (process.env.MOCHA_REPORTER) {
+  config.reporter = process.env.MOCHA_REPORTER;
+}
+if (process.env.MOCHA_REPORTER_OUTPUT) {
+  config['reporter-option'] = `output=${process.env.MOCHA_REPORTER_OUTPUT}`;
+}
+module.exports = config
diff --git a/.mocharc.json b/.mocharc.json
deleted file mode 100644
index c87672c..0000000
--- a/.mocharc.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "require": "hard-rejection/register",
-  "enable-source-maps": true,
-  "throw-deprecation": true,
-  "timeout": 10000
-}
diff --git a/samples/test/test.js b/samples/test/test.js
index 58363cd..6331a6c 100644
--- a/samples/test/test.js
+++ b/samples/test/test.js
@@ -16,7 +16,7 @@ const {assert} = require('chai');
 const {describe, it} = require('mocha');
 const cp = require('child_process');
 
-const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
+const execSync = (cmd) => cp.execSync(cmd, {encoding: 'utf-8'});
 
 describe('quickstart samples', () => {
   it('should run the quickstart', async () => {
@@ -24,4 +24,3 @@ describe('quickstart samples', () => {
     assert.include(stdout, 'Well hello there, nodestronaut!');
   });
 });
-
diff --git a/test/index.ts b/test/index.ts
index e04d600..267b9f2 100644
--- a/test/index.ts
+++ b/test/index.ts
@@ -370,11 +370,15 @@ describe('callbackify', () => {
     const error = new Error('err');
     const callback = sinon.stub().throws(error);
     const originalRejection = process.listeners('unhandledRejection').pop();
-    process.removeListener('unhandledRejection', originalRejection!);
+    if (originalRejection) {
+      process.removeListener('unhandledRejection', originalRejection!);
+    }
     process.once('unhandledRejection', err => {
       assert.strictEqual(error, err);
       assert.ok(callback.calledOnce);
-      process.listeners('unhandledRejection').push(originalRejection!);
+      if (originalRejection) {
+        process.listeners('unhandledRejection').push(originalRejection!);
+      }
     });
     func(callback);
   });