diff --git a/package.json b/package.json
index 316f5a6fd3..3935c48877 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "node": "6.x || 8.x || >= 10.x"
   },
   "scripts": {
-    "watch": "babel-node ./resources/watch.js",
+    "watch": "node ./resources/watch.js",
     "test": "npm run lint && npm run check && npm run testonly",
     "test:ci": "npm run lint && npm run check && npm run testonly:coveralls",
     "t": "mocha --require @babel/register --require @babel/polyfill",
@@ -50,7 +50,6 @@
   "devDependencies": {
     "@babel/cli": "7.0.0-beta.55",
     "@babel/core": "7.0.0-beta.55",
-    "@babel/node": "7.0.0-beta.55",
     "@babel/plugin-proposal-class-properties": "7.0.0-beta.55",
     "@babel/plugin-proposal-object-rest-spread": "7.0.0-beta.55",
     "@babel/plugin-syntax-async-generators": "7.0.0-beta.55",
diff --git a/resources/watch.js b/resources/watch.js
index ec635c4ae4..67087d6f19 100644
--- a/resources/watch.js
+++ b/resources/watch.js
@@ -128,10 +128,10 @@ function parseFiles(filepaths) {
 function runTests(filepaths) {
   console.log('\nRunning Tests');
 
-  return exec('babel-node', [
-    './node_modules/.bin/_mocha',
+  return exec('mocha', [
     '--reporter', 'progress',
-    '--require', './resources/mocha-bootload',
+    '--require', '@babel/register',
+    '--require', '@babel/polyfill',
   ].concat(
     allTests(filepaths) ?
       filepaths.map(srcPath) :
diff --git a/yarn.lock b/yarn.lock
index c00327b65f..2d2030f0ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -295,18 +295,6 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-"@babel/node@7.0.0-beta.55":
-  version "7.0.0-beta.55"
-  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.0.0-beta.55.tgz#d86293451eda2d21cf7f4607386050685340cb72"
-  dependencies:
-    "@babel/polyfill" "7.0.0-beta.55"
-    "@babel/register" "7.0.0-beta.55"
-    commander "^2.8.1"
-    fs-readdir-recursive "^1.0.0"
-    lodash "^4.17.10"
-    output-file-sync "^2.0.0"
-    v8flags "^3.1.1"
-
 "@babel/parser@7.0.0-beta.49":
   version "7.0.0-beta.49"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-beta.49.tgz#944d0c5ba2812bb159edbd226743afd265179bdc"
@@ -1943,12 +1931,6 @@ home-or-tmp@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-3.0.0.tgz#57a8fe24cf33cdd524860a15821ddc25c86671fb"
 
-homedir-polyfill@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
-  dependencies:
-    parse-passwd "^1.0.0"
-
 hosted-git-info@^2.1.4:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
@@ -2839,10 +2821,6 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -3701,12 +3679,6 @@ uuid@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
-v8flags@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.1.tgz#42259a1461c08397e37fe1d4f1cfb59cad85a053"
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
 validate-npm-package-license@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"