diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Hostility.java b/Mage.Sets/src/mage/sets/jacevschandra/Hostility.java
index a4e68652263..615e706f705 100644
--- a/Mage.Sets/src/mage/sets/jacevschandra/Hostility.java
+++ b/Mage.Sets/src/mage/sets/jacevschandra/Hostility.java
@@ -46,6 +46,7 @@ import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.token.Token;
+import mage.game.stack.Spell;
 
 /**
  *
@@ -111,7 +112,10 @@ class HostilityEffect extends PreventionEffectImpl {
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (super.applies(event, source, game)) {
             if (game.getOpponents(source.getControllerId()).contains(event.getTargetId())) {
-                return true;
+                Spell spell = game.getStack().getSpell(event.getSourceId());
+                if (spell != null && spell.getControllerId().equals(source.getControllerId())) {
+                    return true;
+                }
             }
         }
         return false;
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/HostilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/HostilityTest.java
new file mode 100644
index 00000000000..6e57f51737e
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/HostilityTest.java
@@ -0,0 +1,88 @@
+/*
+ *  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.single.lrw;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author Kranken, LevelX2
+ */
+
+public class HostilityTest extends CardTestPlayerBase {
+
+    @Test
+    public void testCombatDamage() {
+        addCard(Zone.BATTLEFIELD, playerA, "Hostility");
+        attack(1, playerA, "Hostility");
+
+        setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 14);
+    }
+
+    @Test
+    public void testSpellDamage() {
+        addCard(Zone.BATTLEFIELD, playerA, "Hostility");
+
+        addCard(Zone.HAND, playerA, "Lightning Bolt");
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB);
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 20);
+
+        assertPermanentCount(playerA, 5); // hostility, mountain, and 3 tokens
+    }
+
+    @Test
+    public void testOpponentSpellDamage() {
+        addCard(Zone.BATTLEFIELD, playerA, "Hostility");
+
+        addCard(Zone.HAND, playerB, "Lightning Bolt");
+        addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerB);
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 17);
+    }
+
+}
\ No newline at end of file