diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/FlusterstormTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/FlusterstormTest.java
new file mode 100644
index 0000000000..0271ec68f1
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/FlusterstormTest.java
@@ -0,0 +1,32 @@
+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;
+
+public class FlusterstormTest extends CardTestPlayerBase {
+    @Test
+    public void testThatFlusterstormGoesToGraveyard() {
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
+        addCard(Zone.HAND, playerA, "Spark Spray");
+
+        addCard(Zone.BATTLEFIELD, playerB, "Island");
+        addCard(Zone.HAND, playerB, "Flusterstorm");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spark Spray", playerB);
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Flusterstorm", "Spark Spray", "Spark Spray");
+
+        setChoice(playerA, "No");
+        setChoice(playerB, "No");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertGraveyardCount(playerA, 1);
+        assertGraveyardCount(playerB, 1);
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 20);
+    }
+}