diff --git a/Ghidra/Framework/Docking/src/test/java/docking/widgets/tab/GTabPanelTest.java b/Ghidra/Framework/Docking/src/test/java/docking/widgets/tab/GTabPanelTest.java
index 79f4745967..e1916cb8e9 100644
--- a/Ghidra/Framework/Docking/src/test/java/docking/widgets/tab/GTabPanelTest.java
+++ b/Ghidra/Framework/Docking/src/test/java/docking/widgets/tab/GTabPanelTest.java
@@ -202,19 +202,19 @@ public class GTabPanelTest extends AbstractDockingTest {
 		removeTab("One");
 		removeTab("Two");
 		removeTab("Three Three Three");
-		assertEquals("Test Tab Panel: No Tabs", gTabPanel.getAccessibleName());
+		assertEquals("Test Tab Panel: No Tabs", getAccessibleName());
 	}
 
 	@Test
 	public void testGetAccessibleNameNoTabSelected() {
 		setSelectedValue(null);
-		assertEquals("Test Tab Panel: No Selected Tab", gTabPanel.getAccessibleName());
+		assertEquals("Test Tab Panel: No Selected Tab", getAccessibleName());
 	}
 
 	@Test
 	public void testGetAccessiblNameTabSelected() {
 		setSelectedValue("Two");
-		assertEquals("Test Tab Panel: Two selected", gTabPanel.getAccessibleName());
+		assertEquals("Test Tab Panel: Two selected", getAccessibleName());
 	}
 
 	@Test
@@ -222,7 +222,7 @@ public class GTabPanelTest extends AbstractDockingTest {
 		setSelectedValue(null);
 		highlightNextTab(true);
 		assertEquals("Test Tab Panel: No Selected Tab: One highlighted",
-			gTabPanel.getAccessibleName());
+			getAccessibleName());
 	}
 
 	@Test
@@ -230,7 +230,7 @@ public class GTabPanelTest extends AbstractDockingTest {
 		setSelectedValue("One");
 		highlightNextTab(true);
 		assertEquals("Test Tab Panel: One selected: Two highlighted",
-			gTabPanel.getAccessibleName());
+			getAccessibleName());
 	}
 
 	@Test
@@ -244,6 +244,10 @@ public class GTabPanelTest extends AbstractDockingTest {
 		assertEquals("One", getValue(2));
 	}
 
+	private String getAccessibleName() {
+		return runSwing(() -> gTabPanel.getAccessibleName());
+	}
+
 	private void moveTab(String value, int newIndex) {
 		runSwing(() -> gTabPanel.moveTab(value, newIndex));
 	}
diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/plugin/compare/CompareFunctionsDecompilerViewTest.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/plugin/compare/CompareFunctionsDecompilerViewTest.java
index 34bf788af3..ce5ac95dad 100644
--- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/plugin/compare/CompareFunctionsDecompilerViewTest.java
+++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/plugin/compare/CompareFunctionsDecompilerViewTest.java
@@ -81,7 +81,7 @@ public class CompareFunctionsDecompilerViewTest extends AbstractGhidraHeadedInte
 			(DecompilerCodeComparisonView) provider
 					.getView(DecompilerCodeComparisonView.NAME);
 
-		waitForDecompiler(comparisonProvider);
+		waitForDecompiler(provider, comparisonProvider);
 		assertHasLines(comparisonProvider.getLeftPanel(), 28);
 		assertHasLines(comparisonProvider.getRightPanel(), 22);
 	}
@@ -102,9 +102,13 @@ public class CompareFunctionsDecompilerViewTest extends AbstractGhidraHeadedInte
 		assertEquals(lineCount, panel.getDecompilerPanel().getLines().size());
 	}
 
-	private void waitForDecompiler(DecompilerCodeComparisonView panel) {
+	private void waitForDecompiler(FunctionComparisonProvider provider,
+			DecompilerCodeComparisonView view) {
+
+		runSwing(() -> provider.setActiveView(view.getName()));
 		waitForSwing();
-		waitForCondition(() -> !panel.isBusy());
+
+		waitForCondition(() -> !view.isBusy());
 		waitForSwing();
 	}