diff --git a/Mage.Tests/src/test/java/org/mage/test/ai/bugs/BugDoesntAttackTest.java b/Mage.Tests/src/test/java/org/mage/test/ai/bugs/BugDoesntAttackTest.java
new file mode 100644
index 00000000000..252db883897
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/ai/bugs/BugDoesntAttackTest.java
@@ -0,0 +1,39 @@
+package org.mage.test.ai.bugs;
+
+import mage.Constants;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestBase;
+
+/**
+ * Reproduces bug when AI didn't attack with one of the creatures.
+ *
+ * @ayratn
+ */
+public class BugDoesntAttackTest extends CardTestBase {
+
+	@Test
+	public void testAttackWithZephyrSprite() throws Exception {
+		addCard(Constants.Zone.HAND, playerA, "Zephyr Sprite");
+		addCard(Constants.Zone.HAND, playerA, "Island");
+		addCard(Constants.Zone.HAND, playerA, "Rupture Spire");
+		setLife(playerB, 1);
+        setStopOnTurn(4);
+
+		execute();
+
+		assertLife(playerB, 0);
+	}
+
+    @Test
+	public void testAttackWithGoblinGuide() throws Exception {
+		addCard(Constants.Zone.HAND, playerA, "Goblin Guide");
+		addCard(Constants.Zone.HAND, playerA, "Mountain");
+
+        playLand(playerA, "Mountain");
+        castSpell(playerA, "Goblin Guide");
+
+		execute();
+
+		assertLife(playerB, 18);
+	}
+}
diff --git a/Mage.Tests/src/test/java/org/mage/test/ai/bugs/BugDoesntAttackWithZephyrSpriteTest.java b/Mage.Tests/src/test/java/org/mage/test/ai/bugs/BugDoesntAttackWithZephyrSpriteTest.java
deleted file mode 100644
index 3ea94e9f201..00000000000
--- a/Mage.Tests/src/test/java/org/mage/test/ai/bugs/BugDoesntAttackWithZephyrSpriteTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.mage.test.ai.bugs;
-
-import mage.Constants;
-import org.junit.Test;
-import org.mage.test.serverside.base.CardTestBase;
-
-/**
- * Reproduces bug when AI didn't attack with one of the creatures.
- *
- * @ayratn
- */
-public class BugDoesntAttackWithZephyrSpriteTest extends CardTestBase {
-
-	@Test
-	public void testVersusInfectCreature() throws Exception {
-		useRedDefault();
-		addCard(Constants.Zone.HAND, playerA, "Zephyr Sprite");
-		addCard(Constants.Zone.HAND, playerA, "Island");
-		addCard(Constants.Zone.HAND, playerA, "Rupture Spire");
-		setLife(playerB, 1);
-
-		setStopOnTurn(4);
-		execute();
-
-		// life:ComputerB:0
-		assertLife(playerB, 0);
-		// turn:1
-		assertTurn(3);
-		// result:won
-		assertResult(playerA, GameResult.WON);
-		// life:ComputerA:20
-		assertLife(playerA, 20);
-	}
-}