diff --git a/src/test/moves/after_you.test.ts b/src/test/moves/after_you.test.ts
index 24a117c07cb..0348e16291f 100644
--- a/src/test/moves/after_you.test.ts
+++ b/src/test/moves/after_you.test.ts
@@ -38,20 +38,21 @@ describe("Moves - After You", () => {
   });
 
   it("makes the target move immediately after the user", async () => {
-    await game.startBattle([Species.REGIELEKI, Species.SHUCKLE]);
+    await game.classicMode.startBattle([Species.REGIELEKI, Species.SHUCKLE]);
 
     game.move.select(Moves.AFTER_YOU, 0, BattlerIndex.PLAYER_2);
     game.move.select(Moves.SPLASH, 1);
 
     await game.phaseInterceptor.to("MoveEffectPhase");
-    await game.phaseInterceptor.to(MovePhase);
+    await game.phaseInterceptor.to(MovePhase, false);
     const phase = game.scene.getCurrentPhase() as MovePhase;
     expect(phase.pokemon).toBe(game.scene.getPlayerField()[1]);
+    await game.phaseInterceptor.to("MoveEndPhase");
   }, TIMEOUT);
 
   it("fails if target already moved", async () => {
     game.override.enemySpecies(Species.SHUCKLE);
-    await game.startBattle([Species.REGIELEKI, Species.PIKACHU]);
+    await game.classicMode.startBattle([Species.REGIELEKI, Species.PIKACHU]);
 
     game.move.select(Moves.SPLASH);
     game.move.select(Moves.AFTER_YOU, 1, BattlerIndex.PLAYER);