diff --git a/packages/api/tests/index.test.ts b/packages/api/tests/index.test.ts
index 70e7f2eba..8bfc558c0 100644
--- a/packages/api/tests/index.test.ts
+++ b/packages/api/tests/index.test.ts
@@ -1,5 +1,3 @@
-/* eslint-disable no-console, import/no-extraneous-dependencies */
-
 import { test, expect } from 'vitest';
 import api, { type ApiError } from '../src/api';
 
diff --git a/packages/emails/tests/sendgrid.test.ts b/packages/emails/tests/sendgrid.test.ts
index 8a33f824a..5290fbb89 100644
--- a/packages/emails/tests/sendgrid.test.ts
+++ b/packages/emails/tests/sendgrid.test.ts
@@ -1,4 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies */
 import url from 'node:url';
 import fs from 'node:fs';
 import { test, expect } from 'vitest';
diff --git a/packages/emails/tests/smtp.test.ts b/packages/emails/tests/smtp.test.ts
index 16ccd89fd..e6d56dacd 100644
--- a/packages/emails/tests/smtp.test.ts
+++ b/packages/emails/tests/smtp.test.ts
@@ -1,4 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies */
 import url from 'node:url';
 import fs from 'node:fs';
 import { test, expect } from 'vitest';
diff --git a/packages/eslint/base.eslintrc.cjs b/packages/eslint/base.eslintrc.cjs
index ec18a76f7..29b17b74b 100644
--- a/packages/eslint/base.eslintrc.cjs
+++ b/packages/eslint/base.eslintrc.cjs
@@ -102,19 +102,26 @@ module.exports = {
       },
     },
     {
-      files: ['*.test.ts', '*.test.mjs', '*.test.cjs'],
+      files: ['*.d.ts'],
       rules: {
-        'no-console': 'off',
-        'import/no-extraneous-dependencies': 'off',
+        'import/newline-after-import': 'off',
+        'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
       },
     },
     {
       files: ['*.config.*', '*.eslintrc.*'],
       rules: {
         'no-console': 'off',
-        'import/no-extraneous-dependencies': 'off',
+        'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
         'quote-props': 'off',
       },
     },
+    {
+      files: ['*.test.ts', '*.test.mjs', '*.test.cjs'],
+      rules: {
+        'no-console': 'off',
+        'import/no-extraneous-dependencies': 'off',
+      },
+    },
   ],
 };
diff --git a/packages/storefront/src/env.d.ts b/packages/storefront/src/env.d.ts
index ad2496144..3650bb36b 100644
--- a/packages/storefront/src/env.d.ts
+++ b/packages/storefront/src/env.d.ts
@@ -4,8 +4,6 @@
 /// <reference types="../client" />
 /// <reference types="../server" />
 
-/* eslint-disable import/newline-after-import */
-
 declare module '*.vue' {
   import { type DefineComponent } from 'vue';
   const component: DefineComponent<{}, {}, any>;
diff --git a/packages/storefront/src/vue-globals.d.ts b/packages/storefront/src/vue-globals.d.ts
index f9ba271a5..d9686bedf 100644
--- a/packages/storefront/src/vue-globals.d.ts
+++ b/packages/storefront/src/vue-globals.d.ts
@@ -1,5 +1,4 @@
 // Read more: https://github.com/vuejs/core/pull/3399
-// eslint-disable-next-line import/no-extraneous-dependencies
 import '@vue/runtime-core';
 import type { FormatPercentage } from '@@sf/pages/_vue';
 import type { $Storefront } from '@@sf/$storefront';