13 files changed, 22 insertions, 21 deletions
diff --git a/test/common/README.md b/test/common/README.md
index 7fd36f5985..daf295855b 100644
--- a/test/common/README.md
+++ b/test/common/README.md
@@ -392,7 +392,7 @@ require a particular action to be taken after a given number of completed
 tasks (for instance, shutting down an HTTP server after a specific number of
 requests). The Countdown will fail the test if the remainder did not reach 0.
 
-<!-- eslint-disable strict, required-modules -->
+<!-- eslint-disable strict, node-core/required-modules -->
 ```js
 const Countdown = require('../common/countdown');
 
@@ -526,7 +526,7 @@ Returns the result of
 The http2.js module provides a handful of utilities for creating mock HTTP/2
 frames for testing of HTTP/2 endpoints
 
-<!-- eslint-disable no-undef, no-unused-vars, required-modules, strict -->
+<!-- eslint-disable no-undef, no-unused-vars, node-core/required-modules, strict -->
 ```js
 const http2 = require('../common/http2');
 ```
@@ -536,7 +536,7 @@ const http2 = require('../common/http2');
 The `http2.Frame` is a base class that creates a `Buffer` containing a
 serialized HTTP/2 frame header.
 
-<!-- eslint-disable no-undef, no-unused-vars, required-modules, strict -->
+<!-- eslint-disable no-undef, no-unused-vars, node-core/required-modules, strict -->
 ```js
 // length is a 24-bit unsigned integer
 // type is an 8-bit unsigned integer identifying the frame type
@@ -555,7 +555,7 @@ The serialized `Buffer` may be retrieved using the `frame.data` property.
 The `http2.DataFrame` is a subclass of `http2.Frame` that serializes a `DATA`
 frame.
 
-<!-- eslint-disable no-undef, no-unused-vars, required-modules, strict -->
+<!-- eslint-disable no-undef, no-unused-vars, node-core/required-modules, strict -->
 ```js
 // id is the 32-bit stream identifier
 // payload is a Buffer containing the DATA payload
@@ -572,7 +572,7 @@ socket.write(frame.data);
 The `http2.HeadersFrame` is a subclass of `http2.Frame` that serializes a
 `HEADERS` frame.
 
-<!-- eslint-disable no-undef, no-unused-vars, required-modules, strict -->
+<!-- eslint-disable no-undef, no-unused-vars, node-core/required-modules, strict -->
 ```js
 // id is the 32-bit stream identifier
 // payload is a Buffer containing the HEADERS payload (see either
@@ -590,7 +590,7 @@ socket.write(frame.data);
 The `http2.SettingsFrame` is a subclass of `http2.Frame` that serializes an
 empty `SETTINGS` frame.
 
-<!-- eslint-disable no-undef, no-unused-vars, required-modules, strict -->
+<!-- eslint-disable no-undef, no-unused-vars, node-core/required-modules, strict -->
 ```js
 // ack is a boolean indicating whether or not to set the ACK flag.
 const frame = new http2.SettingsFrame(ack);
@@ -603,7 +603,7 @@ socket.write(frame.data);
 Set to a `Buffer` instance that contains a minimal set of serialized HTTP/2
 request headers to be used as the payload of a `http2.HeadersFrame`.
 
-<!-- eslint-disable no-undef, no-unused-vars, required-modules, strict -->
+<!-- eslint-disable no-undef, no-unused-vars, node-core/required-modules, strict -->
 ```js
 const frame = new http2.HeadersFrame(1, http2.kFakeRequestHeaders, 0, true);
 
@@ -615,7 +615,7 @@ socket.write(frame.data);
 Set to a `Buffer` instance that contains a minimal set of serialized HTTP/2
 response headers to be used as the payload a `http2.HeadersFrame`.
 
