diff --git a/Mage/src/mage/cards/MockAbility.java b/Mage/src/mage/cards/mock/MockAbility.java
similarity index 94%
rename from Mage/src/mage/cards/MockAbility.java
rename to Mage/src/mage/cards/mock/MockAbility.java
index 27a41348211..05d2a1456c7 100644
--- a/Mage/src/mage/cards/MockAbility.java
+++ b/Mage/src/mage/cards/mock/MockAbility.java
@@ -1,4 +1,4 @@
-package mage.cards;
+package mage.cards.mock;
 
 import mage.abilities.AbilityImpl;
 import mage.constants.AbilityType;
diff --git a/Mage/src/mage/cards/MockCard.java b/Mage/src/mage/cards/mock/MockCard.java
similarity index 94%
rename from Mage/src/mage/cards/MockCard.java
rename to Mage/src/mage/cards/mock/MockCard.java
index 54f4aa6d6e0..bf2f2e031ff 100644
--- a/Mage/src/mage/cards/MockCard.java
+++ b/Mage/src/mage/cards/mock/MockCard.java
@@ -1,9 +1,10 @@
-package mage.cards;
+package mage.cards.mock;
 
 import java.util.List;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.cards.CardImpl;
 import mage.cards.repository.CardInfo;
 import mage.cards.repository.CardRepository;
 
diff --git a/Mage/src/mage/cards/MockSplitCard.java b/Mage/src/mage/cards/mock/MockSplitCard.java
similarity index 95%
rename from Mage/src/mage/cards/MockSplitCard.java
rename to Mage/src/mage/cards/mock/MockSplitCard.java
index 3b92894f6b8..2619d9b9585 100644
--- a/Mage/src/mage/cards/MockSplitCard.java
+++ b/Mage/src/mage/cards/mock/MockSplitCard.java
@@ -1,8 +1,9 @@
-package mage.cards;
+package mage.cards.mock;
 
 import java.util.List;
 import mage.MageInt;
 import mage.abilities.Ability;
+import mage.cards.SplitCard;
 import mage.cards.repository.CardInfo;
 import mage.cards.repository.CardRepository;
 import mage.constants.CardType;
diff --git a/Mage/src/mage/cards/repository/CardInfo.java b/Mage/src/mage/cards/repository/CardInfo.java
index 56b22e7e320..0cbcbab17b4 100644
--- a/Mage/src/mage/cards/repository/CardInfo.java
+++ b/Mage/src/mage/cards/repository/CardInfo.java
@@ -35,13 +35,13 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import mage.cards.MockCard;
 import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.ObjectColor;
 import mage.cards.Card;
 import mage.cards.CardImpl;
-import mage.cards.MockSplitCard;
+import mage.cards.mock.MockCard;
+import mage.cards.mock.MockSplitCard;
 
 /**
  *