diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/MulldrifterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/MulldrifterTest.java
new file mode 100644
index 00000000000..7a398f9ccaa
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/MulldrifterTest.java
@@ -0,0 +1,90 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.mage.test.cards.single;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class MulldrifterTest extends CardTestPlayerBase {
+    
+    /**
+     * Reported bug: Muldrifter only draws 1 card. And only once during a turn if you haven't already drawn a card. 
+     * Example, If it is my turn and I play Muldrifter, no card is drawn for trigger. 
+     * 
+     * If it is not my turn and I play Ghostly Flicker targeting Eternal Witness and Muldrifter, when Muldrifter enters play, only 1 card is drawn. 
+     * 
+     * If I repeat the same thing in the same turn, the second time Muldrifter enters the battlefield, no cards are drawn.
+     */
+    @Test
+    public void testMulldrifterNotEvoked() {
+
+        // {4}{U} When Mulldrifter enters the battlefield, draw two cards.
+        addCard(Zone.HAND, playerA, "Mulldrifter"); // 2/2
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
+        
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mulldrifter");
+        setChoice(playerA, "No"); // cast regularly, not evoked
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+        
+        assertPermanentCount(playerA, "Mulldrifter", 1);
+        assertHandCount(playerA, 2); // should have drawn 2 cards
+    }
+    
+    /**
+     *
+     */
+    @Test
+    public void testMulldrifterEvoked() {
+
+        // {4}{U} When Mulldrifter enters the battlefield, draw two cards. Evoke {2}{U}
+        addCard(Zone.HAND, playerA, "Mulldrifter"); // 2/2
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
+        
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mulldrifter");
+        setChoice(playerA, "Yes"); // only paid evoke cost
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+        
+        assertPermanentCount(playerA, "Mulldrifter", 0);
+        assertGraveyardCount(playerA, "Mulldrifter", 1);
+        assertHandCount(playerA, 2); // should have drawn 2 cards
+    }
+    
+    /**
+     *
+     */
+    @Test
+    public void testMulldrifterFlickered() {
+
+        // {4}{U} When Mulldrifter enters the battlefield, draw two cards. Evoke {2}{U}
+        addCard(Zone.BATTLEFIELD, playerA, "Mulldrifter"); // 2/2
+        addCard(Zone.BATTLEFIELD, playerA, "Merfolk Looter"); // 1/1
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 5);
+        
+        // Ghostly Flicker {2}{U} Instant
+        // Exile two target artifacts, creatures, and/or lands you control, then return those cards to the battlefield under your control.
+        addCard(Zone.HAND, playerA, "Ghostly Flicker");
+        
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ghostly Flicker");
+        addTarget(playerA, "Mulldrifter^Merfolk Looter");
+        setChoice(playerA, "No"); // do not pay evoke cost
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+        
+        assertPermanentCount(playerA, "Mulldrifter", 1);
+        assertPermanentCount(playerA, "Merfolk Looter", 1);
+        assertGraveyardCount(playerA, "Ghostly Flicker", 1);
+        assertHandCount(playerA, 2); // should have drawn 2 cards
+    }
+}
\ No newline at end of file