diff --git a/babel.config.js b/babel.config.js
index 176e83ebae..124a101380 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -104,10 +104,12 @@ module.exports = function (api) {
       targets = { node: nodeVersion };
       needsPolyfillsForOldNode = true;
       break;
+    case "test":
+      targets = { node: "current" };
+      needsPolyfillsForOldNode = true;
+      break;
     case "development":
       envOpts.debug = true;
-    // fall through
-    case "test":
       targets = { node: "current" };
       break;
   }
diff --git a/packages/babel-cli/package.json b/packages/babel-cli/package.json
index efc0ba93f8..866a023a99 100644
--- a/packages/babel-cli/package.json
+++ b/packages/babel-cli/package.json
@@ -28,7 +28,7 @@
     "convert-source-map": "^1.1.0",
     "fs-readdir-recursive": "^1.1.0",
     "glob": "^7.0.0",
-    "make-dir": "^2.1.0",
+    "make-dir": "condition:BABEL_8_BREAKING ? : ^2.1.0",
     "slash": "condition:BABEL_8_BREAKING ? ^3.0.0 : ^2.0.0",
     "source-map": "^0.5.0"
   },
diff --git a/packages/babel-cli/test/index.js b/packages/babel-cli/test/index.js
index 2189c8c0ac..5635d038bc 100644
--- a/packages/babel-cli/test/index.js
+++ b/packages/babel-cli/test/index.js
@@ -1,7 +1,6 @@
 import readdir from "fs-readdir-recursive";
 import * as helper from "@babel/helper-fixtures";
 import rimraf from "rimraf";
-import { sync as makeDirSync } from "make-dir";
 import child from "child_process";
 import path from "path";
 import fs from "fs";
@@ -22,7 +21,7 @@ const fileFilter = function (x) {
 };
 
 const outputFileSync = function (filePath, data) {
-  makeDirSync(path.dirname(filePath));
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
   fs.writeFileSync(filePath, data);
 };
 
diff --git a/packages/babel-node/package.json b/packages/babel-node/package.json
index 56af696778..8749b0b86e 100644
--- a/packages/babel-node/package.json
+++ b/packages/babel-node/package.json
@@ -38,7 +38,7 @@
     "@babel/helper-fixtures": "workspace:*",
     "@babel/runtime": "workspace:*",
     "fs-readdir-recursive": "^1.0.0",
-    "make-dir": "^2.1.0",
+    "make-dir": "condition:BABEL_8_BREAKING ? : ^2.1.0",
     "rimraf": "^3.0.0"
   },
   "bin": {
diff --git a/packages/babel-node/test/fixtures.js b/packages/babel-node/test/fixtures.js
index 425e86e678..a9f6ec2a32 100644
--- a/packages/babel-node/test/fixtures.js
+++ b/packages/babel-node/test/fixtures.js
@@ -1,7 +1,6 @@
 import readdir from "fs-readdir-recursive";
 import * as helper from "@babel/helper-fixtures";
 import rimraf from "rimraf";
-import { sync as makeDirSync } from "make-dir";
 import child from "child_process";
 import path from "path";
 import fs from "fs";
@@ -20,7 +19,7 @@ const fileFilter = function (x) {
 };
 
 const outputFileSync = function (filePath, data) {
-  makeDirSync(path.dirname(filePath));
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
   fs.writeFileSync(filePath, data);
 };
 
diff --git a/packages/babel-plugin-transform-runtime/package.json b/packages/babel-plugin-transform-runtime/package.json
index efbbfd9a89..963b4d318f 100644
--- a/packages/babel-plugin-transform-runtime/package.json
+++ b/packages/babel-plugin-transform-runtime/package.json
@@ -40,7 +40,7 @@
     "@babel/runtime-corejs3": "workspace:*",
     "@babel/template": "workspace:*",
     "@babel/types": "workspace:*",
-    "make-dir": "^2.1.0"
+    "make-dir": "condition:BABEL_8_BREAKING ? : ^2.1.0"
   },
   "homepage": "https://babel.dev/docs/en/next/babel-plugin-transform-runtime",
   "engines": {
diff --git a/packages/babel-register/package.json b/packages/babel-register/package.json
index 5b07b6327a..4675158b67 100644
--- a/packages/babel-register/package.json
+++ b/packages/babel-register/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "clone-deep": "^4.0.1",
     "find-cache-dir": "condition:BABEL_8_BREAKING ? ^3.3.1 : ^2.0.0",
-    "make-dir": "^2.1.0",
+    "make-dir": "condition:BABEL_8_BREAKING ? : ^2.1.0",
     "pirates": "^4.0.0",
     "source-map-support": "^0.5.16"
   },
