diff --git a/trick_source/java/src/test/java/trick/common/ApplicationTest.java b/trick_source/java/src/test/java/trick/common/ApplicationTest.java
index 3ad3fdf7..ef12035e 100644
--- a/trick_source/java/src/test/java/trick/common/ApplicationTest.java
+++ b/trick_source/java/src/test/java/trick/common/ApplicationTest.java
@@ -1,6 +1,6 @@
 package trick.common;
 
-import trick.common.fixtures.FontChooserFixture;
+import trick.simcontrol.fixtures.FontChooserFixture;
 import trick.common.ui.components.FontChooser;
 import trick.simcontrol.SimControlApplication;
 import trick.simcontrol.StubbedSimControlApplication;
diff --git a/trick_source/java/src/test/java/trick/simcontrol/SimControlApplicationTests.java b/trick_source/java/src/test/java/trick/simcontrol/SimControlApplicationTests.java
index a38e5683..0261bd54 100644
--- a/trick_source/java/src/test/java/trick/simcontrol/SimControlApplicationTests.java
+++ b/trick_source/java/src/test/java/trick/simcontrol/SimControlApplicationTests.java
@@ -1,7 +1,7 @@
 package trick.simcontrol;
 
 import trick.common.ApplicationTest;
-import trick.common.fixtures.FontChooserFixture;
+import trick.simcontrol.fixtures.FontChooserFixture;
 import trick.common.ui.components.FontChooser;
 import trick.simcontrol.SimControlApplication;
 import trick.simcontrol.StubbedSimControlApplication;
diff --git a/trick_source/java/src/test/java/trick/common/fixtures/FontChooserFixture.java b/trick_source/java/src/test/java/trick/simcontrol/fixtures/FontChooserFixture.java
similarity index 95%
rename from trick_source/java/src/test/java/trick/common/fixtures/FontChooserFixture.java
rename to trick_source/java/src/test/java/trick/simcontrol/fixtures/FontChooserFixture.java
index 68dca3fc..bee43362 100644
--- a/trick_source/java/src/test/java/trick/common/fixtures/FontChooserFixture.java
+++ b/trick_source/java/src/test/java/trick/simcontrol/fixtures/FontChooserFixture.java
@@ -1,4 +1,4 @@
-package trick.common.fixtures;
+package trick.simcontrol.fixtures;
 
 import java.awt.Font;
 import java.awt.GraphicsEnvironment;
@@ -10,7 +10,7 @@ import org.assertj.swing.fixture.JLabelFixture;
 import org.assertj.swing.fixture.JListFixture;
 import org.assertj.swing.fixture.JPanelFixture;
 
-import trick.common.fixtures.FontChooserFixtureExtension;
+import trick.simcontrol.fixtures.FontChooserFixtureExtension;
 import trick.common.ui.components.FontChooser;
 
 public class FontChooserFixture extends DialogFixture {
diff --git a/trick_source/java/src/test/java/trick/common/fixtures/FontChooserFixtureExtension.java b/trick_source/java/src/test/java/trick/simcontrol/fixtures/FontChooserFixtureExtension.java
similarity index 84%
rename from trick_source/java/src/test/java/trick/common/fixtures/FontChooserFixtureExtension.java
rename to trick_source/java/src/test/java/trick/simcontrol/fixtures/FontChooserFixtureExtension.java
index d98da73b..dee60a51 100644
--- a/trick_source/java/src/test/java/trick/common/fixtures/FontChooserFixtureExtension.java
+++ b/trick_source/java/src/test/java/trick/simcontrol/fixtures/FontChooserFixtureExtension.java
@@ -1,11 +1,11 @@
-package trick.common.fixtures;
+package trick.simcontrol.fixtures;
 
 import java.awt.Container;
 
 import org.assertj.swing.core.Robot;
 import org.assertj.swing.fixture.ComponentFixtureExtension;
 
-import trick.common.fixtures.FontChooserFixture;
+import trick.simcontrol.fixtures.FontChooserFixture;
 import trick.common.ui.components.FontChooser;
 
 public class FontChooserFixtureExtension extends ComponentFixtureExtension {