diff --git a/Makefile b/Makefile
index 71d2a48af9a3..656b0847dd3d 100644
--- a/Makefile
+++ b/Makefile
@@ -350,6 +350,8 @@ $(C_BUILDDIR)/pokedex_plus_hgss.o: CFLAGS := -mthumb -mthumb-interwork -O2 -mabi
 # Annoyingly we can't turn this on just for src/data/trainers.h
 $(C_BUILDDIR)/data.o: CFLAGS += -fno-show-column -fno-diagnostics-show-caret
 
+$(TEST_BUILDDIR)/%.o: CFLAGS := -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -Wno-pointer-to-int-cast -Werror -Wall -Wno-strict-aliasing -Wno-attribute-alias -Woverride-init
+
 # Dependency rules (for the *.c & *.s sources to .o files)
 # Have to be explicit or else missing files won't be reported.
 
diff --git a/include/constants/generational_changes.h b/include/constants/generational_changes.h
index dba329f1401c..557b34b6537e 100644
--- a/include/constants/generational_changes.h
+++ b/include/constants/generational_changes.h
@@ -4,6 +4,7 @@
 enum GenConfigTag
 {
     GEN_CONFIG_GALE_WINGS,
+    GEN_CONFIG_COUNT
 };
 
 #endif // GUARD_CONSTANTS_GENERATIONAL_CHANGES_H
diff --git a/include/generational_changes.h b/include/generational_changes.h
index dbb2be86e85b..5a726007c36e 100644
--- a/include/generational_changes.h
+++ b/include/generational_changes.h
@@ -2,8 +2,40 @@
 #define GUARD_GENERATIONAL_CHANGES_H
 
 #include "constants/generational_changes.h"
+#include "config/battle.h"
 
-u32 GetGenConfig(enum GenConfigTag configTag);
-void SetGenConfig(enum GenConfigTag configTag, u32 value);
+static const u8 sGenerationalChanges[GEN_CONFIG_COUNT] =
+{
+    [GEN_CONFIG_GALE_WINGS] = B_GALE_WINGS,
+};
+
+#if TESTING
+extern u8 *gGenerationalChangesTestOverride;
+#endif
+
+static inline u32 GetGenConfig(enum GenConfigTag configTag)
+{
+    if (configTag >= GEN_CONFIG_COUNT) return GEN_LATEST;
+#if TESTING
+    if (gGenerationalChangesTestOverride == NULL) return sGenerationalChanges[configTag];
+    return gGenerationalChangesTestOverride[configTag];
+#else
+    return sGenerationalChanges[configTag];
+#endif
+}
+
+static inline void SetGenConfig(enum GenConfigTag configTag, u32 value)
+{
+#if TESTING
+    if (configTag >= GEN_CONFIG_COUNT) return;
+    if (gGenerationalChangesTestOverride == NULL) return;
+    gGenerationalChangesTestOverride[configTag] = value;
+#endif
+}
+
+#if TESTING
+void TestInitConfigData(void);
+void TestFreeConfigData(void);
+#endif
 
 #endif // GUARD_GENERATIONAL_CHANGES_H
