diff --git a/packages/cli/src/test-utils/render.tsx b/packages/cli/src/test-utils/render.tsx
index f6ab5efe16..6e1faca266 100644
--- a/packages/cli/src/test-utils/render.tsx
+++ b/packages/cli/src/test-utils/render.tsx
@@ -460,7 +460,11 @@ export const render = async (
   instances.push(instance);
 
   while (stdout.renderCount === 0 || stdout.lastFrame({ allowEmpty: true }) === '') {
-    await new Promise((resolve) => setTimeout(resolve, 10));
+    if (vi.isFakeTimers()) {
+      await vi.advanceTimersByTimeAsync(10);
+    } else {
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    }
   }
 
   return {
diff --git a/packages/cli/src/ui/components/SettingsDialog.test.tsx b/packages/cli/src/ui/components/SettingsDialog.test.tsx
index 9ac5f10316..6f6b1c1212 100644
--- a/packages/cli/src/ui/components/SettingsDialog.test.tsx
+++ b/packages/cli/src/ui/components/SettingsDialog.test.tsx
@@ -253,6 +253,7 @@ const renderDialog = async (
 
 describe.sequential('SettingsDialog', () => {
   beforeEach(() => {
+    vi.useFakeTimers();
     vi.clearAllMocks();
     vi.spyOn(
       terminalCapabilityManager,
@@ -264,6 +265,7 @@ describe.sequential('SettingsDialog', () => {
     TEST_ONLY.clearFlattenedSchema();
     vi.clearAllMocks();
     vi.resetAllMocks();
+    vi.useRealTimers();
   });
 
   describe.sequential('Initial Rendering', () => {