diff --git a/test/ability_intimidate.c b/test/ability_intimidate.c
index 08d8d606e..347c0bc71 100644
--- a/test/ability_intimidate.c
+++ b/test/ability_intimidate.c
@@ -95,3 +95,31 @@ DOUBLE_BATTLE_TEST("Intimidate doesn't activate on an empty field in a double ba
         MESSAGE("Foe Arbok's Intimidate cuts Abra's attack!");
     }
 }
+
+SINGLE_BATTLE_TEST("Intimidate and Eject Button force the opponent to Attack")
+{
+    KNOWN_FAILING; // Issue #2837
+    GIVEN {
+        ASSUME(gItems[ITEM_EJECT_BUTTON].holdEffect == HOLD_EFFECT_EJECT_BUTTON);
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_BUTTON); };
+        OPPONENT(SPECIES_HITMONTOP) { Moves(MOVE_TACKLE); };
+    } WHEN {
+        TURN { 
+               MOVE(player, MOVE_QUICK_ATTACK);
+               MOVE(opponent, MOVE_TACKLE);
+               SEND_OUT(opponent, 1);
+        }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_QUICK_ATTACK, player);
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent);
+        MESSAGE("Foe Wobbuffet is switched out with the Eject Button!");
+        MESSAGE("2 sent out Hitmontop!");
+        ABILITY_POPUP(opponent, ABILITY_INTIMIDATE);
+        MESSAGE("Foe Hitmontop's Intimidate cuts Wobbuffet's attack!");
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent);
+            MESSAGE("Foe Hitmontop used Tackle!");
+        }
+    }
+}
diff --git a/test/hold_effect_eject_button.c b/test/hold_effect_eject_button.c
new file mode 100644
index 000000000..0d28d7bf0
--- /dev/null
+++ b/test/hold_effect_eject_button.c
@@ -0,0 +1,189 @@
+#include "global.h"
+#include "test_battle.h"
+
+ASSUMPTIONS
+{
+    ASSUME(gItems[ITEM_EJECT_BUTTON].holdEffect == HOLD_EFFECT_EJECT_BUTTON);
+}
+
+SINGLE_BATTLE_TEST("Eject Button is not triggered when there is nothing to switch in")
+{
+    GIVEN {
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_BUTTON); };
+        OPPONENT(SPECIES_WOBBUFFET) { HP(0); };
+    } WHEN {
+        TURN {
+            MOVE(player, MOVE_QUICK_ATTACK);
+            MOVE(opponent, MOVE_TACKLE);
+        }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_QUICK_ATTACK, player);
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent);
+            MESSAGE("Foe Wobbuffet is switched out with the Eject Button!");
+        }
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent);
+    }
+}
+
+SINGLE_BATTLE_TEST("Eject Button is not activated by a Sheer Force boosted move")
+{
+    GIVEN {
+        PLAYER(SPECIES_NIDOKING) { Ability(ABILITY_SHEER_FORCE); };
+        OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_BUTTON); };
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN {
+            MOVE(player, MOVE_FLAMETHROWER);
+            MOVE(opponent, MOVE_TACKLE);
+        }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_FLAMETHROWER, player);
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent);
+            MESSAGE("Foe Wobbuffet is switched out with the Eject Button!");
+        }
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent);
+    }
+}
+
+SINGLE_BATTLE_TEST("Eject Button will not activate under Substitute")
+{
+    GIVEN {
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_RAICHU) { Item(ITEM_EJECT_BUTTON); };
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { 
+               MOVE(opponent, MOVE_SUBSTITUTE);
+               MOVE(player, MOVE_TACKLE);
+        }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_SUBSTITUTE, opponent);
+        MESSAGE("Foe Raichu made a SUBSTITUTE!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, player);
+        MESSAGE("The SUBSTITUTE took damage for Foe Raichu!");
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent);
+            MESSAGE("Foe Raichu is switched out with the Eject Button!");
+        }
+    }
+}
+
+SINGLE_BATTLE_TEST("Eject Button is not blocked by trapping abilities or moves")
+{
+    GIVEN {
+        PLAYER(SPECIES_DUGTRIO) { Ability(ABILITY_ARENA_TRAP); };
+        OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_BUTTON); };
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN {
+            MOVE(player, MOVE_TACKLE);
+            SEND_OUT(opponent, 1);
+        }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, player);
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent);
+        MESSAGE("Foe Wobbuffet is switched out with the Eject Button!");
+        MESSAGE("2 sent out Wobbuffet!");
+    }
+}
+
+SINGLE_BATTLE_TEST("Eject Button is not triggered after the mon loses Eject Button")
+{
+    GIVEN {
+        PLAYER(SPECIES_RAICHU);
+        OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_BUTTON); };
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN {
+            MOVE(player, MOVE_KNOCK_OFF);
+            MOVE(opponent, MOVE_TACKLE);
+        }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_KNOCK_OFF, player);
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent);
+            MESSAGE("Foe Wobbuffet is switched out with the Eject Button!");
+        }
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent);
+    }
+}
+
+SINGLE_BATTLE_TEST("Eject Button is not triggered after given to player by Picketpocket")
+{
+    GIVEN {
+        PLAYER(SPECIES_REGIELEKI) { Item(ITEM_EJECT_BUTTON); };
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_SNEASEL) { Ability(ABILITY_PICKPOCKET); };
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN {
+            MOVE(player, MOVE_TACKLE);
+            MOVE(opponent, MOVE_TACKLE);
+        }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, player);
+        ABILITY_POPUP(opponent, ABILITY_PICKPOCKET);
+        MESSAGE("Foe Sneasel stole Regieleki's Eject Button!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent);
+    }
+}
+
+SINGLE_BATTLE_TEST("Eject Button has no chance to activate after Dragon Tail")
+{
+    GIVEN {
+        PLAYER(SPECIES_KOMMO_O);
+        OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_BUTTON); };
+        OPPONENT(SPECIES_CHANSEY);
+    } WHEN {
+        TURN {
+            MOVE(player, MOVE_DRAGON_TAIL);
+            MOVE(opponent, MOVE_TACKLE);
+        }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_DRAGON_TAIL, player);
+        MESSAGE("Foe Chansey was dragged out!");
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent);
+            MESSAGE("Foe Chansey is switched out with the Eject Button!");
+        }
+    }
+}
+
+SINGLE_BATTLE_TEST("Eject Button prevents Volt Switch / U-Turn from activating")
+{
+    GIVEN {
+        PLAYER(SPECIES_MANECTRIC);
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_BUTTON); };
+        OPPONENT(SPECIES_WYNAUT);
+    } WHEN {
+        TURN {
+            MOVE(player, MOVE_VOLT_SWITCH);
+            SEND_OUT(opponent, 1);
+        }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_VOLT_SWITCH, player);
+        MESSAGE("Foe Wobbuffet is switched out with the Eject Button!");
+    }
+}
+
+SINGLE_BATTLE_TEST("Eject Button is activated before Emergency Exit")
+{
+    GIVEN {
+        PLAYER(SPECIES_LATIAS);
+        OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); Item(ITEM_EJECT_BUTTON); };
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN {
+            MOVE(player, MOVE_THUNDERBOLT);
+            SEND_OUT(opponent, 1);
+        }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_THUNDERBOLT, player);
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent);
+        MESSAGE("Foe Golisopod is switched out with the Eject Button!");
+    }
+}