diff --git a/Ghidra/Features/Base/src/main/java/ghidra/test/AbstractGhidraHeadlessIntegrationTest.java b/Ghidra/Features/Base/src/main/java/ghidra/test/AbstractGhidraHeadlessIntegrationTest.java
index c3a9b33fdc..bfb1665176 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/test/AbstractGhidraHeadlessIntegrationTest.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/test/AbstractGhidraHeadlessIntegrationTest.java
@@ -21,7 +21,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
-import org.apache.commons.collections4.BidiMap;
 import org.junit.BeforeClass;
 
 import docking.test.AbstractDockingTest;
@@ -613,8 +612,8 @@ public abstract class AbstractGhidraHeadlessIntegrationTest extends AbstractDock
 		Map<String, Set<ClassFileInfo>> extensionPointSuffixToInfoMap =
 			(Map<String, Set<ClassFileInfo>>) getInstanceField("extensionPointSuffixToInfoMap",
 				ClassSearcher.class);
-		BidiMap<ClassFileInfo, Class<?>> loadedCache =
-			(BidiMap<ClassFileInfo, Class<?>>) getInstanceField("loadedCache", ClassSearcher.class);
+		HashMap<ClassFileInfo, Class<?>> loadedCache =
+			(HashMap<ClassFileInfo, Class<?>>) getInstanceField("loadedCache", ClassSearcher.class);
 		String suffix = ClassSearcher.getExtensionPointSuffix(service.getSimpleName());
 
 		if (suffix != null) {
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/analysis/AnalysisOptions2Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/analysis/AnalysisOptions2Test.java
index f949d44f1c..7d65a1b245 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/analysis/AnalysisOptions2Test.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/analysis/AnalysisOptions2Test.java
@@ -24,7 +24,6 @@ import java.util.*;
 import javax.swing.JPanel;
 import javax.swing.table.TableModel;
 
-import org.apache.commons.collections4.BidiMap;
 import org.junit.*;
 
 import docking.ActionContext;
@@ -256,8 +255,8 @@ public class AnalysisOptions2Test extends AbstractGhidraHeadedIntegrationTest {
 		Map<String, Set<ClassFileInfo>> extensionPointSuffixToInfoMap =
 			(Map<String, Set<ClassFileInfo>>) getInstanceField("extensionPointSuffixToInfoMap",
 				ClassSearcher.class);
-		BidiMap<ClassFileInfo, Class<?>> loadedCache =
-			(BidiMap<ClassFileInfo, Class<?>>) getInstanceField("loadedCache", ClassSearcher.class);
+		HashMap<ClassFileInfo, Class<?>> loadedCache =
+			(HashMap<ClassFileInfo, Class<?>>) getInstanceField("loadedCache", ClassSearcher.class);
 
 		// remove any traces of previous test runs
 		Set<ClassFileInfo> analyzerSet = extensionPointSuffixToInfoMap.get("Analyzer");