-<!-- eslint-disable no-undef, no-unused-vars, required-modules, strict -->
+<!-- eslint-disable no-undef, no-unused-vars, node-core/required-modules, strict -->
 ```js
 const frame = new http2.HeadersFrame(1, http2.kFakeResponseHeaders, 0, true);
 
@@ -627,7 +627,7 @@ socket.write(frame.data);
 Set to a `Buffer` containing the preamble bytes an HTTP/2 client must send
 upon initial establishment of a connection.
 
-<!-- eslint-disable no-undef, no-unused-vars, required-modules, strict -->
+<!-- eslint-disable no-undef, no-unused-vars, node-core/required-modules, strict -->
 ```js
 socket.write(http2.kClientMagic);
 ```
diff --git a/test/common/benchmark.js b/test/common/benchmark.js
index 6496da1cfb..1fd4476ba5 100644
--- a/test/common/benchmark.js
+++ b/test/common/benchmark.js
@@ -1,4 +1,4 @@
-/* eslint-disable required-modules */
+/* eslint-disable node-core/required-modules */
 
 'use strict';
 
diff --git a/test/common/countdown.js b/test/common/countdown.js
index 5fcb77c4ed..67252657ec 100644
--- a/test/common/countdown.js
+++ b/test/common/countdown.js
@@ -1,4 +1,5 @@
-/* eslint-disable required-modules */
+/* eslint-disable node-core/required-modules */
+
 'use strict';
 
 const assert = require('assert');
diff --git a/test/common/dns.js b/test/common/dns.js
index 69c67ac541..07f84d7a37 100644
--- a/test/common/dns.js
+++ b/test/common/dns.js
@@ -1,4 +1,4 @@
-/* eslint-disable required-modules */
+/* eslint-disable node-core/required-modules */
 'use strict';
 
 const assert = require('assert');
diff --git a/test/common/duplexpair.js b/test/common/duplexpair.js
index ea5bd86a04..fb4faca548 100644
--- a/test/common/duplexpair.js
+++ b/test/common/duplexpair.js
@@ -1,4 +1,4 @@
-/* eslint-disable required-modules */
+/* eslint-disable node-core/required-modules */
 'use strict';
 const { Duplex } = require('stream');
 const assert = require('assert');
diff --git a/test/common/fixtures.js b/test/common/fixtures.js
index b4b7c042e8..b45e5bc809 100644
--- a/test/common/fixtures.js
+++ b/test/common/fixtures.js
@@ -1,4 +1,4 @@
-/* eslint-disable required-modules */
+/* eslint-disable node-core/required-modules */
 'use strict';
 
 const path = require('path');
diff --git a/test/common/http2.js b/test/common/http2.js
index 1d4c269fff..0f3378e9b8 100644
--- a/test/common/http2.js
+++ b/test/common/http2.js
@@ -1,4 +1,4 @@
-/* eslint-disable required-modules */
+/* eslint-disable node-core/required-modules */
 'use strict';
 
 // An HTTP/2 testing tool used to create mock frames for direct testing
diff --git a/test/common/index.js b/test/common/index.js
index 1fc029292a..54b146814a 100644
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -19,7 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-disable required-modules, crypto-check */
+/* eslint-disable node-core/required-modules, node-core/crypto-check */
 'use strict';
 const process = global.process;  // Some tests tamper with the process global.
 const path = require('path');
diff --git a/test/common/index.mjs b/test/common/index.mjs
index 00eceb79d4..6d6fe4997b 100644
--- a/test/common/index.mjs
+++ b/test/common/index.mjs
@@ -1,5 +1,5 @@
 // Flags: --experimental-modules
-/* eslint-disable required-modules */
+/* eslint-disable node-core/required-modules */
 
 import assert from 'assert';
 
diff --git a/test/common/internet.js b/test/common/internet.js
index 48b532ca8e..3880aa114e 100644
--- a/test/common/internet.js
+++ b/test/common/internet.js
@@ -1,4 +1,4 @@
-/* eslint-disable required-modules */
+/* eslint-disable node-core/required-modules */
 'use strict';
 
 // Utilities for internet-related tests
diff --git a/test/common/shared-lib-util.js b/test/common/shared-lib-util.js
index 7ff7518ac3..5699c4f74c 100644
--- a/test/common/shared-lib-util.js
+++ b/test/common/shared-lib-util.js
@@ -1,4 +1,4 @@
-/* eslint-disable required-modules */
+/* eslint-disable node-core/required-modules */
 'use strict';
 const path = require('path');
 
diff --git a/test/common/tmpdir.js b/test/common/tmpdir.js
index ed731b3e7a..d0221abbb2 100644
--- a/test/common/tmpdir.js
+++ b/test/common/tmpdir.js
@@ -1,4 +1,4 @@
-/* eslint-disable required-modules */
+/* eslint-disable node-core/required-modules */
 'use strict';
 
 const fs = require('fs');
diff --git a/test/common/wpt.js b/test/common/wpt.js
index 52d8b7a580..7cd644dc88 100644
--- a/test/common/wpt.js
+++ b/test/common/wpt.js
@@ -1,4 +1,4 @@
-/* eslint-disable required-modules */
+/* eslint-disable node-core/required-modules */
 'use strict';
 
 const assert = require('assert');