diff --git a/test/test_runner_battle.c b/test/test_runner_battle.c
index 981683b35a..a20637b334 100644
--- a/test/test_runner_battle.c
+++ b/test/test_runner_battle.c
@@ -284,16 +284,17 @@ static void BattleTest_Run(void *data)
         break;
     }
 
-    for (i = 0; i < STATE->battlersCount; i++)
+    for (i = 0; i < MAX_LINK_PLAYERS; i++)
     {
         DATA.recordedBattle.playersName[i][0] = CHAR_1 + i;
         DATA.recordedBattle.playersName[i][1] = EOS;
         DATA.recordedBattle.playersLanguage[i] = GAME_LANGUAGE;
         DATA.recordedBattle.playersBattlers[i] = i;
-
-        DATA.currentMonIndexes[i] = (i & BIT_FLANK) == B_FLANK_LEFT ? 0 : 1;
     }
 
+    for (i = 0; i < STATE->battlersCount; i++)
+        DATA.currentMonIndexes[i] = i / 2;
+
     STATE->runRandomly = TRUE;
     STATE->runGiven = TRUE;
     STATE->runWhen = TRUE;