diff --git a/test/battle/form_change/faint.c b/test/battle/form_change/faint.c
index 8fc95cdc65..316ecca0bf 100644
--- a/test/battle/form_change/faint.c
+++ b/test/battle/form_change/faint.c
@@ -1,9 +1,24 @@
 #include "global.h"
 #include "test/battle.h"
 
-SINGLE_BATTLE_TEST("Aegislash reverts to Shield Form upon fainting")
+SINGLE_BATTLE_TEST("Aegislash reverts to Shield Form upon fainting (start as Shield)")
+{
+    GIVEN {
+        PLAYER(SPECIES_AEGISLASH_SHIELD) { HP(1); }
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(player, MOVE_SCRATCH); MOVE(opponent, MOVE_GUST); SEND_OUT(player, 1); }
+    } SCENE {
+        MESSAGE("The opposing Wobbuffet used Gust!");
+        MESSAGE("Aegislash fainted!");
+    } THEN {
+        EXPECT_EQ(GetMonData(&gPlayerParty[0], MON_DATA_SPECIES), SPECIES_AEGISLASH_SHIELD);
+    }
+}
+
+SINGLE_BATTLE_TEST("Aegislash reverts to Shield Form upon fainting (start as Blade)")
 {
-    KNOWN_FAILING;
     GIVEN {
         PLAYER(SPECIES_AEGISLASH_BLADE) { HP(1); }
         PLAYER(SPECIES_WOBBUFFET);
@@ -14,7 +29,7 @@ SINGLE_BATTLE_TEST("Aegislash reverts to Shield Form upon fainting")
         MESSAGE("The opposing Wobbuffet used Gust!");
         MESSAGE("Aegislash fainted!");
     } THEN {
-        EXPECT_EQ(GetMonData(&PLAYER_PARTY[0], MON_DATA_SPECIES), SPECIES_AEGISLASH_SHIELD);
+        EXPECT_EQ(GetMonData(&gPlayerParty[0], MON_DATA_SPECIES), SPECIES_AEGISLASH_SHIELD);
     }
 }