diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BushidoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BushidoTest.java
new file mode 100644
index 00000000000..aa89a0347a4
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BushidoTest.java
@@ -0,0 +1,48 @@
+package org.mage.test.cards.abilities.keywords;
+
+import mage.Constants;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ * @author noxx
+ */
+public class BushidoTest extends CardTestPlayerBase {
+
+    /**
+     * Tests boosting on being blocked
+     */
+    @Test
+    public void testBeingBlocked() {
+        addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard");
+        addCard(Constants.Zone.BATTLEFIELD, playerB, "Isao, Enlightened Bushi");
+
+        attack(2, playerB, "Isao, Enlightened Bushi");
+        block(2, playerA, "Elite Vanguard", "Isao, Enlightened Bushi");
+
+        setStopAt(2, Constants.PhaseStep.END_COMBAT);
+        execute();
+
+        assertPowerToughness(playerB, "Isao, Enlightened Bushi", 4, 3);
+        assertPermanentCount(playerA, "Elite Vanguard", 0);
+    }
+
+    /**
+     * Tests boosting on block
+     */
+    @Test
+    public void testBlocking() {
+        addCard(Constants.Zone.BATTLEFIELD, playerA, "Isao, Enlightened Bushi");
+        addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard");
+
+        attack(2, playerB, "Elite Vanguard");
+        block(2, playerA, "Isao, Enlightened Bushi", "Elite Vanguard");
+
+        setStopAt(2, Constants.PhaseStep.END_COMBAT);
+        execute();
+
+        assertPowerToughness(playerA, "Isao, Enlightened Bushi", 4, 3);
+        assertPermanentCount(playerB, "Elite Vanguard", 0);
+    }
+
+}