diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/analysis/FindPossibleReferencesPluginTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/analysis/FindPossibleReferencesPluginTest.java
index 7c9d453c91..ce543063ad 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/analysis/FindPossibleReferencesPluginTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/analysis/FindPossibleReferencesPluginTest.java
@@ -86,7 +86,7 @@ public class FindPossibleReferencesPluginTest extends AbstractGhidraHeadedIntegr
 	@Test
     public void testSelection() throws Exception {
 		openProgram(build32BitX86());
-		select("010010df", "010010f0");
+		select("010010e0", "010010f0");
 		doSearch("01001000");// When you have a selection, it does NOT search for the single
 								// address in the selection, instead, it bizarrely searches the
 								// entire program for all the addresses in the selection.
@@ -106,11 +106,11 @@ public class FindPossibleReferencesPluginTest extends AbstractGhidraHeadedIntegr
     public void testRestoreSelection() throws Exception {
 		openProgram(build32BitX86());
 
-		select("010010df", "010010f0");
+		select("010010e0", "010010f0");
 		doSearch("01003ac2");
 
 		assertEquals(1, table.getRowCount());
-		assertTrue(provider.getTitle().contains("Selection @ 010010df"));
+		assertTrue(provider.getTitle().contains("Selection @ 010010e0"));
 
 		clearSelection();
 
@@ -122,7 +122,7 @@ public class FindPossibleReferencesPluginTest extends AbstractGhidraHeadedIntegr
 		assertNotNull(restoreSelectionAction);
 		performAction(restoreSelectionAction, true);
 
-		assertEquals(new ProgramSelection(addr("10010df"), addr("10010f0")),
+		assertEquals(new ProgramSelection(addr("10010e0"), addr("10010f0")),
 			TestUtils.invokeInstanceMethod("getCurrentSelection", codeBrowser));
 	}
 
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPluginTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPluginTest.java
index e2b95ed16c..9980ae97e0 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPluginTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPluginTest.java
@@ -174,13 +174,13 @@ public class NextPrevCodeUnitPluginTest extends AbstractGhidraHeadedIntegrationT
 		showTool(tool);
 		assertEquals(addr("0x1001000"), cb.getCurrentAddress());
 		performAction(nextData, cb.getProvider(), true);
-		assertEquals(addr("0x10010e0"), cb.getCurrentAddress());
+		assertEquals(addr("0x1001058"), cb.getCurrentAddress());
 		performAction(nextData, cb.getProvider(), true);
-		assertEquals(addr("0x1001128"), cb.getCurrentAddress());
+		assertEquals(addr("0x1001080"), cb.getCurrentAddress());
 
 		performAction(direction, cb.getProvider(), true);
 		performAction(nextData, cb.getProvider(), true);
-		assertEquals(addr("0x10010e0"), cb.getCurrentAddress());
+		assertEquals(addr("0x1001058"), cb.getCurrentAddress());
 		performAction(nextData, cb.getProvider(), true);
 
 	}
@@ -193,15 +193,15 @@ public class NextPrevCodeUnitPluginTest extends AbstractGhidraHeadedIntegrationT
 		performAction(nextUndef, cb.getProvider(), true);
 		assertEquals(addr("0x100100c"), cb.getCurrentAddress());
 		performAction(nextUndef, cb.getProvider(), true);
-		assertEquals(addr("0x10010e4"), cb.getCurrentAddress());
+		assertEquals(addr("0x100105c"), cb.getCurrentAddress());
 
 		performAction(direction, cb.getProvider(), true);
 		performAction(nextUndef, cb.getProvider(), true);
-		assertEquals(addr("0x10010df"), cb.getCurrentAddress());
+		assertEquals(addr("0x1001057"), cb.getCurrentAddress());
 		performAction(nextUndef, cb.getProvider(), true);
 
 		// no more undefined data, this is the last range
-		assertEquals(addr("0x10010df"), cb.getCurrentAddress());
+		assertEquals(addr("0x1001057"), cb.getCurrentAddress());
 	}
 
 	@Test