diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/MindShatterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/MindShatterTest.java
new file mode 100644
index 00000000000..0ac5766bc1b
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/MindShatterTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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 MindShatterTest extends CardTestPlayerBase {
+    
+    /*
+    Reported bug: Mind Shatter forces discard when X=0
+    */
+    @Test
+    public void testMindShatterXZeroOneCardInOpponentHand() {
+        
+        // {X}{B}{B} - Sorcery
+        // Target player discards X cards at random.
+        addCard(Zone.HAND, playerA, "Mind Shatter");
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);
+        addCard(Zone.HAND, playerB, "Wooded Foothills", 1);
+        
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mind Shatter");
+        addTarget(playerA, playerB);
+        setChoice(playerA, "X=0");
+        
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+        
+        assertGraveyardCount(playerA, "Mind Shatter", 1);
+        assertGraveyardCount(playerB, "Wooded Foothills", 0);
+        assertHandCount(playerB, "Wooded Foothills", 1);
+    }
+    
+    @Test
+    public void testMindShatterXZeroTwoCardsInOpponentHand() {
+        
+        // {X}{B}{B} - Sorcery
+        // Target player discards X cards at random.
+        addCard(Zone.HAND, playerA, "Mind Shatter");
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);
+        addCard(Zone.HAND, playerB, "Wooded Foothills", 2);
+        
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mind Shatter");
+        addTarget(playerA, playerB);
+        setChoice(playerA, "X=0");
+        
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+        
+        assertGraveyardCount(playerA, "Mind Shatter", 1);
+        assertGraveyardCount(playerB, "Wooded Foothills", 0);
+        assertHandCount(playerB, "Wooded Foothills", 2);
+    }
+}