diff --git a/yarn.lock b/yarn.lock
index 43aec81463..bd3ff90df5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -134,7 +134,7 @@ __metadata:
     convert-source-map: ^1.1.0
     fs-readdir-recursive: ^1.1.0
     glob: ^7.0.0
-    make-dir: ^2.1.0
+    make-dir: "condition:BABEL_8_BREAKING ? : ^2.1.0"
     rimraf: ^3.0.0
     slash: "condition:BABEL_8_BREAKING ? ^3.0.0 : ^2.0.0"
     source-map: ^0.5.0
@@ -972,7 +972,7 @@ __metadata:
     commander: ^4.0.1
     core-js: ^3.16.0
     fs-readdir-recursive: ^1.0.0
-    make-dir: ^2.1.0
+    make-dir: "condition:BABEL_8_BREAKING ? : ^2.1.0"
     node-environment-flags: ^1.0.5
     regenerator-runtime: ^0.13.4
     rimraf: ^3.0.0
@@ -2872,7 +2872,7 @@ __metadata:
     babel-plugin-polyfill-corejs2: ^0.2.2
     babel-plugin-polyfill-corejs3: ^0.2.5
     babel-plugin-polyfill-regenerator: ^0.2.2
-    make-dir: ^2.1.0
+    make-dir: "condition:BABEL_8_BREAKING ? : ^2.1.0"
     semver: "condition:BABEL_8_BREAKING ? ^7.3.4 : ^6.3.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
@@ -3366,7 +3366,7 @@ __metadata:
     browserify: ^16.5.2
     clone-deep: ^4.0.1
     find-cache-dir: "condition:BABEL_8_BREAKING ? ^3.3.1 : ^2.0.0"
-    make-dir: ^2.1.0
+    make-dir: "condition:BABEL_8_BREAKING ? : ^2.1.0"
     pirates: ^4.0.0
     source-map-support: ^0.5.16
   peerDependencies:
@@ -11190,7 +11190,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"make-dir@npm:^2.0.0, make-dir@npm:^2.1.0":
+"make-dir-BABEL_8_BREAKING-false@npm:make-dir@^2.1.0, make-dir@npm:^2.0.0, make-dir@npm:^2.1.0":
   version: 2.1.0
   resolution: "make-dir@npm:2.1.0"
   dependencies:
@@ -11200,6 +11200,15 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"make-dir@condition:BABEL_8_BREAKING ? : ^2.1.0":
+  version: 0.0.0-condition-86eacd
+  resolution: "make-dir@condition:BABEL_8_BREAKING?:^2.1.0#86eacd"
+  dependencies:
+    make-dir-BABEL_8_BREAKING-false: "npm:make-dir@^2.1.0"
+  checksum: 98e37a75730bfb08722d3eac1295aa8a73960791e662f16491c49397f193f44ce2ac32938b71059b43ae9ff48003610edeeb2c59ac86c20d4b21d02a6dcc54a0
+  languageName: node
+  linkType: hard
+
 "make-dir@npm:^3.0.0, make-dir@npm:^3.0.2":
   version: 3.1.0
   resolution: "make-dir@npm:3.1.0"