diff --git a/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java b/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulationTest.java
similarity index 99%
rename from forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java
rename to forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulationTest.java
index d2047150c4d..0e907be9c9c 100644
--- a/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java
+++ b/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulationTest.java
@@ -21,7 +21,7 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
-public class GameSimulatorTest extends SimulationTest {
+public class GameSimulationTest extends SimulationTest {
 
     @Test
 	public void testActivateAbilityTriggers() {
diff --git a/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTest.java b/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTest.java
index fa66aaa4600..c5031bbb480 100644
--- a/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTest.java
+++ b/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTest.java
@@ -1,14 +1,23 @@
 package forge.ai.simulation;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
+
 import forge.GuiDesktop;
 import forge.StaticData;
 import forge.ai.AIOption;
 import forge.ai.LobbyPlayerAi;
 import forge.ai.simulation.GameStateEvaluator.Score;
 import forge.deck.Deck;
-import forge.game.*;
+import forge.game.Game;
+import forge.game.GameRules;
+import forge.game.GameStage;
+import forge.game.GameType;
+import forge.game.Match;
 import forge.game.card.Card;
 import forge.game.card.CardCollectionView;
 import forge.game.player.Player;
@@ -20,11 +29,6 @@ import forge.item.IPaperCard;
 import forge.localinstance.properties.ForgePreferences;
 import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
-import junit.framework.TestCase;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 public class SimulationTest {
     private static boolean initialized = false;
diff --git a/forge-gui-desktop/src/test/java/forge/ai/simulation/SpellAbilityPickerTest.java b/forge-gui-desktop/src/test/java/forge/ai/simulation/SpellAbilityPickerSimulationTest.java
similarity index 99%
rename from forge-gui-desktop/src/test/java/forge/ai/simulation/SpellAbilityPickerTest.java
rename to forge-gui-desktop/src/test/java/forge/ai/simulation/SpellAbilityPickerSimulationTest.java
index 2459ef96921..07a9bea458a 100644
--- a/forge-gui-desktop/src/test/java/forge/ai/simulation/SpellAbilityPickerTest.java
+++ b/forge-gui-desktop/src/test/java/forge/ai/simulation/SpellAbilityPickerSimulationTest.java
@@ -14,7 +14,7 @@ import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
-public class SpellAbilityPickerTest extends SimulationTest {
+public class SpellAbilityPickerSimulationTest extends SimulationTest {
     @Test
 	public void testPickingLethalDamage() {
         Game game = initAndCreateGame();