diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrbOfDreams.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrbOfDreams.java
index fa8c8dd630f..c19102a2ac1 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrbOfDreams.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrbOfDreams.java
@@ -30,6 +30,7 @@ package mage.sets.betrayersofkamigawa;
 import java.util.UUID;
 import mage.Constants;
 import mage.Constants.CardType;
+import mage.Constants.Duration;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
@@ -65,7 +66,7 @@ public class OrbOfDreams extends CardImpl<OrbOfDreams> {
     private class OrbOfDreamsEffect extends ReplacementEffectImpl<OrbOfDreamsEffect> {
 
         OrbOfDreamsEffect() {
-            super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Tap);
+            super(Duration.WhileOnBattlefield, Constants.Outcome.Tap, false);
             staticText = "Permanents enter the battlefield tapped";
         }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CorpsejackMenace.java b/Mage.Sets/src/mage/sets/returntoravnica/CorpsejackMenace.java
index c2dab588881..a914bca3bf1 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/CorpsejackMenace.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/CorpsejackMenace.java
@@ -28,9 +28,11 @@
 package mage.sets.returntoravnica;
 
 import java.util.UUID;
-import mage.Constants;
 import mage.Constants.CardType;
+import mage.Constants.Duration;
+import mage.Constants.Outcome;
 import mage.Constants.Rarity;
+import mage.Constants.Zone;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
@@ -66,7 +68,7 @@ public class CorpsejackMenace extends CardImpl<CorpsejackMenace> {
         this.toughness = new MageInt(4);
 
         // If one or more +1/+1 counters would be placed on a creature you control, twice that many +1/+1 counters are placed on it instead.
-        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CorpsejackMenaceReplacementEffect()));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CorpsejackMenaceReplacementEffect()));
 
     }
 
@@ -83,7 +85,7 @@ public class CorpsejackMenace extends CardImpl<CorpsejackMenace> {
 
 class CorpsejackMenaceReplacementEffect extends ReplacementEffectImpl<CorpsejackMenaceReplacementEffect> {
     CorpsejackMenaceReplacementEffect() {
-        super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.BoostCreature);
+        super(Duration.WhileOnBattlefield, Outcome.BoostCreature, false);
         staticText = "If one or more +1/+1 counters would be placed on a creature you control, twice that many +1/+1 counters are placed on it instead";
     }
 
@@ -123,4 +125,4 @@ class CorpsejackMenaceReplacementEffect extends ReplacementEffectImpl<Corpsejack
     public CorpsejackMenaceReplacementEffect copy() {
         return new CorpsejackMenaceReplacementEffect(this);
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/OrbOfDreamsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/OrbOfDreamsTest.java
index eb8980511b4..1d19b52dd71 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/OrbOfDreamsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/OrbOfDreamsTest.java
@@ -30,21 +30,26 @@ public class OrbOfDreamsTest extends CardTestPlayerBase {
 
     @Test
     public void testOrbNotTappingItself() {
-        addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 3);
+        addCard(Constants.Zone.BATTLEFIELD, playerA, "Forest", 5);
         addCard(Constants.Zone.HAND, playerA, "Orb of Dreams");
+        addCard(Constants.Zone.HAND, playerA, "Razortip Whip");
 
         castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Orb of Dreams");
+        castSpell(1, Constants.PhaseStep.POSTCOMBAT_MAIN, playerA, "Razortip Whip");
 
-        setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT);
+        setStopAt(1, Constants.PhaseStep.END_TURN);
         execute();
 
         assertLife(playerA, 20);
         assertLife(playerB, 20);
 
         assertPermanentCount(playerA, "Orb of Dreams", 1);
+        assertPermanentCount(playerA, "Razortip Whip", 1);
 
         Permanent orbOfDreams = getPermanent("Orb of Dreams", playerA.getId());
         Assert.assertFalse("Orb has tapped itself, but may not", orbOfDreams.isTapped());
+        Permanent razortipWhip = getPermanent("Razortip Whip", playerA.getId());
+        Assert.assertTrue("Razortip Whip must be tapped from Orb of Dreams but isn't", razortipWhip.isTapped());
     }
 
 }