nodejs
diff --git a/‎lib/internal/test_runner/test.js‎
Lines changed: 6 additions & 14 deletions b/‎lib/internal/test_runner/test.js‎
Lines changed: 6 additions & 14 deletions
@@ -23,7 +23,6 @@ const {
   SafeMap,
   SafePromiseAll,
   SafePromiseAllReturnVoid,
-  SafePromisePrototypeFinally,
   SafePromiseRace,
   SafeSet,
   StringPrototypeStartsWith,
@@ -1259,27 +1258,20 @@ class Suite extends Test {
       this.skipped = false;
     }
 
+    this.buildSuite = this.createBuild();
+    this.fn = noop;
+  }
+
+  async createBuild() {
     try {
       const { ctx, args } = this.getRunArgs();
       const runArgs = [this.fn, ctx];
       ArrayPrototypePushApply(runArgs, args);
-      this.buildSuite = SafePromisePrototypeFinally(
-        PromisePrototypeThen(
-          PromiseResolve(ReflectApply(this.runInAsyncScope, this, runArgs)),
-          undefined,
-          (err) => {
-            this.fail(new ERR_TEST_FAILURE(err, kTestCodeFailure));
-          }),
-        () => this.postBuild(),
-      );
+      await ReflectApply(this.runInAsyncScope, this, runArgs);
     } catch (err) {
       this.fail(new ERR_TEST_FAILURE(err, kTestCodeFailure));
-      this.postBuild();
     }
-    this.fn = noop;
-  }
 
-  postBuild() {
     this.buildPhaseFinished = true;
   }