diff --git a/src/data/mystery-encounters/mystery-encounters.ts b/src/data/mystery-encounters/mystery-encounters.ts
index 354f69d0ca3..5dd952b2bce 100644
--- a/src/data/mystery-encounters/mystery-encounters.ts
+++ b/src/data/mystery-encounters/mystery-encounters.ts
@@ -332,7 +332,6 @@ export function initMysteryEncounters() {
   });
 
   // Add ANY biome encounters to biome map
-  // eslint-disable-next-line
   let _encounterBiomeTableLog = "";
   mysteryEncountersByBiome.forEach((biomeEncounters, biome) => {
     anyBiomeEncounters.forEach(encounter => {
diff --git a/test/testUtils/gameWrapper.ts b/test/testUtils/gameWrapper.ts
index 55bdd10c60c..388861e01c4 100644
--- a/test/testUtils/gameWrapper.ts
+++ b/test/testUtils/gameWrapper.ts
@@ -1,5 +1,4 @@
-/* eslint-disable */
-// @ts-nocheck
+// @ts-nocheck - TODO: remove this
 import BattleScene, * as battleScene from "#app/battle-scene";
 import { MoveAnim } from "#app/data/battle-anims";
 import Pokemon from "#app/field/pokemon";
@@ -12,15 +11,15 @@ import MockTextureManager from "#test/testUtils/mocks/mockTextureManager";
 import fs from "node:fs";
 import Phaser from "phaser";
 import { vi } from "vitest";
+import { version } from "../../package.json";
 import { MockGameObjectCreator } from "./mocks/mockGameObjectCreator";
+import { MockTimedEventManager } from "./mocks/mockTimedEventManager";
 import InputManager = Phaser.Input.InputManager;
 import KeyboardManager = Phaser.Input.Keyboard.KeyboardManager;
 import KeyboardPlugin = Phaser.Input.Keyboard.KeyboardPlugin;
 import GamepadPlugin = Phaser.Input.Gamepad.GamepadPlugin;
 import EventEmitter = Phaser.Events.EventEmitter;
 import UpdateList = Phaser.GameObjects.UpdateList;
-import { version } from "../../package.json";
-import { MockTimedEventManager } from "./mocks/mockTimedEventManager";
 
 window.URL.createObjectURL = (blob: Blob) => {
   blobToString(blob).then((data: string) => {
diff --git a/test/vitest.setup.ts b/test/vitest.setup.ts
index 666d824abb1..93b439e540f 100644
--- a/test/vitest.setup.ts
+++ b/test/vitest.setup.ts
@@ -7,13 +7,11 @@ import { initTestFile } from "./testUtils/testFileInitialization";
 
 /** Mock the override import to always return default values, ignoring any custom overrides. */
 vi.mock("#app/overrides", async importOriginal => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const { defaultOverrides } = await importOriginal<typeof import("#app/overrides")>();
 
   return {
     default: defaultOverrides,
     defaultOverrides,
-    // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   } satisfies typeof import("#app/overrides");
 });