diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/NykthosShrineToNyxTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/NykthosShrineToNyxTest.java
new file mode 100644
index 00000000000..75339d9d55d
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/NykthosShrineToNyxTest.java
@@ -0,0 +1,65 @@
+/*
+ *  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.mana;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class NykthosShrineToNyxTest extends CardTestPlayerBase {
+
+    @Test
+    public void testNoManaToCast() {
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
+        addCard(Zone.BATTLEFIELD, playerA, "Nykthos, Shrine to Nyx", 1);
+        // Kiora's Follower {G}{U}
+        // Creature - Merfolk
+        // {T}: Untap another target permanent.
+        addCard(Zone.BATTLEFIELD, playerA, "Kiora's Follower");
+        addCard(Zone.BATTLEFIELD, playerA, "Kalonian Tusker", 2);
+        // Green mana doesn't empty from your mana pool as steps and phases end.
+        // Omnath, Locus of Mana gets +1/+1 for each green mana in your mana pool.
+        addCard(Zone.BATTLEFIELD, playerA, "Omnath, Locus of Mana", 1);
+        
+        activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2},{T}: Choose a color. Add to your mana pool an amount of mana of that color equal to your devotion to that color. <i>(Your devotion to a color is the number of mana symbols of that color in the mana costs of permanents you control.)</i>.");        
+        setChoice(playerA, "Green");
+        
+        setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
+        execute();
+        
+        Assert.assertEquals("message", 6, playerA.getManaPool().getGreen()); // 5 green mana
+        assertPowerToughness(playerA, "Omnath, Locus of Mana", 7, 7);
+    }
+
+}
diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
index e84a795155d..afee79f6c91 100644
--- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
+++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
@@ -63,6 +63,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import mage.abilities.mana.ManaAbility;
 import mage.constants.Zone;
 import mage.target.TargetSource;
 
@@ -154,8 +155,18 @@ public class TestPlayer extends ComputerPlayer {
                                 actions.remove(action);
                                 return true;
                             }                            
-                        }
-                        
+                        }                        
+                    }
+                    List<Permanent> manaPermsWithCost = this.getAvailableManaProducersWithCost(game);
+                    for (Permanent perm: manaPermsWithCost) {
+                        for (ManaAbility manaAbility: perm.getAbilities().getAvailableManaAbilities(Zone.BATTLEFIELD, game)) {
+                            if (manaAbility.toString().startsWith(groups[0]) && manaAbility.canActivate(playerId, game)) {                                
+                                Ability newManaAbility = manaAbility.copy();                                
+                                this.activateAbility((ActivatedAbility)newManaAbility, game);
+                                actions.remove(action);
+                                return true;
+                            }                            
+                        }                     
                     }
                 } else