diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java
index f086039625..272de90b47 100644
--- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java
+++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java
@@ -116,6 +116,11 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
 				pass();
 				break;
 			case PRECOMBAT_MAIN:
+			case BEGIN_COMBAT:
+			case DECLARE_ATTACKERS:
+			case DECLARE_BLOCKERS:
+			case COMBAT_DAMAGE:
+			case END_COMBAT:
 			case POSTCOMBAT_MAIN:
 				if (game.getActivePlayerId().equals(playerId)) {
 					Player player = game.getPlayer(playerId);
@@ -141,11 +146,6 @@ public class ComputerPlayer6 extends ComputerPlayer<ComputerPlayer6> implements
 				}
 				act(game);
 				break;
-						case BEGIN_COMBAT:
-			case DECLARE_ATTACKERS:
-			case DECLARE_BLOCKERS:
-			case COMBAT_DAMAGE:
-			case END_COMBAT:
 			case END_TURN:
 				pass();
 				break;
diff --git a/Mage.Tests/plugins/mage-player-ai-ma.jar b/Mage.Tests/plugins/mage-player-ai-ma.jar
index c7ee7d87e8..a2e07914e7 100644
Binary files a/Mage.Tests/plugins/mage-player-ai-ma.jar and b/Mage.Tests/plugins/mage-player-ai-ma.jar differ
diff --git a/Mage.Tests/scenario1.txt b/Mage.Tests/scenario1.txt
index cf7e85f73b..4c8bae0af9 100644
--- a/Mage.Tests/scenario1.txt
+++ b/Mage.Tests/scenario1.txt
@@ -1,6 +1,7 @@
 ### ComputerA ###
 # Battlefield
 battlefield:ComputerA:Island:1
+battlefield:ComputerA:Goblin Guide:1
 # Hand
 hand:ComputerA:Mountain:2
 hand:ComputerA:Lightning Bolt:5
diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java
index 2a63cfaede..31fc551dd7 100644
--- a/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/serverside/PlayGameTest.java
@@ -56,7 +56,7 @@ public class PlayGameTest extends MageTestBase {
 		game.addPlayer(computerB, deck2);
 		game.loadCards(deck2.getCards(), computerB.getId());
 
-		parseScenario("scenario1.txt");
+		//parseScenario("scenario1.txt");
 		game.cheat(computerA.getId(), commandsA);
 		game.cheat(computerA.getId(), libraryCardsA, handCardsA, battlefieldCardsA, graveyardCardsA);
 		game.cheat(computerB.getId(), commandsB);