diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MerfolkTricksterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MerfolkTricksterTest.java
index 36f48a2ddff..d5a4fffe381 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MerfolkTricksterTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/MerfolkTricksterTest.java
@@ -106,27 +106,6 @@ public class MerfolkTricksterTest extends CardTestPlayerBase {
         //assertAllCommandsUsed(); // uncommenting this will force a failure since PlayerA cannot do a command to target Trickster, as expected
     }
     
-    // Making sure Footlight Fiend working correctly here first...    
-    @Test
-    public void test_GrizzlyBearBlocksFootlightFiend_BothDie()
-    {
-        addCard(Zone.BATTLEFIELD, playerA, "Footlight Fiend"); // (R/B) 1/1 on death pings any target for 1
-        addCard(Zone.BATTLEFIELD, playerB, "Grizzly Bears"); // (G) 2/2
-        
-        attack(1, playerA, "Footlight Fiend");
-        block(1, playerB, "Grizzly Bears", "Footlight Fiend");
-        addTarget(playerA, "Grizzly Bears");
-        
-        setStopAt(1, PhaseStep.END_COMBAT);
-        execute();
-        
-        assertLife(playerA, 20);
-        assertLife(playerB, 20);
-        assertGraveyardCount(playerA, "Footlight Fiend", 1);
-        assertGraveyardCount(playerB, "Grizzly Bears", 1);
-        assertAllCommandsUsed();
-    }
-    
     @Test
     public void test_TricksterBlocksTibaltToken_Survives()
     {
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/FootlightFiendTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/FootlightFiendTest.java
new file mode 100644
index 00000000000..9865e2e7398
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/FootlightFiendTest.java
@@ -0,0 +1,33 @@
+package org.mage.test.cards.triggers.dies;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author drmDev
+ */
+public class FootlightFiendTest extends CardTestPlayerBase {
+    
+    @Test
+    public void test_GrizzlyBearBlocksFootlightFiend_BothDie()
+    {
+        addCard(Zone.BATTLEFIELD, playerA, "Footlight Fiend"); // (R/B) 1/1 on death pings any target for 1
+        addCard(Zone.BATTLEFIELD, playerB, "Grizzly Bears"); // (G) 2/2
+        
+        attack(1, playerA, "Footlight Fiend");
+        block(1, playerB, "Grizzly Bears", "Footlight Fiend");
+        addTarget(playerA, "Grizzly Bears");
+        
+        setStopAt(1, PhaseStep.END_COMBAT);
+        execute();
+        
+        assertLife(playerA, 20);
+        assertLife(playerB, 20);
+        assertGraveyardCount(playerA, "Footlight Fiend", 1);
+        assertGraveyardCount(playerB, "Grizzly Bears", 1);
+        assertAllCommandsUsed();
+    }
+}
\ No newline at end of file