diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/UnionEditorNotifiedTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/UnionEditorNotifiedTest.java
index 6b6df1f6c2..9fc29226aa 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/UnionEditorNotifiedTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/UnionEditorNotifiedTest.java
@@ -119,6 +119,14 @@ public class UnionEditorNotifiedTest extends AbstractUnionEditorTest {
 		});
 
 		waitForSwing();
+
+		// Verify the Close Union Editor? dialog is displayed.
+		Window dialog = waitForWindow("Close Union Editor?");
+		assertNotNull(dialog);
+		pressButtonByText(dialog, "No");
+		dialog.dispose();
+		dialog = null;
+
 		// refUnion* gets removed
 		assertEquals(num - 1, model.getNumComponents());
 		assertTrue(dt18.isEquivalent(getDataType(18)));
diff --git a/Ghidra/Features/Base/src/test/java/ghidra/app/plugin/core/function/editor/StorageEditorModelTest.java b/Ghidra/Features/Base/src/test/java/ghidra/app/plugin/core/function/editor/StorageEditorModelTest.java
index 32c4d2925a..39a4d004cc 100644
--- a/Ghidra/Features/Base/src/test/java/ghidra/app/plugin/core/function/editor/StorageEditorModelTest.java
+++ b/Ghidra/Features/Base/src/test/java/ghidra/app/plugin/core/function/editor/StorageEditorModelTest.java
@@ -109,7 +109,7 @@ public class StorageEditorModelTest extends AbstractGuiTest {
 	@Test
 	public void testSizeCheck() {
 		assertEquals(4, model.getCurrentSize());
-		assertTrue(model.isValid());
+		assertFalse(model.isValid());
 		assertEquals("Warning: Not enough storage space allocated", model.getStatusText());
 		VarnodeInfo varnode = model.getVarnodes().get(0);