nodejs
diff --git a/‎lib/internal/errors.js‎
Lines changed: 11 additions & 1 deletion b/‎lib/internal/errors.js‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎test/parallel/test-internal-error-original-names.js‎
Lines changed: 35 additions & 0 deletions b/‎test/parallel/test-internal-error-original-names.js‎
Lines changed: 35 additions & 0 deletions
@@ -151,13 +151,18 @@ function makeSystemErrorWithCode(key) {
   };
 }
 
+let useOriginalName = false;
+
 function makeNodeErrorWithCode(Base, key) {
   return class NodeError extends Base {
     constructor(...args) {
       super(getMessage(key, args));
     }
 
     get name() {
+      if (useOriginalName) {
+        return super.name;
+      }
       return `${super.name} [${key}]`;
     }
 
@@ -439,7 +444,12 @@ module.exports = {
   getMessage,
   SystemError,
   codes,
-  E // This is exported only to facilitate testing.
+  // This is exported only to facilitate testing.
+  E,
+  // This allows us to tell the type of the errors without using
+  // instanceof, which is necessary in WPT harness.
+  get useOriginalName() { return useOriginalName; },
+  set useOriginalName(value) { useOriginalName = value; }
 };
 
 // To declare an error message, use the E(sym, val, def) function above. The sym
 
@@ -0,0 +1,35 @@
+// Flags: --expose-internals
+
+'use strict';
+
+// This tests `internal/errors.useOriginalName`
+// This testing feature is needed to allows us to assert the types of
+// errors without using instanceof, which is necessary in WPT harness.
+// Refs: https://github.com/nodejs/node/pull/22556
+
+require('../common');
+const assert = require('assert');
+const errors = require('internal/errors');
+
+
+errors.E('TEST_ERROR_1', 'Error for testing purposes: %s',
+         Error);
+{
+  const err = new errors.codes.TEST_ERROR_1('test');
+  assert(err instanceof Error);
+  assert.strictEqual(err.name, 'Error [TEST_ERROR_1]');
+}
+
+{
+  errors.useOriginalName = true;
+  const err = new errors.codes.TEST_ERROR_1('test');
+  assert(err instanceof Error);
+  assert.strictEqual(err.name, 'Error');
+}
+
+{
+  errors.useOriginalName = false;
+  const err = new errors.codes.TEST_ERROR_1('test');
+  assert(err instanceof Error);
+  assert.strictEqual(err.name, 'Error [TEST_ERROR_1]');
+}