diff --git a/Ghidra/Features/Base/src/test/java/ghidra/formats/gfilesystem/FileSystemServiceTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/formats/gfilesystem/FileSystemServiceTest.java
similarity index 94%
rename from Ghidra/Features/Base/src/test/java/ghidra/formats/gfilesystem/FileSystemServiceTest.java
rename to Ghidra/Features/Base/src/test.slow/java/ghidra/formats/gfilesystem/FileSystemServiceTest.java
index 5eedd7e8ce..82d985abc6 100644
--- a/Ghidra/Features/Base/src/test/java/ghidra/formats/gfilesystem/FileSystemServiceTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/formats/gfilesystem/FileSystemServiceTest.java
@@ -22,13 +22,13 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import docking.test.AbstractDockingTest;
 import generic.test.AbstractGenericTest;
+import ghidra.test.AbstractGhidraHeadedIntegrationTest;
 import ghidra.util.exception.CancelledException;
 import ghidra.util.task.TaskMonitor;
 import utilities.util.FileUtilities;
 
-public class FileSystemServiceTest extends AbstractDockingTest {
+public class FileSystemServiceTest extends AbstractGhidraHeadedIntegrationTest {
 
 	private File fssTestDir;
 	private FileSystemService fsService;
diff --git a/Ghidra/Features/Base/src/test/java/ghidra/util/BigEndianConverterTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/util/BigEndianConverterTest.java
similarity index 95%
rename from Ghidra/Features/Base/src/test/java/ghidra/util/BigEndianConverterTest.java
rename to Ghidra/Features/Base/src/test.slow/java/ghidra/util/BigEndianConverterTest.java
index 3501f53e9a..c0a4c427e0 100644
--- a/Ghidra/Features/Base/src/test/java/ghidra/util/BigEndianConverterTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/util/BigEndianConverterTest.java
@@ -24,7 +24,9 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import docking.test.AbstractDockingTest;
+import ghidra.test.AbstractGhidraHeadedIntegrationTest;
+import ghidra.util.BigEndianDataConverter;
+import ghidra.util.DataConverter;
 
 /**
  * 
@@ -34,7 +36,7 @@ import docking.test.AbstractDockingTest;
  * To enable and disable the creation of type comments go to
  * Window>Preferences>Java>Code Generation.
  */
-public class BigEndianConverterTest extends AbstractDockingTest {
+public class BigEndianConverterTest extends AbstractGhidraHeadedIntegrationTest {
 	private byte[] b;
 	private DataConverter dc;
 
diff --git a/Ghidra/Features/Base/src/test/java/ghidra/util/LittleEndianConverterTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/util/LittleEndianConverterTest.java
similarity index 96%
rename from Ghidra/Features/Base/src/test/java/ghidra/util/LittleEndianConverterTest.java
rename to Ghidra/Features/Base/src/test.slow/java/ghidra/util/LittleEndianConverterTest.java
index e38771ee88..e8bb76d143 100644
--- a/Ghidra/Features/Base/src/test/java/ghidra/util/LittleEndianConverterTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/util/LittleEndianConverterTest.java
@@ -20,9 +20,10 @@ import static org.junit.Assert.assertEquals;
 import java.math.BigInteger;
 import java.util.Arrays;
 
-import org.junit.*;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-import docking.test.AbstractDockingTest;
 import ghidra.test.AbstractGhidraHeadedIntegrationTest;
 
 /**
@@ -33,7 +34,7 @@ import ghidra.test.AbstractGhidraHeadedIntegrationTest;
  * To enable and disable the creation of type comments go to
  * Window>Preferences>Java>Code Generation.
  */
-public class LittleEndianConverterTest extends AbstractDockingTest {
+public class LittleEndianConverterTest extends AbstractGhidraHeadedIntegrationTest {
 	private byte[] b;
 	private DataConverter dc;
 
diff --git a/Ghidra/Features/Base/src/test/java/ghidra/util/UnsignedDataUtilsTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/util/UnsignedDataUtilsTest.java
similarity index 99%
rename from Ghidra/Features/Base/src/test/java/ghidra/util/UnsignedDataUtilsTest.java
rename to Ghidra/Features/Base/src/test.slow/java/ghidra/util/UnsignedDataUtilsTest.java
index ab8a8aae15..3eeb9b3789 100644
--- a/Ghidra/Features/Base/src/test/java/ghidra/util/UnsignedDataUtilsTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/util/UnsignedDataUtilsTest.java
@@ -19,10 +19,10 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import docking.test.AbstractDockingTest;
 import generic.util.UnsignedDataUtils;
+import ghidra.test.AbstractGhidraHeadedIntegrationTest;
 
-public class UnsignedDataUtilsTest extends AbstractDockingTest {
+public class UnsignedDataUtilsTest extends AbstractGhidraHeadedIntegrationTest {
 
 	@Test
 	public void testByteGreaterThan() {
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/util/table/PreviewTableCellDataTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/util/table/PreviewTableCellDataTest.java
index 587947a6b8..cf3b28ed97 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/util/table/PreviewTableCellDataTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/util/table/PreviewTableCellDataTest.java
@@ -26,12 +26,29 @@ import ghidra.app.util.viewer.field.ArrayElementFieldLocation;
 import ghidra.app.util.viewer.field.BrowserCodeUnitFormat;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.address.AddressSpace;
-import ghidra.program.model.data.*;
-import ghidra.program.model.listing.*;
-import ghidra.program.util.*;
+import ghidra.program.model.data.ArrayDataType;
+import ghidra.program.model.data.CharDataType;
+import ghidra.program.model.data.Integer16DataType;
+import ghidra.program.model.data.StringDataType;
+import ghidra.program.model.data.StructureDataType;
+import ghidra.program.model.data.TerminatedStringDataType;
+import ghidra.program.model.data.UnicodeDataType;
+import ghidra.program.model.listing.CodeUnitFormat;
+import ghidra.program.model.listing.Function;
+import ghidra.program.model.listing.Program;
+import ghidra.program.model.listing.Variable;
+import ghidra.program.util.AddressFieldLocation;
+import ghidra.program.util.BytesFieldLocation;
+import ghidra.program.util.FunctionNameFieldLocation;
+import ghidra.program.util.LabelFieldLocation;
+import ghidra.program.util.MnemonicFieldLocation;
+import ghidra.program.util.OperandFieldLocation;
+import ghidra.program.util.ProgramLocation;
+import ghidra.program.util.RepeatableCommentFieldLocation;
+import ghidra.program.util.VariableNameFieldLocation;
+import ghidra.program.util.XRefFieldLocation;
 import ghidra.test.AbstractProgramBasedTest;
 import ghidra.test.ClassicSampleX86ProgramBuilder;
-import ghidra.util.table.PreviewTableCellData;
 
 public class PreviewTableCellDataTest extends AbstractProgramBasedTest {