diff --git a/packages/cli/src/ui/components/AskUserDialog.test.tsx b/packages/cli/src/ui/components/AskUserDialog.test.tsx
index 1bd29241db..392d7f14d9 100644
--- a/packages/cli/src/ui/components/AskUserDialog.test.tsx
+++ b/packages/cli/src/ui/components/AskUserDialog.test.tsx
@@ -268,8 +268,8 @@ describe('AskUserDialog', () => {
             expect(lastFrame()).not.toContain('▼');
           }
           await waitUntilReady();
-          expect(lastFrame()).toMatchSnapshot();
         });
+        expect(lastFrame()).toMatchSnapshot();
       });
     },
   );
@@ -569,8 +569,9 @@ describe('AskUserDialog', () => {
 
     await waitFor(async () => {
       await waitUntilReady();
-      expect(lastFrame()).toMatchSnapshot();
+      expect(lastFrame()).toContain('Review your answers:');
     });
+    expect(lastFrame()).toMatchSnapshot();
 
     writeKey(stdin, '\x1b[D'); // Left arrow back
 
@@ -614,8 +615,9 @@ describe('AskUserDialog', () => {
 
     await waitFor(async () => {
       await waitUntilReady();
-      expect(lastFrame()).toMatchSnapshot();
+      expect(lastFrame()).toContain('Review your answers:');
     });
+    expect(lastFrame()).toMatchSnapshot();
   });
 
   it('submits with unanswered questions when user confirms on Review', async () => {
@@ -1309,8 +1311,9 @@ describe('AskUserDialog', () => {
 
       await waitFor(async () => {
         await waitUntilReady();
-        expect(lastFrame()).toMatchSnapshot();
+        expect(lastFrame()).toContain('Type another language...');
       });
+      expect(lastFrame()).toMatchSnapshot();
     });
 
     it('uses default placeholder when not provided', async () => {
@@ -1343,8 +1346,9 @@ describe('AskUserDialog', () => {
 
       await waitFor(async () => {
         await waitUntilReady();
-        expect(lastFrame()).toMatchSnapshot();
+        expect(lastFrame()).toContain('Enter a custom value');
       });
+      expect(lastFrame()).toMatchSnapshot();
     });
   });
 });
diff --git a/packages/cli/src/ui/components/ExitPlanModeDialog.test.tsx b/packages/cli/src/ui/components/ExitPlanModeDialog.test.tsx
index 2bf1f723a6..cb56f236b4 100644
--- a/packages/cli/src/ui/components/ExitPlanModeDialog.test.tsx
+++ b/packages/cli/src/ui/components/ExitPlanModeDialog.test.tsx
@@ -251,8 +251,9 @@ Implement a comprehensive authentication system with multiple providers.
         }
 
         await waitFor(() => {
-          expect(lastFrame()).toMatchSnapshot();
+          expect(lastFrame()).toContain('Add tests');
         });
+        expect(lastFrame()).toMatchSnapshot();
 
         writeKey(stdin, '\r');
 
@@ -469,8 +470,9 @@ Implement a comprehensive authentication system with multiple providers.
         writeKey(stdin, '\x03'); // Ctrl+C
 
         await waitFor(() => {
-          expect(lastFrame()).toMatchSnapshot();
+          expect(lastFrame()).toContain('Type your feedback...');
         });
+        expect(lastFrame()).toMatchSnapshot();
         expect(onBubbledQuit).not.toHaveBeenCalled();
 
         // Second Ctrl+C to exit (should bubble)