diff --git a/projects/mtg/src/AIPlayer.cpp b/projects/mtg/src/AIPlayer.cpp
index 8269e5443..8b705d501 100644
--- a/projects/mtg/src/AIPlayer.cpp
+++ b/projects/mtg/src/AIPlayer.cpp
@@ -34,6 +34,7 @@ AIPlayer::AIPlayer(MTGPlayerCards * deck, string file, string fileSmall) : Playe
   stats = NULL;
   agressivity = 50;
   forceBestAbilityUse = false;
+  playMode = Player::MODE_AI;
 }
 
 AIPlayer::~AIPlayer(){
diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp
index 426ac9842..331d1c838 100644
--- a/projects/mtg/src/GameObserver.cpp
+++ b/projects/mtg/src/GameObserver.cpp
@@ -289,7 +289,8 @@ void GameObserver::Update(float dt){
   oldGamePhase = currentGamePhase;
 
     //Auto skip Phases
-  int skipLevel = options[Options::ASPHASES].number;
+  int skipLevel = (player->playMode == Player::MODE_TEST_SUITE) ? Constants::ASKIP_NONE :
+                      options[Options::ASPHASES].number;
   int nrCreatures = currentPlayer->game->inPlay->countByType("Creature");
 
   if (skipLevel == Constants::ASKIP_SAFE || skipLevel == Constants::ASKIP_FULL) {
diff --git a/projects/mtg/src/Player.cpp b/projects/mtg/src/Player.cpp
index 71eb585ff..492d5cb4f 100644
--- a/projects/mtg/src/Player.cpp
+++ b/projects/mtg/src/Player.cpp
@@ -17,16 +17,17 @@ Player::Player(MTGPlayerCards * deck, string file, string fileSmall) : Damageabl
   castrestrictedspell = 0;
   castrestrictedcreature = 0;
   onlyonecast = 0;
-        castcount = 0;
-		nocreatureinstant = 0;
-		nospellinstant = 0;
-		onlyoneinstant = 0;
+  castcount = 0;
+  nocreatureinstant = 0;
+  nospellinstant = 0;
+  onlyoneinstant = 0;
   poisonCount = 0;
   damageCount = 0;
   preventable = 0;
   mAvatar = NULL;
   mAvatarTex = NULL;
   type_as_damageable = DAMAGEABLE_PLAYER;
+  playMode = MODE_HUMAN;
 }
 
 /*Method to call at the end of a game, before all objects involved in the game are destroyed */
@@ -84,6 +85,7 @@ Player * Player::opponent(){
 
 HumanPlayer::HumanPlayer(MTGPlayerCards * deck, string file, string fileSmall) : Player(deck, file, fileSmall) {
   loadAvatar("avatar.jpg");
+  playMode = MODE_HUMAN;
 }
 
 
diff --git a/projects/mtg/src/TestSuiteAI.cpp b/projects/mtg/src/TestSuiteAI.cpp
index c04c490eb..00b687398 100644
--- a/projects/mtg/src/TestSuiteAI.cpp
+++ b/projects/mtg/src/TestSuiteAI.cpp
@@ -12,18 +12,10 @@
 using std::string;
 
 
-enum ENUM_PLAY_MODE
-  {
-    MODE_TEST_SUITE,
-    MODE_HUMAN,
-    MODE_AI,
-  };
-
 TestSuiteAI::TestSuiteAI(TestSuite * _suite, int playerId):AIPlayerBaka(_suite->buildDeck(playerId),"testsuite", "testsuite","baka.jpg"){
   suite = _suite;
   timer = 0;
   playMode = MODE_TEST_SUITE;
-
 }
 
 
@@ -329,7 +321,7 @@ int TestSuite::assertGame(){
   }
   for (int i = 0; i < 2; i++){
     TestSuiteAI * p = (TestSuiteAI *)(g->players[i]);
-    if (p->playMode == MODE_AI) wasAI = true;
+    if (p->playMode == Player::MODE_AI) wasAI = true;
 
     if (p->life != endState.playerData[i].life){
       sprintf(result, "<span class=\"error\">==life problem for player %i. Expected %i, got %i==</span><br />",i,endState.playerData[i].life, p->life);