diff --git a/tests/index.js b/tests/index.js
index 9f7a052943..3539f48136 100644
--- a/tests/index.js
+++ b/tests/index.js
@@ -10,6 +10,7 @@ const plugin = require('..');
 const index = require('../lib/rules');
 
 const ruleFiles = fs.readdirSync(path.resolve(__dirname, '../lib/rules/'))
+  .filter((f) => f.endsWith('.js'))
   .map((f) => path.basename(f, '.js'))
   .filter((f) => f !== 'index');
 
diff --git a/tests/lib/rules/jsx-uses-react.js b/tests/lib/rules/jsx-uses-react.js
index 3a8e39013c..381b44bc89 100644
--- a/tests/lib/rules/jsx-uses-react.js
+++ b/tests/lib/rules/jsx-uses-react.js
@@ -60,28 +60,67 @@ ruleTester.run('no-unused-vars', rule, {
   invalid: parsers.all([
     {
       code: '/*eslint react/jsx-uses-react:1*/ var React;',
-      errors: [{ message: '\'React\' is defined but never used.' }],
+      errors: [{
+        message: '\'React\' is defined but never used.',
+        suggestions: [{
+          messageId: 'removeVar',
+          output: '/*eslint react/jsx-uses-react:1*/ ',
+        }],
+      }],
     },
     {
       code: '/*eslint react/jsx-uses-react:1*/ /** @jsx Foo */ var React; <div />;',
-      errors: [{ message: '\'React\' is defined but never used.' }],
+      errors: [{
+        message: '\'React\' is defined but never used.',
+        suggestions: [{
+          messageId: 'removeVar',
+          output: '/*eslint react/jsx-uses-react:1*/ /** @jsx Foo */  <div />;',
+        }],
+      }],
     },
     {
       code: '/*eslint react/jsx-uses-react:1*/ var React; <div />;',
-      errors: [{ message: '\'React\' is defined but never used.' }],
+      errors: [{
+        message: '\'React\' is defined but never used.',
+        suggestions: [{
+          messageId: 'removeVar',
+          output: '/*eslint react/jsx-uses-react:1*/  <div />;',
+        }],
+      }],
       settings,
     },
     {
       code: '/*eslint react/jsx-uses-react:1*/ var Frag; <></>;',
-      errors: [{ message: '\'Frag\' is defined but never used.' }],
+      errors: [{
+        message: '\'Frag\' is defined but never used.',
+        suggestions: [{
+          messageId: 'removeVar',
+          output: '/*eslint react/jsx-uses-react:1*/  <></>;',
+        }],
+      }],
       features: ['fragment'],
       settings: { react: { fragment: 'Fragment' } },
     },
     {
       code: '/*eslint react/jsx-uses-react:1*/ var React; <></>;',
       features: ['fragment'],
-      errors: [{ message: '\'React\' is defined but never used.' }],
+      errors: [{
+        message: '\'React\' is defined but never used.',
+        suggestions: [{
+          messageId: 'removeVar',
+          output: '/*eslint react/jsx-uses-react:1*/  <></>;',
+        }],
+      }],
       settings,
     },
-  ].map(parsers.disableNewTS)),
+  ].map(parsers.disableNewTS).map((test) => {
+    if (!rule.meta.hasSuggestions) {
+      test.errors = test.errors.map((error) => {
+        // https://github.com/eslint/eslint/pull/18352 added suggestions to no-unused-vars in eslint v9.17.0
+        delete error.suggestions;
+        return error;
+      });
+    }
+    return test;
+  })),
 });
diff --git a/tests/lib/rules/jsx-uses-vars.js b/tests/lib/rules/jsx-uses-vars.js
index 00f801fd65..8b9db2a956 100644
--- a/tests/lib/rules/jsx-uses-vars.js
+++ b/tests/lib/rules/jsx-uses-vars.js
@@ -10,6 +10,7 @@
 // -----------------------------------------------------------------------------
 
 const ruleNoUnusedVars = require('../../helpers/getESLintCoreRule')('no-unused-vars');
+
 const rulePreferConst = require('../../helpers/getESLintCoreRule')('prefer-const');
 
 const RuleTester = require('../../helpers/ruleTester');
