diff --git a/packages/db/src/client.test.ts b/packages/db/src/client.test.ts
index 524ea20a894..a87c2bc1fe9 100644
--- a/packages/db/src/client.test.ts
+++ b/packages/db/src/client.test.ts
@@ -296,8 +296,9 @@ describeEmbeddedPostgres("merged Muse migration histories", () => {
       const beforeRows = await retainedRows?.();
       const state = await inspectMigrations(connectionString);
       expect(state.status).toBe("needsMigrations");
-      const expectedPending = baseline === "master0346" ? [...canonicalMasterTail, ...mergedMuseTail].map(entry => entry.file)
-        : baseline === "muse0348" ? [...mergedMasterTail, ...canonicalMasterTail, ...mergedMuseTail].map(entry => entry.file)
+      const laterMigrations = journal.entries.filter(entry => entry.idx > 353).map(entry => `${entry.tag}.sql`);
+      const expectedPending = baseline === "master0346" ? [...[...canonicalMasterTail, ...mergedMuseTail].map(entry => entry.file), ...laterMigrations]
+        : baseline === "muse0348" ? [...[...mergedMasterTail, ...canonicalMasterTail, ...mergedMuseTail].map(entry => entry.file), ...laterMigrations]
         : journal.entries.map(entry => `${entry.tag}.sql`);
       expect(state).toMatchObject({ pendingMigrations: expectedPending });
       if (baseline === "muse0348") {
diff --git a/server/src/__tests__/legacy-workspace-restore-recovery.test.ts b/server/src/__tests__/legacy-workspace-restore-recovery.test.ts
index 6278de98192..493304a72fe 100644
--- a/server/src/__tests__/legacy-workspace-restore-recovery.test.ts
+++ b/server/src/__tests__/legacy-workspace-restore-recovery.test.ts
@@ -173,7 +173,11 @@ const support = externalTestDatabaseUrl ? { supported: true } : await getEmbedde
       if (scenario === "invalid_time") dedicated.confirmedAt = termination.confirmedAt = "not-a-time";
       if (scenario === "before_acquisition") dedicated.confirmedAt = termination.confirmedAt = new Date(stopped.acquiredAt.getTime() - 1).toISOString();
       if (scenario === "after_release") dedicated.confirmedAt = termination.confirmedAt = new Date(stopped.releasedAt!.getTime() + 1).toISOString();
-      if (scenario === "unequal_confirmation") dedicated.confirmedAt = new Date(stopped.releasedAt!.getTime() - 1).toISOString();
+      if (scenario === "unequal_confirmation") {
+        const unequalConfirmation = new Date(Date.parse(String(termination.confirmedAt)) + 1);
+        dedicated.confirmedAt = unequalConfirmation.toISOString();
+        await db.update(environmentLeases).set({ releasedAt: unequalConfirmation }).where(eq(environmentLeases.id, stopped.id));
+      }
       if (scenario === "pending_intent") metadata.sandboxStopAndRetain = {};
       if (scenario === "cleanup_in_flight") metadata.pendingCleanupInFlight = true;
       const [invalid] = await db.update(environmentLeases).set({ metadata,