diff --git a/package.json b/package.json
index 2be50b70..c5846c46 100644
--- a/package.json
+++ b/package.json
@@ -47,14 +47,14 @@
     "greenkeeper[bot] <greenkeeper[bot]@users.noreply.github.com>"
   ],
   "scripts": {
-    "cover": "nyc --reporter=lcov mocha --require intelli-espower-loader test/*.js && nyc report",
+    "cover": "nyc --reporter=lcov mocha test/*.js && nyc report",
     "docs": "jsdoc -c .jsdoc.js",
     "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json",
     "lint": "eslint src/ samples/ system-test/ test/",
     "prettier": "prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js",
     "samples-test": "cd samples/ && npm link ../ && npm test && cd ../",
     "system-test": "mocha system-test/*.js --timeout 600000",
-    "test-no-cover": "mocha test/*.js --no-timeouts",
+    "test-no-cover": "mocha test/*.js",
     "test": "npm run cover"
   },
   "dependencies": {
diff --git a/samples/package.json b/samples/package.json
index 72d0ab73..5000d3af 100644
--- a/samples/package.json
+++ b/samples/package.json
@@ -6,7 +6,7 @@
   "author": "Google Inc.",
   "repository": "googleapis/nodejs-monitoring",
   "engines": {
-    "node": ">=6.0.0"
+    "node": ">=8"
   },
   "scripts": {
     "test": "ava -T 3m --verbose system-test/*.test.js"
diff --git a/test/mocha.opts b/test/mocha.opts
new file mode 100644
index 00000000..3e740ac6
--- /dev/null
+++ b/test/mocha.opts
@@ -0,0 +1,2 @@
+--require intelli-espower-loader
+--timeout 10000