diff --git a/packages/cli/src/ui/components/hooks/HooksManagementDialog.test.tsx b/packages/cli/src/ui/components/hooks/HooksManagementDialog.test.tsx
index 3e1d103db..722cad5f9 100644
--- a/packages/cli/src/ui/components/hooks/HooksManagementDialog.test.tsx
+++ b/packages/cli/src/ui/components/hooks/HooksManagementDialog.test.tsx
@@ -197,28 +197,6 @@ describe('HooksManagementDialog', () => {
       expect(mockOnClose).toHaveBeenCalledTimes(1);
     });
 
-    it('should navigate up and down with arrow keys', async () => {
-      const { lastFrame, unmount } = renderWithProviders(
-        <HooksManagementDialog onClose={mockOnClose} />,
-      );
-
-      await new Promise((resolve) => setTimeout(resolve, 100));
-
-      // Initial state - first item selected
-      let output = lastFrame();
-      expect(output).toContain('❯');
-
-      // Press down - should move selection
-      keypressHandler!(createKey('down'));
-      output = lastFrame();
-
-      // Press up - should move back
-      keypressHandler!(createKey('up'));
-      output = lastFrame();
-
-      unmount();
-    });
-
     it('should not go above first item when pressing up', async () => {
       const { unmount } = renderWithProviders(
         <HooksManagementDialog onClose={mockOnClose} />,
diff --git a/packages/core/src/core/client.test.ts b/packages/core/src/core/client.test.ts
index 041cdfeb5..19dd88bcf 100644
--- a/packages/core/src/core/client.test.ts
+++ b/packages/core/src/core/client.test.ts
@@ -2415,11 +2415,11 @@ Other open files:
           request: vi.fn(),
           response: vi.fn(),
         };
-        vi.spyOn(client['config'], 'getDisableAllHooks').mockReturnValue(false);
-        vi.spyOn(client['config'], 'getMessageBus').mockReturnValue(
+        vi.mocked(mockConfig.getDisableAllHooks).mockReturnValue(false);
+        vi.mocked(mockConfig.getMessageBus).mockReturnValue(
           mockMessageBus as unknown as ReturnType<Config['getMessageBus']>,
         );
-        vi.spyOn(client['config'], 'hasHooksForEvent').mockReturnValue(false);
+        vi.mocked(mockConfig.hasHooksForEvent).mockReturnValue(false);
 
         const stream = client.sendMessageStream(
           [{ text: 'Hi' }],
@@ -2439,11 +2439,11 @@ Other open files:
           request: vi.fn(),
           response: vi.fn(),
         };
-        vi.spyOn(client['config'], 'getDisableAllHooks').mockReturnValue(false);
-        vi.spyOn(client['config'], 'getMessageBus').mockReturnValue(
+        vi.mocked(mockConfig.getDisableAllHooks).mockReturnValue(false);
+        vi.mocked(mockConfig.getMessageBus).mockReturnValue(
           mockMessageBus as unknown as ReturnType<Config['getMessageBus']>,
         );
-        vi.spyOn(client['config'], 'hasHooksForEvent').mockReturnValue(false);
+        vi.mocked(mockConfig.hasHooksForEvent).mockReturnValue(false);
 
         const stream = client.sendMessageStream(
           [{ text: 'Hi' }],
@@ -2463,11 +2463,11 @@ Other open files:
           request: vi.fn().mockResolvedValue({ modifiedPrompt: undefined }),
           response: vi.fn(),
         };
-        vi.spyOn(client['config'], 'getDisableAllHooks').mockReturnValue(false);
-        vi.spyOn(client['config'], 'getMessageBus').mockReturnValue(
+        vi.mocked(mockConfig.getDisableAllHooks).mockReturnValue(false);
+        vi.mocked(mockConfig.getMessageBus).mockReturnValue(
           mockMessageBus as unknown as ReturnType<Config['getMessageBus']>,
         );
-        vi.spyOn(client['config'], 'hasHooksForEvent').mockImplementation(
+        vi.mocked(mockConfig.hasHooksForEvent).mockImplementation(
           (event: string) => event === 'UserPromptSubmit',
         );