diff --git a/packages/babel-core/test/api.js b/packages/babel-core/test/api.js
index 2bcbd9007d..1ab0ece980 100644
--- a/packages/babel-core/test/api.js
+++ b/packages/babel-core/test/api.js
@@ -3,7 +3,7 @@ import sourceMap from "source-map";
 import assert from "assert";
 import path from "path";
 import Plugin from "../lib/config/plugin";
-import generator from "babel-generator";
+import generator from "@babel/generator";
 
 function assertIgnored(result) {
   assert.ok(!result);
diff --git a/packages/babel-core/test/evaluation.js b/packages/babel-core/test/evaluation.js
index f055238322..5b1ea38b80 100644
--- a/packages/babel-core/test/evaluation.js
+++ b/packages/babel-core/test/evaluation.js
@@ -1,4 +1,4 @@
-import traverse from "babel-traverse";
+import traverse from "@babel/traverse";
 import assert from "assert";
 import { parse } from "babylon";
 
diff --git a/packages/babel-core/test/plugins.js b/packages/babel-core/test/plugins.js
index 0f1e3245ad..54d3623798 100644
--- a/packages/babel-core/test/plugins.js
+++ b/packages/babel-core/test/plugins.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-transform-fixture-test-runner";
+import runner from "@babel/helper-transform-fixture-test-runner";
 
 runner(`${__dirname}/fixtures/plugins`, "plugins");
diff --git a/packages/babel-core/test/transformation.js b/packages/babel-core/test/transformation.js
index 6b663895d6..196beec383 100644
--- a/packages/babel-core/test/transformation.js
+++ b/packages/babel-core/test/transformation.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-transform-fixture-test-runner";
+import runner from "@babel/helper-transform-fixture-test-runner";
 
 runner(`${__dirname}/fixtures/transformation`, "transformation");
diff --git a/packages/babel-generator/test/index.js b/packages/babel-generator/test/index.js
index 58d7bdcf13..40bbf8c12e 100644
--- a/packages/babel-generator/test/index.js
+++ b/packages/babel-generator/test/index.js
@@ -3,10 +3,10 @@ import generate, { CodeGenerator } from "../lib";
 import assert from "assert";
 import { parse } from "babylon";
 import chai from "chai";
-import * as t from "babel-types";
+import * as t from "@babel/types";
 import fs from "fs";
 import path from "path";
-import fixtures from "babel-helper-fixtures";
+import fixtures from "@babel/helper-fixtures";
 
 describe("generation", function() {
   it("completeness", function() {
diff --git a/packages/babel-helper-module-imports/test/index.js b/packages/babel-helper-module-imports/test/index.js
index c60490da1c..7f2f303788 100644
--- a/packages/babel-helper-module-imports/test/index.js
+++ b/packages/babel-helper-module-imports/test/index.js
@@ -1,5 +1,5 @@
 import chai from "chai";
-import * as babel from "babel-core";
+import * as babel from "@babel/core";
 
 import { ImportInjector } from "../";
 
diff --git a/packages/babel-helpers/test/helpers/define-helper.js b/packages/babel-helpers/test/helpers/define-helper.js
index 1bfb25703a..134d2e18cf 100644
--- a/packages/babel-helpers/test/helpers/define-helper.js
+++ b/packages/babel-helpers/test/helpers/define-helper.js
@@ -1,5 +1,5 @@
 import path from "path";
-import template from "babel-template";
+import template from "@babel/template";
 import helpers from "../../lib/helpers";
 
 function getHelperId(dir, name) {
diff --git a/packages/babel-helpers/test/index.js b/packages/babel-helpers/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-helpers/test/index.js
+++ b/packages/babel-helpers/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-check-es2015-constants/test/index.js b/packages/babel-plugin-check-es2015-constants/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-check-es2015-constants/test/index.js
+++ b/packages/babel-plugin-check-es2015-constants/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-async-generator-functions/test/index.js b/packages/babel-plugin-transform-async-generator-functions/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-async-generator-functions/test/index.js
+++ b/packages/babel-plugin-transform-async-generator-functions/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-async-to-generator/test/index.js b/packages/babel-plugin-transform-async-to-generator/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-async-to-generator/test/index.js
+++ b/packages/babel-plugin-transform-async-to-generator/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-async-to-module-method/test/index.js b/packages/babel-plugin-transform-async-to-module-method/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-async-to-module-method/test/index.js
+++ b/packages/babel-plugin-transform-async-to-module-method/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-class-properties/test/index.js b/packages/babel-plugin-transform-class-properties/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-class-properties/test/index.js
+++ b/packages/babel-plugin-transform-class-properties/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-decorators/test/index.js b/packages/babel-plugin-transform-decorators/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-decorators/test/index.js
+++ b/packages/babel-plugin-transform-decorators/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-do-expressions/test/index.js b/packages/babel-plugin-transform-do-expressions/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-do-expressions/test/index.js
+++ b/packages/babel-plugin-transform-do-expressions/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-arrow-functions/test/index.js b/packages/babel-plugin-transform-es2015-arrow-functions/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-arrow-functions/test/index.js
+++ b/packages/babel-plugin-transform-es2015-arrow-functions/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-block-scoping/test/index.js b/packages/babel-plugin-transform-es2015-block-scoping/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-block-scoping/test/index.js
+++ b/packages/babel-plugin-transform-es2015-block-scoping/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-classes/test/index.js b/packages/babel-plugin-transform-es2015-classes/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-classes/test/index.js
+++ b/packages/babel-plugin-transform-es2015-classes/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-computed-properties/test/index.js b/packages/babel-plugin-transform-es2015-computed-properties/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-computed-properties/test/index.js
+++ b/packages/babel-plugin-transform-es2015-computed-properties/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-destructuring/test/index.js b/packages/babel-plugin-transform-es2015-destructuring/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-destructuring/test/index.js
+++ b/packages/babel-plugin-transform-es2015-destructuring/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-duplicate-keys/test/index.js b/packages/babel-plugin-transform-es2015-duplicate-keys/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-duplicate-keys/test/index.js
+++ b/packages/babel-plugin-transform-es2015-duplicate-keys/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-for-of/test/index.js b/packages/babel-plugin-transform-es2015-for-of/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-for-of/test/index.js
+++ b/packages/babel-plugin-transform-es2015-for-of/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-function-name/test/index.js b/packages/babel-plugin-transform-es2015-function-name/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-function-name/test/index.js
+++ b/packages/babel-plugin-transform-es2015-function-name/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-instanceof/test/index.js b/packages/babel-plugin-transform-es2015-instanceof/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-instanceof/test/index.js
+++ b/packages/babel-plugin-transform-es2015-instanceof/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-modules-amd/test/index.js b/packages/babel-plugin-transform-es2015-modules-amd/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-modules-amd/test/index.js
+++ b/packages/babel-plugin-transform-es2015-modules-amd/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/index.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/index.js
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-modules-systemjs/test/index.js b/packages/babel-plugin-transform-es2015-modules-systemjs/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-modules-systemjs/test/index.js
+++ b/packages/babel-plugin-transform-es2015-modules-systemjs/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/index.js b/packages/babel-plugin-transform-es2015-modules-umd/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-modules-umd/test/index.js
+++ b/packages/babel-plugin-transform-es2015-modules-umd/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-object-super/test/index.js b/packages/babel-plugin-transform-es2015-object-super/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-object-super/test/index.js
+++ b/packages/babel-plugin-transform-es2015-object-super/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-parameters/test/index.js b/packages/babel-plugin-transform-es2015-parameters/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-parameters/test/index.js
+++ b/packages/babel-plugin-transform-es2015-parameters/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-shorthand-properties/test/index.js b/packages/babel-plugin-transform-es2015-shorthand-properties/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-shorthand-properties/test/index.js
+++ b/packages/babel-plugin-transform-es2015-shorthand-properties/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-spread/test/index.js b/packages/babel-plugin-transform-es2015-spread/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-spread/test/index.js
+++ b/packages/babel-plugin-transform-es2015-spread/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-sticky-regex/test/index.js b/packages/babel-plugin-transform-es2015-sticky-regex/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-sticky-regex/test/index.js
+++ b/packages/babel-plugin-transform-es2015-sticky-regex/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-template-literals/test/index.js b/packages/babel-plugin-transform-es2015-template-literals/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-template-literals/test/index.js
+++ b/packages/babel-plugin-transform-es2015-template-literals/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-typeof-symbol/test/index.js b/packages/babel-plugin-transform-es2015-typeof-symbol/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-typeof-symbol/test/index.js
+++ b/packages/babel-plugin-transform-es2015-typeof-symbol/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es2015-unicode-regex/test/index.js b/packages/babel-plugin-transform-es2015-unicode-regex/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es2015-unicode-regex/test/index.js
+++ b/packages/babel-plugin-transform-es2015-unicode-regex/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es3-member-expression-literals/test/index.js b/packages/babel-plugin-transform-es3-member-expression-literals/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es3-member-expression-literals/test/index.js
+++ b/packages/babel-plugin-transform-es3-member-expression-literals/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es3-property-literals/test/index.js b/packages/babel-plugin-transform-es3-property-literals/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es3-property-literals/test/index.js
+++ b/packages/babel-plugin-transform-es3-property-literals/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-es5-property-mutators/test/index.js b/packages/babel-plugin-transform-es5-property-mutators/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-es5-property-mutators/test/index.js
+++ b/packages/babel-plugin-transform-es5-property-mutators/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-exponentiation-operator/test/index.js b/packages/babel-plugin-transform-exponentiation-operator/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-exponentiation-operator/test/index.js
+++ b/packages/babel-plugin-transform-exponentiation-operator/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-export-default/test/index.js b/packages/babel-plugin-transform-export-default/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-export-default/test/index.js
+++ b/packages/babel-plugin-transform-export-default/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-export-namespace/test/index.js b/packages/babel-plugin-transform-export-namespace/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-export-namespace/test/index.js
+++ b/packages/babel-plugin-transform-export-namespace/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-flow-comments/test/index.js b/packages/babel-plugin-transform-flow-comments/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-flow-comments/test/index.js
+++ b/packages/babel-plugin-transform-flow-comments/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/index.js b/packages/babel-plugin-transform-flow-strip-types/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-flow-strip-types/test/index.js
+++ b/packages/babel-plugin-transform-flow-strip-types/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-function-bind/test/index.js b/packages/babel-plugin-transform-function-bind/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-function-bind/test/index.js
+++ b/packages/babel-plugin-transform-function-bind/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-function-sent/test/index.js b/packages/babel-plugin-transform-function-sent/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-function-sent/test/index.js
+++ b/packages/babel-plugin-transform-function-sent/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-jscript/test/index.js b/packages/babel-plugin-transform-jscript/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-jscript/test/index.js
+++ b/packages/babel-plugin-transform-jscript/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-new-target/test/index.js b/packages/babel-plugin-transform-new-target/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-new-target/test/index.js
+++ b/packages/babel-plugin-transform-new-target/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-numeric-separator/test/index.js b/packages/babel-plugin-transform-numeric-separator/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-numeric-separator/test/index.js
+++ b/packages/babel-plugin-transform-numeric-separator/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-object-rest-spread/test/index.js b/packages/babel-plugin-transform-object-rest-spread/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-object-rest-spread/test/index.js
+++ b/packages/babel-plugin-transform-object-rest-spread/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-optional-catch-binding/test/index.js b/packages/babel-plugin-transform-optional-catch-binding/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-optional-catch-binding/test/index.js
+++ b/packages/babel-plugin-transform-optional-catch-binding/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-optional-chaining/test/index.js b/packages/babel-plugin-transform-optional-chaining/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-optional-chaining/test/index.js
+++ b/packages/babel-plugin-transform-optional-chaining/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-pipeline-operator/test/index.js b/packages/babel-plugin-transform-pipeline-operator/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-pipeline-operator/test/index.js
+++ b/packages/babel-plugin-transform-pipeline-operator/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-proto-to-assign/test/index.js b/packages/babel-plugin-transform-proto-to-assign/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-proto-to-assign/test/index.js
+++ b/packages/babel-plugin-transform-proto-to-assign/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-react-constant-elements/test/index.js b/packages/babel-plugin-transform-react-constant-elements/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-react-constant-elements/test/index.js
+++ b/packages/babel-plugin-transform-react-constant-elements/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-react-display-name/test/index.js b/packages/babel-plugin-transform-react-display-name/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-react-display-name/test/index.js
+++ b/packages/babel-plugin-transform-react-display-name/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-react-inline-elements/test/index.js b/packages/babel-plugin-transform-react-inline-elements/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-react-inline-elements/test/index.js
+++ b/packages/babel-plugin-transform-react-inline-elements/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-react-jsx-compat/test/index.js b/packages/babel-plugin-transform-react-jsx-compat/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-react-jsx-compat/test/index.js
+++ b/packages/babel-plugin-transform-react-jsx-compat/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-react-jsx-self/test/index.js b/packages/babel-plugin-transform-react-jsx-self/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-react-jsx-self/test/index.js
+++ b/packages/babel-plugin-transform-react-jsx-self/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-react-jsx-source/test/index.js b/packages/babel-plugin-transform-react-jsx-source/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-react-jsx-source/test/index.js
+++ b/packages/babel-plugin-transform-react-jsx-source/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-react-jsx/test/index.js b/packages/babel-plugin-transform-react-jsx/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-react-jsx/test/index.js
+++ b/packages/babel-plugin-transform-react-jsx/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-regenerator/test/index.js b/packages/babel-plugin-transform-regenerator/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-regenerator/test/index.js
+++ b/packages/babel-plugin-transform-regenerator/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/full/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/full/expected.js
index 904737f9ba..3442c14425 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/full/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/full/expected.js
@@ -1,5 +1,5 @@
-import _regeneratorRuntime from "babel-runtime/regenerator";
-import _Symbol from "babel-runtime/core-js/symbol";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _Symbol from "@babel/runtime/core-js/symbol";
 
 var _marked =
 /*#__PURE__*/
diff --git a/packages/babel-plugin-transform-runtime/test/index.js b/packages/babel-plugin-transform-runtime/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-runtime/test/index.js
+++ b/packages/babel-plugin-transform-runtime/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-strict-mode/test/index.js b/packages/babel-plugin-transform-strict-mode/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-strict-mode/test/index.js
+++ b/packages/babel-plugin-transform-strict-mode/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-throw-expressions/test/index.js b/packages/babel-plugin-transform-throw-expressions/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-plugin-transform-throw-expressions/test/index.js
+++ b/packages/babel-plugin-transform-throw-expressions/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-plugin-transform-typescript/test/index.js b/packages/babel-plugin-transform-typescript/test/index.js
index 18cb06a8b6..8c71ab59f5 100644
--- a/packages/babel-plugin-transform-typescript/test/index.js
+++ b/packages/babel-plugin-transform-typescript/test/index.js
@@ -1,2 +1,2 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 runner(__dirname);
diff --git a/packages/babel-preset-es2015/test/esnext.js b/packages/babel-preset-es2015/test/esnext.js
index 97f8aaad47..ddc7a761b4 100644
--- a/packages/babel-preset-es2015/test/esnext.js
+++ b/packages/babel-preset-es2015/test/esnext.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-transform-fixture-test-runner";
+import runner from "@babel/helper-transform-fixture-test-runner";
 
 runner(`${__dirname}/fixtures/esnext`, "esnext");
diff --git a/packages/babel-preset-es2015/test/preset-options.js b/packages/babel-preset-es2015/test/preset-options.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-preset-es2015/test/preset-options.js
+++ b/packages/babel-preset-es2015/test/preset-options.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-preset-es2015/test/traceur.js b/packages/babel-preset-es2015/test/traceur.js
index 98525618fe..9b35916587 100644
--- a/packages/babel-preset-es2015/test/traceur.js
+++ b/packages/babel-preset-es2015/test/traceur.js
@@ -1,5 +1,5 @@
 import includes from "lodash/includes";
-import runner from "babel-helper-transform-fixture-test-runner";
+import runner from "@babel/helper-transform-fixture-test-runner";
 
 runner(
   `${__dirname}/fixtures/traceur`,
diff --git a/packages/babel-preset-flow/test/flow.js b/packages/babel-preset-flow/test/flow.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-preset-flow/test/flow.js
+++ b/packages/babel-preset-flow/test/flow.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-preset-react/test/preset-options.js b/packages/babel-preset-react/test/preset-options.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-preset-react/test/preset-options.js
+++ b/packages/babel-preset-react/test/preset-options.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-template/test/template.js b/packages/babel-template/test/template.js
index e2916f2d14..95dcb9760e 100644
--- a/packages/babel-template/test/template.js
+++ b/packages/babel-template/test/template.js
@@ -1,5 +1,5 @@
 import generator from "../../babel-generator";
-import * as t from "babel-types";
+import * as t from "@babel/types";
 import template from "../lib";
 import chai from "chai";
 const expect = chai.expect;
diff --git a/packages/babel-traverse/test/arrow-transform.js b/packages/babel-traverse/test/arrow-transform.js
index 597c94f82c..9f9ccfdda4 100644
--- a/packages/babel-traverse/test/arrow-transform.js
+++ b/packages/babel-traverse/test/arrow-transform.js
@@ -1,8 +1,8 @@
 import { NodePath } from "../lib";
 import assert from "assert";
 import { parse } from "babylon";
-import generate from "babel-generator";
-import * as t from "babel-types";
+import generate from "@babel/generator";
+import * as t from "@babel/types";
 
 function assertConversion(
   input,
diff --git a/packages/babel-traverse/test/conversion.js b/packages/babel-traverse/test/conversion.js
index f5f383269a..69ee78bf2d 100644
--- a/packages/babel-traverse/test/conversion.js
+++ b/packages/babel-traverse/test/conversion.js
@@ -1,8 +1,8 @@
 import traverse from "../lib";
 import assert from "assert";
 import { parse } from "babylon";
-import generate from "babel-generator";
-import * as t from "babel-types";
+import generate from "@babel/generator";
+import * as t from "@babel/types";
 
 function getPath(code) {
   const ast = parse(code);
diff --git a/packages/babel-traverse/test/index.js b/packages/babel-traverse/test/index.js
index 09cfbc31f5..1b534b8fc6 100644
--- a/packages/babel-traverse/test/index.js
+++ b/packages/babel-traverse/test/index.js
@@ -1,3 +1,3 @@
-import runner from "babel-helper-plugin-test-runner";
+import runner from "@babel/helper-plugin-test-runner";
 
 runner(__dirname);
diff --git a/packages/babel-traverse/test/inference.js b/packages/babel-traverse/test/inference.js
index b5af4d6c3f..418750db4b 100644
--- a/packages/babel-traverse/test/inference.js
+++ b/packages/babel-traverse/test/inference.js
@@ -1,7 +1,7 @@
 import traverse from "../lib";
 import assert from "assert";
 import { parse } from "babylon";
-import * as t from "babel-types";
+import * as t from "@babel/types";
 
 function getPath(code) {
   const ast = parse(code, { plugins: ["flow", "asyncGenerators"] });
diff --git a/packages/babel-traverse/test/modification.js b/packages/babel-traverse/test/modification.js
index 0e0936becc..ea7db834fe 100644
--- a/packages/babel-traverse/test/modification.js
+++ b/packages/babel-traverse/test/modification.js
@@ -1,8 +1,8 @@
 import traverse from "../lib";
 import assert from "assert";
 import { parse } from "babylon";
-import generate from "babel-generator";
-import * as t from "babel-types";
+import generate from "@babel/generator";
+import * as t from "@babel/types";
 
 function getPath(code) {
   const ast = parse(code);
diff --git a/packages/babel-traverse/test/removal.js b/packages/babel-traverse/test/removal.js
index a552a20193..3b953844c5 100644
--- a/packages/babel-traverse/test/removal.js
+++ b/packages/babel-traverse/test/removal.js
@@ -1,7 +1,7 @@
 import traverse from "../lib";
 import assert from "assert";
 import { parse } from "babylon";
-import generate from "babel-generator";
+import generate from "@babel/generator";
 
 function getPath(code) {
   const ast = parse(code);
diff --git a/packages/babel-traverse/test/replacement.js b/packages/babel-traverse/test/replacement.js
index 6bcf2d3da5..853f90f117 100644
--- a/packages/babel-traverse/test/replacement.js
+++ b/packages/babel-traverse/test/replacement.js
@@ -1,7 +1,7 @@
 import traverse from "../lib";
 import assert from "assert";
 import { parse } from "babylon";
-import * as t from "babel-types";
+import * as t from "@babel/types";
 import { expect } from "chai";
 
 describe("path/replacement", function() {
diff --git a/packages/babel-types/test/converters.js b/packages/babel-types/test/converters.js
index 38221205bd..29836b704a 100644
--- a/packages/babel-types/test/converters.js
+++ b/packages/babel-types/test/converters.js
@@ -1,7 +1,7 @@
 import * as t from "../lib";
 import { assert } from "chai";
 import { parse } from "babylon";
-import generate from "babel-generator";
+import generate from "@babel/generator";
 
 function parseCode(string) {
   return parse(string, {