@@ -136,7 +137,13 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
   invalid: parsers.all([
     {
       code: '/* eslint react/jsx-uses-vars: 1 */ var App;',
-      errors: [{ message: '\'App\' is defined but never used.' }],
+      errors: [{
+        message: '\'App\' is defined but never used.',
+        suggestions: [{
+          messageId: 'removeVar',
+          output: '/* eslint react/jsx-uses-vars: 1 */ ',
+        }],
+      }],
     },
     {
       code: `
@@ -145,7 +152,18 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         var unused;
         React.render(<App unused=""/>);
       `,
-      errors: [{ message: '\'unused\' is defined but never used.' }],
+      errors: [{
+        message: '\'unused\' is defined but never used.',
+        suggestions: [{
+          messageId: 'removeVar',
+          output: `
+        /* eslint react/jsx-uses-vars: 1 */
+        var App;
+        ${''}
+        React.render(<App unused=""/>);
+      `,
+        }],
+      }],
     },
     {
       code: `
@@ -155,8 +173,30 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         React.render(<App:Hello/>);
       `,
       errors: [
-        { message: '\'App\' is defined but never used.' },
-        { message: '\'Hello\' is defined but never used.' },
+        {
+          message: '\'App\' is defined but never used.',
+          suggestions: [{
+            messageId: 'removeVar',
+            output: `
+        /* eslint react/jsx-uses-vars: 1 */
+        ${''}
+        var Hello;
+        React.render(<App:Hello/>);
+      `,
+          }],
+        },
+        {
+          message: '\'Hello\' is defined but never used.',
+          suggestions: [{
+            messageId: 'removeVar',
+            output: `
+        /* eslint react/jsx-uses-vars: 1 */
+        var App;
+        ${''}
+        React.render(<App:Hello/>);
+      `,
+          }],
+        },
       ],
       features: ['jsx namespace'],
     },
@@ -167,14 +207,34 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         var Input;
         React.render(<Button.Input unused=""/>);
       `,
-      errors: [{ message: '\'Input\' is defined but never used.' }],
+      errors: [{
+        message: '\'Input\' is defined but never used.',
+        suggestions: [{
+          messageId: 'removeVar',
+          output: `
+        /* eslint react/jsx-uses-vars: 1 */
+        var Button;
+        ${''}
+        React.render(<Button.Input unused=""/>);
+      `,
+        }],
+      }],
     },
     {
       code: `
         /* eslint react/jsx-uses-vars: 1 */
         class unused {}
       `,
-      errors: [{ message: '\'unused\' is defined but never used.' }],
+      errors: [{
+        message: '\'unused\' is defined but never used.',
+        suggestions: [{
+          messageId: 'removeVar',
+          output: `
+        /* eslint react/jsx-uses-vars: 1 */
+        ${''}
+      `,
+        }],
+      }],
     },
     {
       code: `
@@ -190,6 +250,13 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         {
           message: '\'HelloMessage\' is defined but never used.',
           line: 3,
+          suggestions: [{
+            messageId: 'removeVar',
+            output: `
+        /* eslint react/jsx-uses-vars: 1 */
+        ${''}
+      `,
+          }],
         },
       ],
     },
@@ -207,6 +274,18 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         {
           message: '\'Hello\' is defined but never used.',
           line: 3,
+          suggestions: [{
+            messageId: 'removeVar',
+            output: `
+        /* eslint react/jsx-uses-vars: 1 */
+        ${''}
+        function Greetings() {
+          const Hello = require('Hello').default;
+          return <Hello />;
+        }
+        Greetings();
+      `,
+          }],
         },
       ],
     },
@@ -216,7 +295,17 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         var lowercase;
         React.render(<lowercase />);
       `,
-      errors: [{ message: '\'lowercase\' is defined but never used.' }],
+      errors: [{
+        message: '\'lowercase\' is defined but never used.',
+        suggestions: [{
+          messageId: 'removeVar',
+          output: `
+        /* eslint react/jsx-uses-vars: 1 */
+        ${''}
+        React.render(<lowercase />);
+      `,
+        }],
+      }],
     },
     {
       code: `
@@ -230,10 +319,29 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         {
           message: '\'div\' is defined but never used.',
           line: 3,
+          suggestions: [{
+            messageId: 'removeVar',
+            output: `
+        /* eslint react/jsx-uses-vars: 1 */
+        function Greetings() {
+          return <div />;
+        }
+        Greetings();
+      `,
+          }],
         },
       ],
     },
-  ]),
+  ].map((test) => {
+    if (!ruleNoUnusedVars.meta.hasSuggestions) {
+      test.errors = test.errors.map((error) => {
+        // https://github.com/eslint/eslint/pull/18352 added suggestions to no-unused-vars in eslint v9.17.0
+        delete error.suggestions;
+        return error;
+      });
+    }
+    return test;
+  })),
 });
 
 // Check compatibility with eslint prefer-const rule (#716)