diff --git a/webview-ui/src/__tests__/ContextWindowProgress.spec.tsx b/webview-ui/src/__tests__/ContextWindowProgress.spec.tsx
index 3c30e15bc6..3236510911 100644
--- a/webview-ui/src/__tests__/ContextWindowProgress.spec.tsx
+++ b/webview-ui/src/__tests__/ContextWindowProgress.spec.tsx
@@ -1,7 +1,6 @@
 // npm run test ContextWindowProgress.spec.tsx
 
 import { render, screen, fireEvent } from "@/utils/test-utils"
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
 
 import TaskHeader from "@src/components/chat/TaskHeader"
 
@@ -42,8 +41,6 @@ vi.mock("@src/components/ui/hooks/useSelectedModel", () => ({
 }))
 
 describe("ContextWindowProgress", () => {
-	const queryClient = new QueryClient()
-
 	// Helper function to render just the ContextWindowProgress part through TaskHeader
 	const renderComponent = (props: Record<string, any>) => {
 		// Create a simple mock of the task that avoids importing the actual types
@@ -58,11 +55,7 @@ describe("ContextWindowProgress", () => {
 			handleCondenseContext: vi.fn((_taskId: string) => {}),
 		}
 
-		return render(
-			<QueryClientProvider client={queryClient}>
-				<TaskHeader {...defaultProps} {...props} />
-			</QueryClientProvider>,
-		)
+		return render(<TaskHeader {...defaultProps} {...props} />)
 	}
 
 	beforeEach(() => vi.clearAllMocks())
diff --git a/webview-ui/src/components/chat/__tests__/ChatRow.subtask-links.spec.tsx b/webview-ui/src/components/chat/__tests__/ChatRow.subtask-links.spec.tsx
index 3a1971ec68..3e1e3d047a 100644
--- a/webview-ui/src/components/chat/__tests__/ChatRow.subtask-links.spec.tsx
+++ b/webview-ui/src/components/chat/__tests__/ChatRow.subtask-links.spec.tsx
@@ -1,6 +1,5 @@
 import React from "react"
 import { render, screen, fireEvent } from "@/utils/test-utils"
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
 import { ChatRowContent } from "../ChatRow"
 import type { HistoryItem, ClineMessage } from "@roo-code/types"
 
@@ -50,26 +49,22 @@ vi.mock("@src/components/ui/hooks/useSelectedModel", () => ({
 	useSelectedModel: () => ({ info: { supportsImages: true } }),
 }))
 
-const queryClient = new QueryClient()
-
 function renderChatRow(message: any, currentTaskItem?: Partial<HistoryItem>, clineMessages?: ClineMessage[]) {
 	mockCurrentTaskItem = currentTaskItem
 	mockClineMessages = clineMessages || [message]
 
 	return render(
-		<QueryClientProvider client={queryClient}>
-			<ChatRowContent
-				message={message}
-				isExpanded={false}
-				isLast={false}
-				isStreaming={false}
-				onToggleExpand={() => {}}
-				onSuggestionClick={() => {}}
-				onBatchFileResponse={() => {}}
-				onFollowUpUnmount={() => {}}
-				isFollowUpAnswered={false}
-			/>
-		</QueryClientProvider>,
+		<ChatRowContent
+			message={message}
+			isExpanded={false}
+			isLast={false}
+			isStreaming={false}
+			onToggleExpand={() => {}}
+			onSuggestionClick={() => {}}
+			onBatchFileResponse={() => {}}
+			onFollowUpUnmount={() => {}}
+			isFollowUpAnswered={false}
+		/>,
 	)
 }
 
diff --git a/webview-ui/src/utils/test-utils.tsx b/webview-ui/src/utils/test-utils.tsx
index 5a6f187ab5..c3b7bda301 100644
--- a/webview-ui/src/utils/test-utils.tsx
+++ b/webview-ui/src/utils/test-utils.tsx
@@ -9,16 +9,18 @@ interface AllTheProvidersProps {
 	children: React.ReactNode
 }
 
-const AllTheProviders = ({ children }: AllTheProvidersProps) => {
-	// Create a new QueryClient for each test to avoid state leakage
-	const queryClient = new QueryClient({
+export const createTestQueryClient = () =>
+	new QueryClient({
 		defaultOptions: {
 			queries: {
-				retry: false, // Disable retries in tests
+				retry: false,
 			},
 		},
 	})
 
+const AllTheProviders = ({ children }: AllTheProvidersProps) => {
+	const queryClient = createTestQueryClient()
+
 	return (
 		<QueryClientProvider client={queryClient}>
 			<TooltipProvider delayDuration={STANDARD_TOOLTIP_DELAY}>{children}</TooltipProvider>