diff --git a/tests/disables.sav b/tests/disables.sav
index c16611522..38336f89f 100644
--- a/tests/disables.sav
+++ b/tests/disables.sav
@@ -23,7 +23,7 @@
 "trials_random": false,
 "trials": 0,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "big_poe_count_random": false,
 "big_poe_count": 1,
 "shuffle_kokiri_sword": true,
diff --git a/tests/entrance.sav b/tests/entrance.sav
index e106de979..818e1095e 100644
--- a/tests/entrance.sav
+++ b/tests/entrance.sav
@@ -18,7 +18,7 @@
 "trials_random": false,
 "trials": 0,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "big_poe_count_random": false,
 "big_poe_count": 1,
 "shuffle_kokiri_sword": true,
diff --git a/tests/entrance2.sav b/tests/entrance2.sav
index 4b5e640e4..f89d23e8c 100644
--- a/tests/entrance2.sav
+++ b/tests/entrance2.sav
@@ -19,7 +19,7 @@
 "trials_random": false,
 "trials": 0,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "big_poe_count_random": false,
 "big_poe_count": 1,
 "shuffle_kokiri_sword": true,
diff --git a/tests/entrance3.sav b/tests/entrance3.sav
index c4058dda8..fad930f6f 100644
--- a/tests/entrance3.sav
+++ b/tests/entrance3.sav
@@ -17,7 +17,7 @@
 "trials_random": false,
 "trials": 0,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "start_with_consumables": false,
 "big_poe_count_random": false,
 "big_poe_count": 1,
diff --git a/tests/glitched-standard.sav b/tests/glitched-standard.sav
index f418aac13..558da177e 100644
--- a/tests/glitched-standard.sav
+++ b/tests/glitched-standard.sav
@@ -38,7 +38,7 @@
     "no_epona_race": false,
     "useful_cutscenes": true,
     "fast_chests": true,
-    "free_scarecrow": false,
+    "scarecrow_behavior": "vanilla",
     "start_with_rupees": false,
     "start_with_consumables": false,
     "plant_beans": false,
diff --git a/tests/glitched-tokens.sav b/tests/glitched-tokens.sav
index 5665d5153..2980bb21b 100644
--- a/tests/glitched-tokens.sav
+++ b/tests/glitched-tokens.sav
@@ -22,7 +22,7 @@
 "one_item_per_dungeon": false,
 "trials_random": false,
 "trials": 0,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "big_poe_count_random": false,
 "big_poe_count": 1,
 "shuffle_kokiri_sword": true,
diff --git a/tests/ludicrous.sav b/tests/ludicrous.sav
index 38b12c22c..88cdc3566 100644
--- a/tests/ludicrous.sav
+++ b/tests/ludicrous.sav
@@ -23,7 +23,7 @@
 "trials_random": false,
 "trials": 0,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "big_poe_count_random": false,
 "big_poe_count": 1,
 "shuffle_kokiri_sword": true,
diff --git a/tests/mq.sav b/tests/mq.sav
index 2b751d31e..1d13ce35b 100644
--- a/tests/mq.sav
+++ b/tests/mq.sav
@@ -23,7 +23,7 @@
 "trials_random": false,
 "trials": 0,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "big_poe_count_random": false,
 "big_poe_count": 1,
 "shuffle_kokiri_sword": true,
diff --git a/tests/multiworld.sav b/tests/multiworld.sav
index 68f0490ef..c7f639a80 100644
--- a/tests/multiworld.sav
+++ b/tests/multiworld.sav
@@ -20,7 +20,7 @@
 "one_item_per_dungeon": false,
 "trials_random": true,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "big_poe_count_random": false,
 "big_poe_count": 1,
 "shuffle_kokiri_sword": true,
diff --git a/tests/nightforest.sav b/tests/nightforest.sav
index c5b6b6674..ae1f1ab1d 100644
--- a/tests/nightforest.sav
+++ b/tests/nightforest.sav
@@ -23,7 +23,7 @@
 "trials_random": false,
 "trials": 6,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "big_poe_count_random": false,
 "big_poe_count": 1,
 "shuffle_kokiri_sword": true,
diff --git a/tests/plentiful.sav b/tests/plentiful.sav
index ea4e26170..ce85eab9b 100644
--- a/tests/plentiful.sav
+++ b/tests/plentiful.sav
@@ -23,7 +23,7 @@
 "trials_random": false,
 "trials": 0,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",                     
 "big_poe_count_random": false,
 "big_poe_count": 1,
 "shuffle_kokiri_sword": true,
diff --git a/tests/tokensanity.sav b/tests/tokensanity.sav
index 7dac88df4..366ce7795 100644
--- a/tests/tokensanity.sav
+++ b/tests/tokensanity.sav
@@ -23,7 +23,7 @@
 "trials_random": false,
 "trials": 0,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "big_poe_count_random": false,
 "big_poe_count": 1,
 "shuffle_kokiri_sword": true,
diff --git a/tests/triforce-multiworld.sav b/tests/triforce-multiworld.sav
index 57b820cdd..c6e0c0cdc 100644
--- a/tests/triforce-multiworld.sav
+++ b/tests/triforce-multiworld.sav
@@ -22,7 +22,7 @@
 "trials_random": false,
 "trials": 0,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "start_with_consumables": false,
 "big_poe_count_random": false,
 "big_poe_count": 1,
diff --git a/tests/triforce-startingitems.sav b/tests/triforce-startingitems.sav
index d12c54a7f..93fb8f850 100644
--- a/tests/triforce-startingitems.sav
+++ b/tests/triforce-startingitems.sav
@@ -25,7 +25,7 @@
 "trials_random": false,
 "trials": 0,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "start_with_consumables": true,
 "big_poe_count_random": false,
 "big_poe_count": 1,
diff --git a/tests/triforce.sav b/tests/triforce.sav
index b3bb7c8a7..e977e76fc 100644
--- a/tests/triforce.sav
+++ b/tests/triforce.sav
@@ -23,7 +23,7 @@
 "trials_random": false,
 "trials": 0,
 "logic_no_night_tokens_without_suns_song": false,
-"free_scarecrow": false,
+"scarecrow_behavior": "vanilla",
 "start_with_consumables": true,
 "big_poe_count_random": false,
 "big_poe_count": 1,