diff --git a/.eslintrc.js b/.eslintrc.js
index 00637dabed5e..af84f3fef1c6 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -173,7 +173,7 @@ module.exports = {
     {
       ...removeOverrides(xpcshellTestConfig),
       files: testPaths.xpcshell.map(path => `${path}**`),
-      excludedFiles: ["**/*.jsm", "**/*.mjs"],
+      excludedFiles: ["**/*.jsm", "**/*.mjs", "**/*.sjs"],
     },
     {
       // If it is an xpcshell head file, we turn off global unused variable checks, as it
@@ -212,7 +212,7 @@ module.exports = {
     {
       ...removeOverrides(browserTestConfig),
       files: testPaths.browser.map(path => `${path}**`),
-      excludedFiles: ["**/*.jsm", "**/*.mjs"],
+      excludedFiles: ["**/*.jsm", "**/*.mjs", "**/*.sjs"],
     },
     {
       ...removeOverrides(mochitestTestConfig),
@@ -226,7 +226,7 @@ module.exports = {
     {
       ...removeOverrides(chromeTestConfig),
       files: testPaths.chrome.map(path => `${path}**`),
-      excludedFiles: ["**/*.jsm", "**/*.mjs"],
+      excludedFiles: ["**/*.jsm", "**/*.mjs", "**/*.sjs"],
     },
     {
       env: {
@@ -239,6 +239,7 @@ module.exports = {
         ...testPaths.mochitest.map(path => `${path}/**/*.js`),
         ...testPaths.chrome.map(path => `${path}/**/*.js`),
       ],
+      excludedFiles: ["**/*.jsm", "**/*.mjs", "**/*.sjs"],
     },
     {
       // Some directories have multiple kinds of tests, and some rules
diff --git a/browser/base/content/test/tabs/wait-a-bit.sjs b/browser/base/content/test/tabs/wait-a-bit.sjs
index e90133d75289..80cd891d3c66 100644
--- a/browser/base/content/test/tabs/wait-a-bit.sjs
+++ b/browser/base/content/test/tabs/wait-a-bit.sjs
@@ -3,7 +3,6 @@
 
 "use strict";
 
-// eslint-disable-next-line mozilla/no-redeclare-with-import-autofix
 const { setTimeout } = ChromeUtils.importESModule(
   "resource://gre/modules/Timer.sys.mjs"
 );
diff --git a/browser/components/extensions/test/browser/wait-a-bit.sjs b/browser/components/extensions/test/browser/wait-a-bit.sjs
index e90133d75289..80cd891d3c66 100644
--- a/browser/components/extensions/test/browser/wait-a-bit.sjs
+++ b/browser/components/extensions/test/browser/wait-a-bit.sjs
@@ -3,7 +3,6 @@
 
 "use strict";
 
-// eslint-disable-next-line mozilla/no-redeclare-with-import-autofix
 const { setTimeout } = ChromeUtils.importESModule(
   "resource://gre/modules/Timer.sys.mjs"
 );
diff --git a/netwerk/test/browser/early_hint_main_redirect.sjs b/netwerk/test/browser/early_hint_main_redirect.sjs
index 0da69d5ceec5..4b491b85f23d 100644
--- a/netwerk/test/browser/early_hint_main_redirect.sjs
+++ b/netwerk/test/browser/early_hint_main_redirect.sjs
@@ -1,8 +1,5 @@
 "use strict";
 
-// In an SJS file we need to get the setTimeout bits ourselves, despite
-// what eslint might think applies for browser tests.
-// eslint-disable-next-line mozilla/no-redeclare-with-import-autofix
 let { setTimeout } = ChromeUtils.importESModule(
   "resource://gre/modules/Timer.sys.mjs"
 );
diff --git a/toolkit/components/passwordmgr/test/browser/file_focus_before_DOMContentLoaded.sjs b/toolkit/components/passwordmgr/test/browser/file_focus_before_DOMContentLoaded.sjs
index b99246c166b1..234bcc70d82a 100644
--- a/toolkit/components/passwordmgr/test/browser/file_focus_before_DOMContentLoaded.sjs
+++ b/toolkit/components/passwordmgr/test/browser/file_focus_before_DOMContentLoaded.sjs
@@ -6,9 +6,6 @@
 
 const DELAY = 2 * 1000; // Delay two seconds before completing the request.
 
-// In an SJS file we need to get the setTimeout bits ourselves, despite
-// what eslint might think applies for browser tests.
-// eslint-disable-next-line mozilla/no-redeclare-with-import-autofix
 let { setTimeout } = ChromeUtils.importESModule(
   "resource://gre/modules/Timer.sys.mjs"
 );
diff --git a/toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs b/toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs
index e2a889c3299e..5c0ba6df9636 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs
+++ b/toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs
@@ -1,6 +1,3 @@
-// In an SJS file we need to get NetUtil ourselves, despite
-// what eslint might think applies for browser tests.
-// eslint-disable-next-line mozilla/no-redeclare-with-import-autofix
 let { NetUtil } = ChromeUtils.importESModule(
   "resource://gre/modules/NetUtil.sys.mjs"
 );