diff --git a/Mage.Sets/src/mage/sets/tempest/FlickeringWard.java b/Mage.Sets/src/mage/sets/tempest/FlickeringWard.java
index d1f89844a74..c8ec4fdf9cc 100644
--- a/Mage.Sets/src/mage/sets/tempest/FlickeringWard.java
+++ b/Mage.Sets/src/mage/sets/tempest/FlickeringWard.java
@@ -61,13 +61,13 @@ public class FlickeringWard extends CardImpl {
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect));
         this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
-        
+
         // As Flickering Ward enters the battlefield, choose a color.
         this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit)));
-        
+
         // Enchanted creature has protection from the chosen color. This effect doesn't remove Flickering Ward.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorAttachedEffect(true)));
-        
+
         // {W}: Return Flickering Ward to its owner's hand.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{W}")));
     }
@@ -80,4 +80,4 @@ public class FlickeringWard extends CardImpl {
     public FlickeringWard copy() {
         return new FlickeringWard(this);
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/protection/FlickeringWardTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/protection/FlickeringWardTest.java
new file mode 100644
index 00000000000..4b5fbf3a71f
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/protection/FlickeringWardTest.java
@@ -0,0 +1,62 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.protection;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class FlickeringWardTest extends CardTestPlayerBase {
+
+    @Test
+    public void testDOesNotRemoveItself() {
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
+        // Enchant creature
+        // As Flickering Ward enters the battlefield, choose a color.
+        // Enchanted creature has protection from the chosen color. This effect doesn't remove Flickering Ward.
+        // {W}: Return Flickering Ward to its owner's hand.
+        addCard(Zone.HAND, playerA, "Flickering Ward"); // {W}
+
+        addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Flickering Ward", "Silvercoat Lion");
+        setChoice(playerA, "White");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, "Silvercoat Lion", 1);
+        assertPermanentCount(playerA, "Flickering Ward", 1);
+    }
+
+}