diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/m3c/BarrowgoyfTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/m3c/BarrowgoyfTest.java
index 82f5b3dc459..e561f89d04e 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/m3c/BarrowgoyfTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/m3c/BarrowgoyfTest.java
@@ -31,6 +31,7 @@ public class BarrowgoyfTest extends CardTestPlayerBase {
         addCard(Zone.LIBRARY, playerA, "Plains");
 
         attack(1, playerA, barrowgoyf, playerB);
+        setChoice(playerA, true);
         setChoice(playerA, "Baneslayer Angel"); // return this to hand.
 
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
@@ -42,6 +43,27 @@ public class BarrowgoyfTest extends CardTestPlayerBase {
         assertPowerToughness(playerA, barrowgoyf, 3, 4);
     }
 
+    @Test
+    public void test_Simple_NoMill() {
+        setStrictChooseMode(true);
+        skipInitShuffling();
+
+        addCard(Zone.BATTLEFIELD, playerA, barrowgoyf);
+        addCard(Zone.GRAVEYARD, playerB, "Bitterblossom"); // Tribal Enchantment
+        addCard(Zone.LIBRARY, playerA, "Baneslayer Angel");
+        addCard(Zone.LIBRARY, playerA, "Plains");
+
+        attack(1, playerA, barrowgoyf, playerB);
+        setChoice(playerA, false);
+
+        setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+
+        assertLife(playerB, 20 - 2);
+        assertGraveyardCount(playerA, 0);
+        assertPowerToughness(playerA, barrowgoyf, 2, 3);
+    }
+
     @Test
     public void test_Simple_NoReturn() {
         setStrictChooseMode(true);
@@ -53,6 +75,7 @@ public class BarrowgoyfTest extends CardTestPlayerBase {
         addCard(Zone.LIBRARY, playerA, "Plains");
 
         attack(1, playerA, barrowgoyf, playerB);
+        setChoice(playerA, true);
         setChoice(playerA, TestPlayer.CHOICE_SKIP); // decide to not return.
 
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
@@ -76,6 +99,7 @@ public class BarrowgoyfTest extends CardTestPlayerBase {
         addCard(Zone.LIBRARY, playerA, "Invasion of Zendikar");
 
         attack(1, playerA, barrowgoyf, playerB);
+        setChoice(playerA, true);
         setChoice(playerA, TestPlayer.CHOICE_SKIP); // decide to not return. There was no choice anyway.
 
         setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);