diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java
index bdd3081f89b..4317f8ed8f3 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java
@@ -201,4 +201,62 @@ public class TamiyoTest extends CardTestPlayerBase {
         assertLife(playerB, 16);
         assertHandCount(playerA, 3); // 2 cards drawn from Advocate + 1 card during T3 draw step.
     }
+    
+    @Test
+    public void testFieldResearcherFirstAbilityTargetOpponentCreature() {
+        /*        
+        // Tamiyo, Field Researcher {1}{G}{W}{U} - 4 loyalty
+            +1: Choose up to two target creatures. Until your next turn, whenever either of those creatures deals combat damage, you draw a card.
+            −2: Tap up to two target nonland permanents. They don't untap during their controller's next untap step.
+            −7: Draw three cards. You get an emblem with "You may cast nonland cards from your hand without paying their mana costs."
+        */
+        addCard(Zone.HAND, playerA, "Tamiyo, Field Researcher", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 2);    
+        
+        addCard(Zone.BATTLEFIELD, playerB, "Bronze Sable", 1);
+        
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Tamiyo, Field Researcher");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Choose up to two");
+        addTarget(playerA, "Bronze Sable");
+        
+        attack(2, playerB, "Bronze Sable");
+        
+        setStopAt(2, PhaseStep.END_COMBAT);
+        execute();
+        
+        assertLife(playerA, 18);
+        assertHandCount(playerA, 1);
+    }
+    
+    @Test
+    public void testFieldResearcherFirstAbilityTargetOpponentCreatures() {
+        /*        
+        // Tamiyo, Field Researcher {1}{G}{W}{U} - 4 loyalty
+            +1: Choose up to two target creatures. Until your next turn, whenever either of those creatures deals combat damage, you draw a card.
+            −2: Tap up to two target nonland permanents. They don't untap during their controller's next untap step.
+            −7: Draw three cards. You get an emblem with "You may cast nonland cards from your hand without paying their mana costs."
+        */
+        addCard(Zone.HAND, playerA, "Tamiyo, Field Researcher", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 2);    
+        
+        addCard(Zone.BATTLEFIELD, playerB, "Bronze Sable", 1);
+        addCard(Zone.BATTLEFIELD, playerB, "Memnite", 1);
+        
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Tamiyo, Field Researcher");
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Choose up to two");
+        addTarget(playerA, "Bronze Sable^Memnite");
+        
+        attack(2, playerB, "Bronze Sable");
+        attack(2, playerB, "Memnite");
+        
+        setStopAt(2, PhaseStep.END_COMBAT);
+        execute();
+        
+        assertLife(playerA, 17);
+        assertHandCount(playerA, 2);
+    }
 }