diff --git a/src/overrides.ts b/src/overrides.ts
index d1597dfdee86..5ae7783d8675 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -29,7 +29,10 @@ import { type ModifierOverride } from "./modifier/modifier-type";
  * }
  * ```
  */
-const overrides = {} satisfies Partial<InstanceType<typeof DefaultOverrides>>;
+const overrides = {
+  MOVESET_OVERRIDE: [ Moves.GUARD_SWAP, Moves.POWER_SWAP, Moves.HEART_SWAP ],
+  OPP_MOVESET_OVERRIDE: Moves.SHELL_SMASH,
+} satisfies Partial<InstanceType<typeof DefaultOverrides>>;
 
 /**
  * If you need to add Overrides values for local testing do that inside {@linkcode overrides}
diff --git a/src/test/moves/heart_swap.test.ts b/src/test/moves/heart_swap.test.ts
index 93b1fef56350..f658641d46f1 100644
--- a/src/test/moves/heart_swap.test.ts
+++ b/src/test/moves/heart_swap.test.ts
@@ -7,7 +7,6 @@ import { Moves } from "#enums/moves";
 import { BATTLE_STATS } from "#enums/stat";
 import { Abilities } from "#enums/abilities";
 import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { SPLASH_ONLY } from "../utils/testUtils";
 
 describe("Moves - Heart Swap", () => {
   let phaserGame: Phaser.Game;
@@ -29,7 +28,7 @@ describe("Moves - Heart Swap", () => {
     game.override
       .battleType("single")
       .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(SPLASH_ONLY)
+      .enemyMoveset(Moves.SPLASH)
       .enemySpecies(Species.INDEEDEE)
       .enemyLevel(200)
       .moveset([ Moves.HEART_SWAP ])