diff --git a/include/test/battle.h b/include/test/battle.h
index f1ef25447563..0b44ea02fb92 100644
--- a/include/test/battle.h
+++ b/include/test/battle.h
@@ -287,6 +287,16 @@
  *     GIVEN {
  *         FLAG_SET(FLAG_SYS_EXAMPLE_FLAG);
  *
+ * WITH_CONFIG(configTag, value)
+ * Runs the test with a specified config override. `configTag` must be
+ * of `enum GenConfigTag`
+ * Example:
+ *     GIVEN {
+ *         WITH_CONFIG(GEN_CONFIG_GALE_WINGS, GEN_6);
+ *     }
+ * The `value` may be inferred from a local variable, e.g. set by
+ * PARAMETRIZE.
+ *
  * PLAYER(species) and OPPONENT(species)
  * Adds the species to the player's or opponent's party respectively.
  * The Pokémon can be further customized with the following functions:
@@ -823,6 +833,7 @@ struct moveWithPP {
 #define AI_LOG AILogScores(__LINE__)
 
 #define FLAG_SET(flagId) SetFlagForTest(__LINE__, flagId)
+#define WITH_CONFIG(configTag, value) TestSetConfig(__LINE__, configTag, value)
 
 #define PLAYER(species) for (OpenPokemon(__LINE__, B_SIDE_PLAYER, species); gBattleTestRunnerState->data.currentMon; ClosePokemon(__LINE__))
 #define OPPONENT(species) for (OpenPokemon(__LINE__, B_SIDE_OPPONENT, species); gBattleTestRunnerState->data.currentMon; ClosePokemon(__LINE__))
@@ -856,6 +867,7 @@ struct moveWithPP {
 #define Shadow(isShadow) Shadow_(__LINE__, shadow)
 
 void SetFlagForTest(u32 sourceLine, u16 flagId);
+void TestSetConfig(u32 sourceLine, enum GenConfigTag configTag, u32 value);
 void ClearFlagAfterTest(void);
 void OpenPokemon(u32 sourceLine, u32 side, u32 species);
 void ClosePokemon(u32 sourceLine);
diff --git a/src/generational_changes.c b/src/generational_changes.c
index 9f042cbfd70f..1ad29aa675e7 100644
--- a/src/generational_changes.c
+++ b/src/generational_changes.c
@@ -4,30 +4,16 @@
 #include "constants/generational_changes.h"
 
 #if TESTING
-EWRAM_INIT struct GenerationalChanges gGenerationalChanges =
-#else
-const struct GenerationalChanges gGenerationalChanges =
-#endif
-{
-    .galeWingsFullHealth = B_GALE_WINGS >= GEN_7,
-};
+EWRAM_DATA u8 *gGenerationalChangesTestOverride = NULL;
 
-u32 GetGenConfig(enum GenConfigTag configTag)
+void TestInitConfigData(void)
 {
-    switch (configTag)
-    {
-    case GEN_CONFIG_GALE_WINGS: return gGenerationalChanges.galeWingsFullHealth ? GEN_7 : GEN_6;
-    default:                    return GEN_LATEST;
-    }
+    gGenerationalChangesTestOverride = Alloc(sizeof(sGenerationalChanges));
+    memcpy(gGenerationalChangesTestOverride, sGenerationalChanges, sizeof(sGenerationalChanges));
 }
 
-void SetGenConfig(enum GenConfigTag configTag, u32 value)
+void TestFreeConfigData(void)
 {
-#if TESTING
-    switch (configTag)
-    {
-    case GEN_CONFIG_GALE_WINGS: gGenerationalChanges.galeWingsFullHealth = (value >= GEN_7);
-    }
-#else
-#endif
+    TRY_FREE_AND_SET_NULL(gGenerationalChangesTestOverride)
 }
+#endif
diff --git a/test/battle/ability/gale_wings.c b/test/battle/ability/gale_wings.c
index d8e5d9e39784..8d0695e62258 100644
--- a/test/battle/ability/gale_wings.c
+++ b/test/battle/ability/gale_wings.c
@@ -9,8 +9,7 @@ SINGLE_BATTLE_TEST("Gale Wings only grants priority at full HP (Gen 7+)")
     PARAMETRIZE { hp = 100; config = GEN_6; }
     PARAMETRIZE { hp = 99;  config = GEN_6; }
     GIVEN {
-        SetGenConfig(GEN_CONFIG_GALE_WINGS, config);
-        ASSUME(B_GALE_WINGS >= GEN_7);
+        WITH_CONFIG(GEN_CONFIG_GALE_WINGS, config);
         ASSUME(gMovesInfo[MOVE_AERIAL_ACE].type == TYPE_FLYING);
         PLAYER(SPECIES_TALONFLAME) { Ability(ABILITY_GALE_WINGS); HP(hp); MaxHP(100); Speed(1);}
         OPPONENT(SPECIES_WOBBUFFET) { Speed(100);};
diff --git a/test/test_runner_battle.c b/test/test_runner_battle.c
index c55ef489b3e3..9484e6df6cf4 100644
--- a/test/test_runner_battle.c
+++ b/test/test_runner_battle.c
@@ -160,6 +160,7 @@ static void BattleTest_SetUp(void *data)
 {
     const struct BattleTest *test = data;
     memset(STATE, 0, sizeof(*STATE));
+    TestInitConfigData();
     InvokeTestFunction(test);
     STATE->parameters = STATE->parametersCount;
     if (STATE->parametersCount == 0 && test->resultsSize > 0)
@@ -1417,6 +1418,7 @@ static void BattleTest_TearDown(void *data)
     // Free resources that aren't cleaned up when the battle was
     // aborted unexpectedly.
     ClearFlagAfterTest();
+    TestFreeConfigData();
     if (STATE->tearDownBattle)
         TearDownBattle();
 }
@@ -1513,6 +1515,12 @@ void SetFlagForTest(u32 sourceLine, u16 flagId)
     FlagSet(flagId);
 }
 
+void TestSetConfig(u32 sourceLine, enum GenConfigTag configTag, u32 value)
+{
+    INVALID_IF(!STATE->runGiven, "WITH_CONFIG outside of GIVEN");
+    SetGenConfig(configTag, value);
+}
+
 void ClearFlagAfterTest(void)
 {
     if (DATA.flagId != 0)