diff --git a/Mage.Sets/src/mage/cards/t/TeamPennant.java b/Mage.Sets/src/mage/cards/t/TeamPennant.java
index c4a3a5fa169..36d3e3fa5a3 100644
--- a/Mage.Sets/src/mage/cards/t/TeamPennant.java
+++ b/Mage.Sets/src/mage/cards/t/TeamPennant.java
@@ -14,7 +14,9 @@ import mage.constants.AttachmentType;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.SubType;
-import mage.filter.StaticFilters;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.permanent.TokenPredicate;
 import mage.target.TargetPermanent;
 
 import java.util.UUID;
@@ -24,6 +26,12 @@ import java.util.UUID;
  */
 public final class TeamPennant extends CardImpl {
 
+    private static final FilterPermanent filter = new FilterControlledCreaturePermanent("creature token");
+
+    static {
+        filter.add(TokenPredicate.TRUE);
+    }
+
     public TeamPennant(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}");
 
@@ -42,7 +50,7 @@ public final class TeamPennant extends CardImpl {
         // Equip creature token {1}
         this.addAbility(new EquipAbility(
                 Outcome.BoostCreature, new GenericManaCost(1),
-                new TargetPermanent(StaticFilters.FILTER_CREATURE_TOKEN), false
+                new TargetPermanent(filter), false
         ));
 
         // Equip {3}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/dmc/TillerEngineTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/dmc/TillerEngineTest.java
index c58c16977b6..e76708cdfa7 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/dmc/TillerEngineTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/dmc/TillerEngineTest.java
@@ -25,7 +25,7 @@ public class TillerEngineTest extends CardTestPlayerBase {
         addCard(Zone.HAND, playerA, land);
 
         playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, land);
-        setChoice(playerA, "Whenever a land enters"); // order triggers
+        setChoice(playerA, "Whenever a land you control enters"); // order triggers
         setModeChoice(playerA, "1");
 
         setStrictChooseMode(true);
@@ -45,7 +45,7 @@ public class TillerEngineTest extends CardTestPlayerBase {
         addCard(Zone.HAND, playerA, land);
 
         playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, land);
-        setChoice(playerA, "Whenever a land enters"); // order triggers
+        setChoice(playerA, "Whenever a land you control enters"); // order triggers
         setModeChoice(playerA, "2");
         addTarget(playerA, centaur);