diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json
index a848954962..87caaf1206 100644
--- a/packages/query-devtools/package.json
+++ b/packages/query-devtools/package.json
@@ -67,6 +67,7 @@
     "@solid-primitives/keyed": "^1.2.2",
     "@solid-primitives/resize-observer": "^2.0.26",
     "@solid-primitives/storage": "^1.3.11",
+    "@solidjs/testing-library": "^0.8.10",
     "@tanstack/match-sorter-utils": "^8.19.4",
     "@tanstack/query-core": "workspace:*",
     "clsx": "^2.1.1",
diff --git a/packages/query-devtools/test-setup.ts b/packages/query-devtools/test-setup.ts
new file mode 100644
index 0000000000..fb70ad9f20
--- /dev/null
+++ b/packages/query-devtools/test-setup.ts
@@ -0,0 +1,5 @@
+import '@testing-library/jest-dom/vitest'
+import { cleanup } from '@solidjs/testing-library'
+import { afterEach } from 'vitest'
+
+afterEach(() => cleanup())
diff --git a/packages/query-devtools/tsconfig.json b/packages/query-devtools/tsconfig.json
index c9589abaae..7f3c629b17 100644
--- a/packages/query-devtools/tsconfig.json
+++ b/packages/query-devtools/tsconfig.json
@@ -6,6 +6,12 @@
     "jsx": "preserve",
     "jsxImportSource": "solid-js"
   },
-  "include": ["src", "*.config.ts", "*.config.js", "package.json"],
+  "include": [
+    "src",
+    "test-setup.ts",
+    "*.config.ts",
+    "*.config.js",
+    "package.json"
+  ],
   "references": [{ "path": "../query-core" }]
 }
diff --git a/packages/query-devtools/vite.config.ts b/packages/query-devtools/vite.config.ts
index cf53690321..9678f07069 100644
--- a/packages/query-devtools/vite.config.ts
+++ b/packages/query-devtools/vite.config.ts
@@ -29,5 +29,6 @@ export default defineConfig({
     },
     typecheck: { enabled: true },
     restoreMocks: true,
+    setupFiles: ['test-setup.ts'],
   },
 })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a19f7ce4b9..8a8c9a73d6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2730,6 +2730,9 @@ importers:
       '@solid-primitives/storage':
         specifier: ^1.3.11
         version: 1.3.11(solid-js@1.9.12)
+      '@solidjs/testing-library':
+        specifier: ^0.8.10
+        version: 0.8.10(@solidjs/router@0.15.4(solid-js@1.9.12))(solid-js@1.9.12)
       '@tanstack/match-sorter-utils':
         specifier: ^8.19.4
         version: 8.19.4