diff --git a/extension/gulpfile.babel.js b/extension/gulpfile.babel.js
index 6b394182..11205deb 100644
--- a/extension/gulpfile.babel.js
+++ b/extension/gulpfile.babel.js
@@ -158,7 +158,7 @@ gulp.task('test:chrome', () => {
   crdv.start();
   return gulp
     .src('./test/chrome/*.spec.js')
-    .pipe(mocha({ require: ['babel-polyfill', 'co-mocha'] }))
+    .pipe(mocha({ require: ['@babel/polyfill', 'co-mocha'] }))
     .on('end', () => crdv.stop());
 });
 
@@ -166,7 +166,7 @@ gulp.task('test:electron', () => {
   crdv.start();
   return gulp
     .src('./test/electron/*.spec.js')
-    .pipe(mocha({ require: ['babel-polyfill', 'co-mocha'] }))
+    .pipe(mocha({ require: ['@babel/polyfill', 'co-mocha'] }))
     .on('end', () => crdv.stop());
 });
 
diff --git a/extension/package.json b/extension/package.json
index 3eaeed79..6bdb884b 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -35,6 +35,7 @@
     "@babel/core": "^7.11.1",
     "@babel/plugin-proposal-class-properties": "^7.10.4",
     "@babel/plugin-proposal-decorators": "^7.12.1",
+    "@babel/polyfill": "^7.12.1",
     "@babel/preset-env": "^7.11.0",
     "@babel/preset-react": "^7.10.4",
     "@babel/register": "^7.12.1",
diff --git a/extension/test/app/inject/enhancer.spec.js b/extension/test/app/inject/enhancer.spec.js
index 12e1103e..4a72c879 100644
--- a/extension/test/app/inject/enhancer.spec.js
+++ b/extension/test/app/inject/enhancer.spec.js
@@ -1,4 +1,4 @@
-import 'babel-polyfill';
+import '@babel/polyfill';
 import expect from 'expect';
 import { createStore, compose } from 'redux';
 import { insertScript, listenMessage } from '../../utils/inject';
diff --git a/extension/test/app/setup.js b/extension/test/app/setup.js
index ede23f8e..22e32956 100644
--- a/extension/test/app/setup.js
+++ b/extension/test/app/setup.js
@@ -1,5 +1,5 @@
-require('babel-register')();
-require('babel-polyfill');
+require('@babel/register')();
+require('@babel/polyfill');
 global.chrome = require('sinon-chrome');
 var jsdom = require('jsdom').jsdom;
 
diff --git a/extension/yarn.lock b/extension/yarn.lock
index 5e02dbd0..343c90f9 100644
--- a/extension/yarn.lock
+++ b/extension/yarn.lock
@@ -822,6 +822,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/polyfill@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96"
+  integrity sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==
+  dependencies:
+    core-js "^2.6.5"
+    regenerator-runtime "^0.13.4"
+
 "@babel/preset-env@^7.11.0":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"
@@ -2659,7 +2667,7 @@ core-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
-core-js@^2.4.0:
+core-js@^2.4.0, core-js@^2.6.5:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==