diff --git a/packages/eslint-plugin-query/src/__tests__/configs.test.ts b/packages/eslint-plugin-query/src/__tests__/configs.test.ts
index 38acdd1246..dd543953ab 100644
--- a/packages/eslint-plugin-query/src/__tests__/configs.test.ts
+++ b/packages/eslint-plugin-query/src/__tests__/configs.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest'
 import { configs } from '../configs'
 
 describe('configs', () => {
diff --git a/packages/eslint-plugin-query/tsconfig.json b/packages/eslint-plugin-query/tsconfig.json
index c39870cad9..eb76a7218b 100644
--- a/packages/eslint-plugin-query/tsconfig.json
+++ b/packages/eslint-plugin-query/tsconfig.json
@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["vitest/globals"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/query-async-storage-persister/src/__tests__/asyncThrottle.test.ts b/packages/query-async-storage-persister/src/__tests__/asyncThrottle.test.ts
index a1cbdb8c54..ab6b33267c 100644
--- a/packages/query-async-storage-persister/src/__tests__/asyncThrottle.test.ts
+++ b/packages/query-async-storage-persister/src/__tests__/asyncThrottle.test.ts
@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { describe, expect, test, vi } from 'vitest'
 import { asyncThrottle } from '../asyncThrottle'
 import { sleep as delay } from './utils'
 
diff --git a/packages/query-async-storage-persister/tsconfig.json b/packages/query-async-storage-persister/tsconfig.json
index c39870cad9..eb76a7218b 100644
--- a/packages/query-async-storage-persister/tsconfig.json
+++ b/packages/query-async-storage-persister/tsconfig.json
@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["vitest/globals"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/query-async-storage-persister/vitest.config.ts b/packages/query-async-storage-persister/vitest.config.ts
index eda336ceab..67aa2ae002 100644
--- a/packages/query-async-storage-persister/vitest.config.ts
+++ b/packages/query-async-storage-persister/vitest.config.ts
@@ -5,7 +5,6 @@ export default defineConfig({
     name: 'query-async-storage-persister',
     dir: './src',
     watch: false,
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })
diff --git a/packages/query-core/src/tests/focusManager.test.tsx b/packages/query-core/src/tests/focusManager.test.tsx
index 3bcf6ce760..f070a12b6c 100644
--- a/packages/query-core/src/tests/focusManager.test.tsx
+++ b/packages/query-core/src/tests/focusManager.test.tsx
@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { beforeEach, describe, expect, it, test, vi } from 'vitest'
 import { sleep } from '../utils'
 import { FocusManager } from '../focusManager'
 import { setIsServer } from './utils'
diff --git a/packages/query-core/src/tests/hydration.test.tsx b/packages/query-core/src/tests/hydration.test.tsx
index 1a5dbf49fc..75cbbaca1f 100644
--- a/packages/query-core/src/tests/hydration.test.tsx
+++ b/packages/query-core/src/tests/hydration.test.tsx
@@ -1,4 +1,4 @@
-import { expect, vi } from 'vitest'
+import { describe, expect, test, vi } from 'vitest'
 import { QueryCache } from '../queryCache'
 import { dehydrate, hydrate } from '../hydration'
 import { MutationCache } from '../mutationCache'
diff --git a/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx b/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx
index 18baa2120e..e6bd81d3e4 100644
--- a/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx
+++ b/packages/query-core/src/tests/infiniteQueryBehavior.test.tsx
@@ -1,5 +1,5 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
 import { CancelledError, InfiniteQueryObserver } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 import type { InfiniteQueryObserverResult, QueryCache, QueryClient } from '..'
diff --git a/packages/query-core/src/tests/infiniteQueryObserver.test.tsx b/packages/query-core/src/tests/infiniteQueryObserver.test.tsx
index e5e42a35c1..f812a5b65d 100644
--- a/packages/query-core/src/tests/infiniteQueryObserver.test.tsx
+++ b/packages/query-core/src/tests/infiniteQueryObserver.test.tsx
@@ -1,4 +1,4 @@
-import { expect, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { InfiniteQueryObserver } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 import type { QueryClient } from '..'
diff --git a/packages/query-core/src/tests/mutationCache.test.tsx b/packages/query-core/src/tests/mutationCache.test.tsx
index 2e14e5a5f7..f93f06c51e 100644
--- a/packages/query-core/src/tests/mutationCache.test.tsx
+++ b/packages/query-core/src/tests/mutationCache.test.tsx
@@ -1,5 +1,5 @@
+import { describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
 import { MutationCache, MutationObserver } from '..'
 import { createQueryClient, executeMutation, queryKey, sleep } from './utils'
 
diff --git a/packages/query-core/src/tests/mutationObserver.test.tsx b/packages/query-core/src/tests/mutationObserver.test.tsx
index 4c1daa0711..087e55becf 100644
--- a/packages/query-core/src/tests/mutationObserver.test.tsx
+++ b/packages/query-core/src/tests/mutationObserver.test.tsx
@@ -1,5 +1,5 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
 import { MutationObserver } from '..'
 import { createQueryClient, sleep } from './utils'
 import type { QueryClient } from '..'
diff --git a/packages/query-core/src/tests/mutations.test.tsx b/packages/query-core/src/tests/mutations.test.tsx
index e1902a688d..9a93828b35 100644
--- a/packages/query-core/src/tests/mutations.test.tsx
+++ b/packages/query-core/src/tests/mutations.test.tsx
@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
 import { MutationObserver } from '../mutationObserver'
 import { createQueryClient, executeMutation, queryKey, sleep } from './utils'
diff --git a/packages/query-core/src/tests/notifyManager.test.tsx b/packages/query-core/src/tests/notifyManager.test.tsx
index cf44193c6b..1265f1cfde 100644
--- a/packages/query-core/src/tests/notifyManager.test.tsx
+++ b/packages/query-core/src/tests/notifyManager.test.tsx
@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import { createNotifyManager } from '../notifyManager'
 import { sleep } from './utils'
 
diff --git a/packages/query-core/src/tests/onlineManager.test.tsx b/packages/query-core/src/tests/onlineManager.test.tsx
index 88d3c6b33a..74838f2519 100644
--- a/packages/query-core/src/tests/onlineManager.test.tsx
+++ b/packages/query-core/src/tests/onlineManager.test.tsx
@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
 import { OnlineManager } from '../onlineManager'
 import { setIsServer, sleep } from './utils'
 
diff --git a/packages/query-core/src/tests/queriesObserver.test.tsx b/packages/query-core/src/tests/queriesObserver.test.tsx
index a05bec90f2..05b64c4b4e 100644
--- a/packages/query-core/src/tests/queriesObserver.test.tsx
+++ b/packages/query-core/src/tests/queriesObserver.test.tsx
@@ -1,5 +1,5 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
 import { QueriesObserver } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 import type { QueryClient, QueryObserverResult } from '..'
diff --git a/packages/query-core/src/tests/query.test.tsx b/packages/query-core/src/tests/query.test.tsx
index a18b8d435c..632bc8636f 100644
--- a/packages/query-core/src/tests/query.test.tsx
+++ b/packages/query-core/src/tests/query.test.tsx
@@ -1,5 +1,5 @@
+import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
 import { QueryObserver, isCancelledError, onlineManager } from '..'
 import {
   createQueryClient,
diff --git a/packages/query-core/src/tests/queryCache.test.tsx b/packages/query-core/src/tests/queryCache.test.tsx
index c8c6d76350..adbc35abd0 100644
--- a/packages/query-core/src/tests/queryCache.test.tsx
+++ b/packages/query-core/src/tests/queryCache.test.tsx
@@ -1,5 +1,5 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
 import { QueryCache, QueryClient, QueryObserver } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 
diff --git a/packages/query-core/src/tests/queryClient.test.tsx b/packages/query-core/src/tests/queryClient.test.tsx
index 458b4c16d9..a00390c4ca 100644
--- a/packages/query-core/src/tests/queryClient.test.tsx
+++ b/packages/query-core/src/tests/queryClient.test.tsx
@@ -1,5 +1,5 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import '@testing-library/jest-dom/vitest'
 
 import {
   MutationObserver,
diff --git a/packages/query-core/src/tests/queryClient.types.test.tsx b/packages/query-core/src/tests/queryClient.types.test.tsx
index 78c3cedace..b9990a2acf 100644
--- a/packages/query-core/src/tests/queryClient.types.test.tsx
+++ b/packages/query-core/src/tests/queryClient.types.test.tsx
@@ -1,3 +1,4 @@
+import { describe, it } from 'vitest'
 import { QueryClient } from '../queryClient'
 import { doNotExecute } from './utils'
 import type { Equal, Expect } from './utils'
diff --git a/packages/query-core/src/tests/queryObserver.test.tsx b/packages/query-core/src/tests/queryObserver.test.tsx
index 58ede809b5..c1b65659fb 100644
--- a/packages/query-core/src/tests/queryObserver.test.tsx
+++ b/packages/query-core/src/tests/queryObserver.test.tsx
@@ -1,4 +1,12 @@
-import { vi } from 'vitest'
+import {
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  expectTypeOf,
+  test,
+  vi,
+} from 'vitest'
 import { QueryObserver, focusManager } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 import type { QueryClient, QueryObserverResult } from '..'
diff --git a/packages/query-core/src/tests/utils.test.tsx b/packages/query-core/src/tests/utils.test.tsx
index 296efd2c4b..1832442b45 100644
--- a/packages/query-core/src/tests/utils.test.tsx
+++ b/packages/query-core/src/tests/utils.test.tsx
@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import {
   addToEnd,
   addToStart,
diff --git a/packages/query-core/src/tests/utils.ts b/packages/query-core/src/tests/utils.ts
index 3d9c6dbf48..4d5807d9a8 100644
--- a/packages/query-core/src/tests/utils.ts
+++ b/packages/query-core/src/tests/utils.ts
@@ -1,5 +1,5 @@
-import { act } from '@testing-library/react'
 import { vi } from 'vitest'
+import { act } from '@testing-library/react'
 import { QueryClient, onlineManager } from '..'
 import * as utils from '../utils'
 import type { SpyInstance } from 'vitest'
diff --git a/packages/query-core/tsconfig.json b/packages/query-core/tsconfig.json
index c39870cad9..eb76a7218b 100644
--- a/packages/query-core/tsconfig.json
+++ b/packages/query-core/tsconfig.json
@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["vitest/globals"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/query-core/vitest.config.ts b/packages/query-core/vitest.config.ts
index fb573861c0..d2defdca4d 100644
--- a/packages/query-core/vitest.config.ts
+++ b/packages/query-core/vitest.config.ts
@@ -6,7 +6,6 @@ export default defineConfig({
     dir: './src',
     watch: false,
     environment: 'jsdom',
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })
diff --git a/packages/query-devtools/src/__tests__/devtools.test.tsx b/packages/query-devtools/src/__tests__/devtools.test.tsx
index 56317afee0..c6fdd8d8ef 100644
--- a/packages/query-devtools/src/__tests__/devtools.test.tsx
+++ b/packages/query-devtools/src/__tests__/devtools.test.tsx
@@ -1,3 +1,5 @@
+import { describe, expect, it } from 'vitest'
+
 describe('ReactQueryDevtools', () => {
   it('should be able to open and close devtools', async () => {
     expect(1).toBe(1)
diff --git a/packages/query-devtools/src/__tests__/utils.test.ts b/packages/query-devtools/src/__tests__/utils.test.ts
index 34499a32c2..e61a456ba5 100644
--- a/packages/query-devtools/src/__tests__/utils.test.ts
+++ b/packages/query-devtools/src/__tests__/utils.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest'
 import { deleteNestedDataByPath, updateNestedDataByPath } from '../utils'
 
 describe('Utils tests', () => {
diff --git a/packages/query-devtools/tsconfig.json b/packages/query-devtools/tsconfig.json
index 8e3ee045d8..4f9ce12104 100644
--- a/packages/query-devtools/tsconfig.json
+++ b/packages/query-devtools/tsconfig.json
@@ -2,8 +2,13 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "types": ["vitest/globals"]
+    "jsxImportSource": "solid-js"
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/query-devtools/vitest.config.ts b/packages/query-devtools/vitest.config.ts
index 37d8f890d2..c312319d55 100644
--- a/packages/query-devtools/vitest.config.ts
+++ b/packages/query-devtools/vitest.config.ts
@@ -6,9 +6,7 @@ export default defineConfig({
     name: 'query-devtools',
     dir: './src',
     watch: false,
-    setupFiles: [],
     environment: 'jsdom',
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
   plugins: [solid()],
diff --git a/packages/query-persist-client-core/src/__tests__/createPersister.test.ts b/packages/query-persist-client-core/src/__tests__/createPersister.test.ts
index c73e817f1a..5bee36c0bb 100644
--- a/packages/query-persist-client-core/src/__tests__/createPersister.test.ts
+++ b/packages/query-persist-client-core/src/__tests__/createPersister.test.ts
@@ -1,5 +1,5 @@
+import { describe, expect, test, vi } from 'vitest'
 import { Query, QueryCache, hashKey } from '@tanstack/query-core'
-import { vi } from 'vitest'
 import {
   PERSISTER_KEY_PREFIX,
   experimental_createPersister,
diff --git a/packages/query-persist-client-core/src/__tests__/persist.test.ts b/packages/query-persist-client-core/src/__tests__/persist.test.ts
index 026de66bb3..fb5037bba8 100644
--- a/packages/query-persist-client-core/src/__tests__/persist.test.ts
+++ b/packages/query-persist-client-core/src/__tests__/persist.test.ts
@@ -1,5 +1,5 @@
+import { describe, expect, test, vi } from 'vitest'
 import { QueriesObserver } from '@tanstack/query-core'
-import { vi } from 'vitest'
 import { persistQueryClientSubscribe } from '../persist'
 import {
   createMockPersister,
diff --git a/packages/query-persist-client-core/src/__tests__/utils.ts b/packages/query-persist-client-core/src/__tests__/utils.ts
index 000e0d77ef..9d8d6d4852 100644
--- a/packages/query-persist-client-core/src/__tests__/utils.ts
+++ b/packages/query-persist-client-core/src/__tests__/utils.ts
@@ -1,5 +1,5 @@
-import { QueryClient } from '@tanstack/query-core'
 import { vi } from 'vitest'
+import { QueryClient } from '@tanstack/query-core'
 import type { QueryClientConfig } from '@tanstack/query-core'
 import type { PersistedClient, Persister } from '../persist'
 
diff --git a/packages/query-persist-client-core/tsconfig.json b/packages/query-persist-client-core/tsconfig.json
index c39870cad9..eb76a7218b 100644
--- a/packages/query-persist-client-core/tsconfig.json
+++ b/packages/query-persist-client-core/tsconfig.json
@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["vitest/globals"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/query-persist-client-core/vitest.config.ts b/packages/query-persist-client-core/vitest.config.ts
index c37bd3b146..dc7e6879da 100644
--- a/packages/query-persist-client-core/vitest.config.ts
+++ b/packages/query-persist-client-core/vitest.config.ts
@@ -5,7 +5,6 @@ export default defineConfig({
     name: 'query-persist-client-core',
     dir: './src',
     watch: false,
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })
diff --git a/packages/query-sync-storage-persister/src/__tests__/storageIsFull.test.ts b/packages/query-sync-storage-persister/src/__tests__/storageIsFull.test.ts
index 07744e27f1..9d50b6f48b 100644
--- a/packages/query-sync-storage-persister/src/__tests__/storageIsFull.test.ts
+++ b/packages/query-sync-storage-persister/src/__tests__/storageIsFull.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, test } from 'vitest'
 import {
   MutationCache,
   QueryCache,
diff --git a/packages/query-sync-storage-persister/tsconfig.json b/packages/query-sync-storage-persister/tsconfig.json
index c39870cad9..eb76a7218b 100644
--- a/packages/query-sync-storage-persister/tsconfig.json
+++ b/packages/query-sync-storage-persister/tsconfig.json
@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["vitest/globals"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/query-sync-storage-persister/vitest.config.ts b/packages/query-sync-storage-persister/vitest.config.ts
index 221cf1e34e..19e725d51a 100644
--- a/packages/query-sync-storage-persister/vitest.config.ts
+++ b/packages/query-sync-storage-persister/vitest.config.ts
@@ -5,7 +5,6 @@ export default defineConfig({
     name: 'query-sync-storage-persister',
     dir: './src',
     watch: false,
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })
diff --git a/packages/react-query-devtools/src/__tests__/devtools.test.tsx b/packages/react-query-devtools/src/__tests__/devtools.test.tsx
index 56317afee0..c6fdd8d8ef 100644
--- a/packages/react-query-devtools/src/__tests__/devtools.test.tsx
+++ b/packages/react-query-devtools/src/__tests__/devtools.test.tsx
@@ -1,3 +1,5 @@
+import { describe, expect, it } from 'vitest'
+
 describe('ReactQueryDevtools', () => {
   it('should be able to open and close devtools', async () => {
     expect(1).toBe(1)
diff --git a/packages/react-query-devtools/test-setup.ts b/packages/react-query-devtools/test-setup.ts
index e184eb4e20..8331ed6615 100644
--- a/packages/react-query-devtools/test-setup.ts
+++ b/packages/react-query-devtools/test-setup.ts
@@ -1,6 +1,11 @@
-import { act } from '@testing-library/react'
+import '@testing-library/jest-dom/vitest'
+import { act, cleanup } from '@testing-library/react'
+import { afterEach } from 'vitest'
 import { notifyManager } from '@tanstack/react-query'
 
+// https://testing-library.com/docs/react-testing-library/api#cleanup
+afterEach(() => cleanup())
+
 // Wrap notifications with act to make sure React knows about React Query updates
 notifyManager.setNotifyFunction((fn) => {
   act(fn)
diff --git a/packages/react-query-devtools/tsconfig.json b/packages/react-query-devtools/tsconfig.json
index 0d6c071663..3d9b457cdf 100644
--- a/packages/react-query-devtools/tsconfig.json
+++ b/packages/react-query-devtools/tsconfig.json
@@ -1,8 +1,14 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "jsx": "react",
-    "types": ["vitest/globals"]
+    "jsx": "react"
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "test-setup.ts",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/react-query-devtools/vitest.config.ts b/packages/react-query-devtools/vitest.config.ts
index f61709f2fc..16f06fbcc8 100644
--- a/packages/react-query-devtools/vitest.config.ts
+++ b/packages/react-query-devtools/vitest.config.ts
@@ -7,7 +7,6 @@ export default defineConfig({
     watch: false,
     setupFiles: ['test-setup.ts'],
     environment: 'jsdom',
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })
diff --git a/packages/react-query-next-experimental/test-setup.ts b/packages/react-query-next-experimental/test-setup.ts
index e184eb4e20..8331ed6615 100644
--- a/packages/react-query-next-experimental/test-setup.ts
+++ b/packages/react-query-next-experimental/test-setup.ts
@@ -1,6 +1,11 @@
-import { act } from '@testing-library/react'
+import '@testing-library/jest-dom/vitest'
+import { act, cleanup } from '@testing-library/react'
+import { afterEach } from 'vitest'
 import { notifyManager } from '@tanstack/react-query'
 
+// https://testing-library.com/docs/react-testing-library/api#cleanup
+afterEach(() => cleanup())
+
 // Wrap notifications with act to make sure React knows about React Query updates
 notifyManager.setNotifyFunction((fn) => {
   act(fn)
diff --git a/packages/react-query-next-experimental/tsconfig.json b/packages/react-query-next-experimental/tsconfig.json
index 0d6c071663..3d9b457cdf 100644
--- a/packages/react-query-next-experimental/tsconfig.json
+++ b/packages/react-query-next-experimental/tsconfig.json
@@ -1,8 +1,14 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "jsx": "react",
-    "types": ["vitest/globals"]
+    "jsx": "react"
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "test-setup.ts",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/react-query-next-experimental/vitest.config.ts b/packages/react-query-next-experimental/vitest.config.ts
index 825735aae8..a2ec3a6974 100644
--- a/packages/react-query-next-experimental/vitest.config.ts
+++ b/packages/react-query-next-experimental/vitest.config.ts
@@ -7,7 +7,6 @@ export default defineConfig({
     watch: false,
     setupFiles: ['test-setup.ts'],
     environment: 'jsdom',
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })
diff --git a/packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx b/packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx
index d152ec87ab..6192ce4330 100644
--- a/packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx
+++ b/packages/react-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx
@@ -1,7 +1,6 @@
+import { describe, expect, test, vi } from 'vitest'
 import * as React from 'react'
 import { fireEvent, render, waitFor } from '@testing-library/react'
-import { vi } from 'vitest'
-
 import { QueryClient, useQueries, useQuery } from '@tanstack/react-query'
 import { persistQueryClientSave } from '@tanstack/query-persist-client-core'
 
diff --git a/packages/react-query-persist-client/src/__tests__/utils.ts b/packages/react-query-persist-client/src/__tests__/utils.ts
index 45f2eb49ab..27779326c3 100644
--- a/packages/react-query-persist-client/src/__tests__/utils.ts
+++ b/packages/react-query-persist-client/src/__tests__/utils.ts
@@ -1,5 +1,4 @@
 import { act } from '@testing-library/react'
-
 import { QueryClient } from '@tanstack/react-query'
 import type { QueryClientConfig } from '@tanstack/react-query'
 
diff --git a/packages/react-query-persist-client/test-setup.ts b/packages/react-query-persist-client/test-setup.ts
index e184eb4e20..8331ed6615 100644
--- a/packages/react-query-persist-client/test-setup.ts
+++ b/packages/react-query-persist-client/test-setup.ts
@@ -1,6 +1,11 @@
-import { act } from '@testing-library/react'
+import '@testing-library/jest-dom/vitest'
+import { act, cleanup } from '@testing-library/react'
+import { afterEach } from 'vitest'
 import { notifyManager } from '@tanstack/react-query'
 
+// https://testing-library.com/docs/react-testing-library/api#cleanup
+afterEach(() => cleanup())
+
 // Wrap notifications with act to make sure React knows about React Query updates
 notifyManager.setNotifyFunction((fn) => {
   act(fn)
diff --git a/packages/react-query-persist-client/tsconfig.json b/packages/react-query-persist-client/tsconfig.json
index 0d6c071663..3d9b457cdf 100644
--- a/packages/react-query-persist-client/tsconfig.json
+++ b/packages/react-query-persist-client/tsconfig.json
@@ -1,8 +1,14 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "jsx": "react",
-    "types": ["vitest/globals"]
+    "jsx": "react"
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "test-setup.ts",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/react-query-persist-client/vitest.config.ts b/packages/react-query-persist-client/vitest.config.ts
index 70eec41e33..f40f79bd19 100644
--- a/packages/react-query-persist-client/vitest.config.ts
+++ b/packages/react-query-persist-client/vitest.config.ts
@@ -7,7 +7,6 @@ export default defineConfig({
     watch: false,
     setupFiles: ['test-setup.ts'],
     environment: 'jsdom',
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })
diff --git a/packages/react-query/src/__tests__/HydrationBoundary.test.tsx b/packages/react-query/src/__tests__/HydrationBoundary.test.tsx
index 681fbc1676..b94e550be4 100644
--- a/packages/react-query/src/__tests__/HydrationBoundary.test.tsx
+++ b/packages/react-query/src/__tests__/HydrationBoundary.test.tsx
@@ -1,3 +1,4 @@
+import { beforeAll, describe, expect, test } from 'vitest'
 import * as React from 'react'
 import { render } from '@testing-library/react'
 
diff --git a/packages/react-query/src/__tests__/QueryClientProvider.test.tsx b/packages/react-query/src/__tests__/QueryClientProvider.test.tsx
index 4c264ffed3..8b1a30b418 100644
--- a/packages/react-query/src/__tests__/QueryClientProvider.test.tsx
+++ b/packages/react-query/src/__tests__/QueryClientProvider.test.tsx
@@ -1,3 +1,4 @@
+import { describe, expect, test } from 'vitest'
 import * as React from 'react'
 import { render, waitFor } from '@testing-library/react'
 
diff --git a/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx b/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx
index 4672fd4e64..8e2209a3eb 100644
--- a/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx
+++ b/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx
@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest'
 import { fireEvent, waitFor } from '@testing-library/react'
 import { ErrorBoundary } from 'react-error-boundary'
 import * as React from 'react'
diff --git a/packages/react-query/src/__tests__/fine-grained-persister.test.tsx b/packages/react-query/src/__tests__/fine-grained-persister.test.tsx
index 7652ef5bd2..bd28a91d9d 100644
--- a/packages/react-query/src/__tests__/fine-grained-persister.test.tsx
+++ b/packages/react-query/src/__tests__/fine-grained-persister.test.tsx
@@ -1,8 +1,7 @@
+import { describe, expect, it, vi } from 'vitest'
 import { waitFor } from '@testing-library/react'
-import '@testing-library/jest-dom/vitest'
 import * as React from 'react'
 import { QueryCache, hashKey } from '@tanstack/query-core'
-import { vi } from 'vitest'
 import { useQuery } from '..'
 import {
   PERSISTER_KEY_PREFIX,
diff --git a/packages/react-query/src/__tests__/infiniteQueryOptions.types.test.tsx b/packages/react-query/src/__tests__/infiniteQueryOptions.types.test.tsx
index 5c94389b4d..9735f93705 100644
--- a/packages/react-query/src/__tests__/infiniteQueryOptions.types.test.tsx
+++ b/packages/react-query/src/__tests__/infiniteQueryOptions.types.test.tsx
@@ -1,3 +1,4 @@
+import { describe, it } from 'vitest'
 import { QueryClient } from '@tanstack/query-core'
 import { infiniteQueryOptions } from '../infiniteQueryOptions'
 import { useInfiniteQuery } from '../useInfiniteQuery'
diff --git a/packages/react-query/src/__tests__/queryOptions.types.test.tsx b/packages/react-query/src/__tests__/queryOptions.types.test.tsx
index 2186330d38..2955780f48 100644
--- a/packages/react-query/src/__tests__/queryOptions.types.test.tsx
+++ b/packages/react-query/src/__tests__/queryOptions.types.test.tsx
@@ -1,3 +1,4 @@
+import { describe, it } from 'vitest'
 import { QueryClient } from '@tanstack/query-core'
 import { queryOptions } from '../queryOptions'
 import { useQuery } from '../useQuery'
diff --git a/packages/react-query/src/__tests__/ssr-hydration.test.tsx b/packages/react-query/src/__tests__/ssr-hydration.test.tsx
index 3b740f8497..50b62d018b 100644
--- a/packages/react-query/src/__tests__/ssr-hydration.test.tsx
+++ b/packages/react-query/src/__tests__/ssr-hydration.test.tsx
@@ -1,8 +1,8 @@
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
 import * as React from 'react'
 import ReactDOM from 'react-dom'
 import * as ReactDOMTestUtils from 'react-dom/test-utils'
 import * as ReactDOMServer from 'react-dom/server'
-import { vi } from 'vitest'
 
 import {
   QueryCache,
diff --git a/packages/react-query/src/__tests__/ssr.test.tsx b/packages/react-query/src/__tests__/ssr.test.tsx
index 44ba51eb1d..280ddc81ed 100644
--- a/packages/react-query/src/__tests__/ssr.test.tsx
+++ b/packages/react-query/src/__tests__/ssr.test.tsx
@@ -1,8 +1,7 @@
+import { describe, expect, it, vi } from 'vitest'
 import * as React from 'react'
 // @ts-ignore
 import { renderToString } from 'react-dom/server'
-
-import { vi } from 'vitest'
 import { QueryCache, QueryClientProvider, useInfiniteQuery, useQuery } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 
diff --git a/packages/react-query/src/__tests__/suspense.test.tsx b/packages/react-query/src/__tests__/suspense.test.tsx
index cc9d5b6055..153751ab72 100644
--- a/packages/react-query/src/__tests__/suspense.test.tsx
+++ b/packages/react-query/src/__tests__/suspense.test.tsx
@@ -1,7 +1,7 @@
+import { describe, expect, it, vi } from 'vitest'
 import { fireEvent, waitFor } from '@testing-library/react'
 import * as React from 'react'
 import { ErrorBoundary } from 'react-error-boundary'
-import { vi } from 'vitest'
 import {
   QueryCache,
   QueryErrorResetBoundary,
@@ -816,7 +816,7 @@ describe('useSuspenseQueries', () => {
       })
       return (
         <div>
-          <h1>data: {result.map((it) => it.data ?? 'null').join(',')}</h1>
+          <h1>data: {result.map((item) => item.data ?? 'null').join(',')}</h1>
         </div>
       )
     }
@@ -871,7 +871,7 @@ describe('useSuspenseQueries', () => {
       })
       return (
         <div>
-          <h1>data: {result.map((it) => it.data ?? 'null').join(',')}</h1>
+          <h1>data: {result.map((item) => item.data ?? 'null').join(',')}</h1>
         </div>
       )
     }
diff --git a/packages/react-query/src/__tests__/suspense.types.test.tsx b/packages/react-query/src/__tests__/suspense.types.test.tsx
index d3b4098942..6afb9aaaeb 100644
--- a/packages/react-query/src/__tests__/suspense.types.test.tsx
+++ b/packages/react-query/src/__tests__/suspense.types.test.tsx
@@ -1,3 +1,4 @@
+import { describe, it } from 'vitest'
 import { useSuspenseQuery } from '../useSuspenseQuery'
 import { useSuspenseInfiniteQuery } from '../useSuspenseInfiniteQuery'
 import { doNotExecute } from './utils'
diff --git a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx
index 4f5dfe3e61..b6eaf99bb9 100644
--- a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx
+++ b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx
@@ -1,7 +1,6 @@
+import { describe, expect, it, vi } from 'vitest'
 import { fireEvent, render, waitFor } from '@testing-library/react'
 import * as React from 'react'
-
-import { vi } from 'vitest'
 import { QueryCache, keepPreviousData, useInfiniteQuery } from '..'
 import {
   createQueryClient,
diff --git a/packages/react-query/src/__tests__/useInfiniteQuery.type.test.tsx b/packages/react-query/src/__tests__/useInfiniteQuery.type.test.tsx
index c63fb49a69..42e3ff27cc 100644
--- a/packages/react-query/src/__tests__/useInfiniteQuery.type.test.tsx
+++ b/packages/react-query/src/__tests__/useInfiniteQuery.type.test.tsx
@@ -1,3 +1,4 @@
+import { describe, it } from 'vitest'
 import { QueryClient } from '@tanstack/query-core'
 import { useInfiniteQuery } from '../useInfiniteQuery'
 import { useQuery } from '../useQuery'
diff --git a/packages/react-query/src/__tests__/useIsFetching.test.tsx b/packages/react-query/src/__tests__/useIsFetching.test.tsx
index 83348435bd..c80261c6b5 100644
--- a/packages/react-query/src/__tests__/useIsFetching.test.tsx
+++ b/packages/react-query/src/__tests__/useIsFetching.test.tsx
@@ -1,6 +1,6 @@
+import { describe, expect, it } from 'vitest'
 import { fireEvent, render, waitFor } from '@testing-library/react'
 import * as React from 'react'
-
 import { QueryCache, useIsFetching, useQuery } from '..'
 import {
   createQueryClient,
diff --git a/packages/react-query/src/__tests__/useMutation.test.tsx b/packages/react-query/src/__tests__/useMutation.test.tsx
index c7a0a7dd80..e5f0f3f44c 100644
--- a/packages/react-query/src/__tests__/useMutation.test.tsx
+++ b/packages/react-query/src/__tests__/useMutation.test.tsx
@@ -1,9 +1,7 @@
+import { describe, expect, it, vi } from 'vitest'
 import { fireEvent, render, waitFor } from '@testing-library/react'
-import '@testing-library/jest-dom/vitest'
 import * as React from 'react'
 import { ErrorBoundary } from 'react-error-boundary'
-
-import { vi } from 'vitest'
 import { MutationCache, QueryCache, useMutation } from '..'
 import {
   createQueryClient,
diff --git a/packages/react-query/src/__tests__/useMutationState.test.tsx b/packages/react-query/src/__tests__/useMutationState.test.tsx
index e76d6670ce..5f09a7aa17 100644
--- a/packages/react-query/src/__tests__/useMutationState.test.tsx
+++ b/packages/react-query/src/__tests__/useMutationState.test.tsx
@@ -1,3 +1,4 @@
+import { describe, expect, expectTypeOf, it } from 'vitest'
 import { fireEvent, render, waitFor } from '@testing-library/react'
 import * as React from 'react'
 import { useIsMutating, useMutationState } from '../useMutationState'
diff --git a/packages/react-query/src/__tests__/useQueries.test.tsx b/packages/react-query/src/__tests__/useQueries.test.tsx
index fa86977e85..aa75ad22e4 100644
--- a/packages/react-query/src/__tests__/useQueries.test.tsx
+++ b/packages/react-query/src/__tests__/useQueries.test.tsx
@@ -1,8 +1,7 @@
+import { describe, expect, expectTypeOf, it, vi } from 'vitest'
 import { fireEvent, render, waitFor } from '@testing-library/react'
 import * as React from 'react'
 import { ErrorBoundary } from 'react-error-boundary'
-
-import { vi } from 'vitest'
 import { QueryCache, useQueries } from '..'
 import {
   createQueryClient,
diff --git a/packages/react-query/src/__tests__/useQuery.test.tsx b/packages/react-query/src/__tests__/useQuery.test.tsx
index 043823c9ba..7f42420462 100644
--- a/packages/react-query/src/__tests__/useQuery.test.tsx
+++ b/packages/react-query/src/__tests__/useQuery.test.tsx
@@ -1,8 +1,7 @@
+import { describe, expect, expectTypeOf, it, test, vi } from 'vitest'
 import { act, fireEvent, render, waitFor } from '@testing-library/react'
-import '@testing-library/jest-dom/vitest'
 import * as React from 'react'
 import { ErrorBoundary } from 'react-error-boundary'
-import { vi } from 'vitest'
 import { QueryCache, keepPreviousData, useQuery } from '..'
 import {
   Blink,
@@ -154,8 +153,8 @@ describe('useQuery', () => {
           queryFn: () => fetcher(qk[1], 'token'),
           ...options,
         })
-      const test = useWrappedQuery([''], async () => '1')
-      expectTypeOf<string | undefined>(test.data)
+      const testQuery = useWrappedQuery([''], async () => '1')
+      expectTypeOf<string | undefined>(testQuery.data)
 
       // handles wrapped queries with custom fetcher passed directly to useQuery
       const useWrappedFuncStyleQuery = <
diff --git a/packages/react-query/src/__tests__/useQuery.types.test.tsx b/packages/react-query/src/__tests__/useQuery.types.test.tsx
index 620c4bf470..7717885bef 100644
--- a/packages/react-query/src/__tests__/useQuery.types.test.tsx
+++ b/packages/react-query/src/__tests__/useQuery.types.test.tsx
@@ -1,3 +1,4 @@
+import { describe, it } from 'vitest'
 import { useQuery } from '../useQuery'
 import { queryOptions } from '../queryOptions'
 import { doNotExecute } from './utils'
diff --git a/packages/react-query/src/__tests__/utils.tsx b/packages/react-query/src/__tests__/utils.tsx
index c876d64a38..3fc3c3469c 100644
--- a/packages/react-query/src/__tests__/utils.tsx
+++ b/packages/react-query/src/__tests__/utils.tsx
@@ -1,8 +1,7 @@
+import { vi } from 'vitest'
 import * as React from 'react'
 import { act, render } from '@testing-library/react'
-
 import * as utils from '@tanstack/query-core'
-import { vi } from 'vitest'
 import { QueryClient, QueryClientProvider, onlineManager } from '..'
 import type { QueryClientConfig } from '..'
 import type { SpyInstance } from 'vitest'
diff --git a/packages/react-query/test-setup.ts b/packages/react-query/test-setup.ts
index 4bc5d7f0d3..5ec2b8b023 100644
--- a/packages/react-query/test-setup.ts
+++ b/packages/react-query/test-setup.ts
@@ -1,6 +1,11 @@
-import { act } from '@testing-library/react'
+import '@testing-library/jest-dom/vitest'
+import { act, cleanup } from '@testing-library/react'
+import { afterEach } from 'vitest'
 import { notifyManager } from '@tanstack/query-core'
 
+// https://testing-library.com/docs/react-testing-library/api#cleanup
+afterEach(() => cleanup())
+
 // Wrap notifications with act to make sure React knows about React Query updates
 notifyManager.setNotifyFunction((fn) => {
   act(fn)
diff --git a/packages/react-query/tsconfig.json b/packages/react-query/tsconfig.json
index 0d6c071663..3d9b457cdf 100644
--- a/packages/react-query/tsconfig.json
+++ b/packages/react-query/tsconfig.json
@@ -1,8 +1,14 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "jsx": "react",
-    "types": ["vitest/globals"]
+    "jsx": "react"
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "test-setup.ts",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/react-query/vitest.config.ts b/packages/react-query/vitest.config.ts
index e31d0611cf..8643010034 100644
--- a/packages/react-query/vitest.config.ts
+++ b/packages/react-query/vitest.config.ts
@@ -7,7 +7,6 @@ export default defineConfig({
     watch: false,
     environment: 'jsdom',
     setupFiles: ['test-setup.ts'],
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
 })
diff --git a/packages/solid-query-devtools/test-setup.ts b/packages/solid-query-devtools/test-setup.ts
new file mode 100644
index 0000000000..c3055e4bd5
--- /dev/null
+++ b/packages/solid-query-devtools/test-setup.ts
@@ -0,0 +1,6 @@
+import '@testing-library/jest-dom/vitest'
+import { cleanup } from '@solidjs/testing-library'
+import { afterEach } from 'vitest'
+
+// https://github.com/solidjs/solid-testing-library
+afterEach(() => cleanup())
diff --git a/packages/solid-query-devtools/tsconfig.json b/packages/solid-query-devtools/tsconfig.json
index 8e3ee045d8..668bca029f 100644
--- a/packages/solid-query-devtools/tsconfig.json
+++ b/packages/solid-query-devtools/tsconfig.json
@@ -2,8 +2,14 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "types": ["vitest/globals"]
+    "jsxImportSource": "solid-js"
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "test-setup.ts",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/solid-query-devtools/vitest.config.ts b/packages/solid-query-devtools/vitest.config.ts
index a97e3c2445..341b582b4b 100644
--- a/packages/solid-query-devtools/vitest.config.ts
+++ b/packages/solid-query-devtools/vitest.config.ts
@@ -6,9 +6,8 @@ export default defineConfig({
     name: 'solid-query-devtools',
     dir: './src',
     watch: false,
-    setupFiles: [],
+    setupFiles: ['test-setup.ts'],
     environment: 'jsdom',
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
   plugins: [solid()],
diff --git a/packages/solid-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx b/packages/solid-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx
index de2853aa0c..d9a986b54b 100644
--- a/packages/solid-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx
+++ b/packages/solid-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx
@@ -1,4 +1,4 @@
-import '@testing-library/jest-dom/vitest'
+import { describe, expect, test, vi } from 'vitest'
 import { render, screen, waitFor } from '@solidjs/testing-library'
 import { QueryClient, createQueries, createQuery } from '@tanstack/solid-query'
 import { persistQueryClientSave } from '@tanstack/query-persist-client-core'
diff --git a/packages/solid-query-persist-client/test-setup.ts b/packages/solid-query-persist-client/test-setup.ts
new file mode 100644
index 0000000000..c3055e4bd5
--- /dev/null
+++ b/packages/solid-query-persist-client/test-setup.ts
@@ -0,0 +1,6 @@
+import '@testing-library/jest-dom/vitest'
+import { cleanup } from '@solidjs/testing-library'
+import { afterEach } from 'vitest'
+
+// https://github.com/solidjs/solid-testing-library
+afterEach(() => cleanup())
diff --git a/packages/solid-query-persist-client/tsconfig.json b/packages/solid-query-persist-client/tsconfig.json
index 8e3ee045d8..668bca029f 100644
--- a/packages/solid-query-persist-client/tsconfig.json
+++ b/packages/solid-query-persist-client/tsconfig.json
@@ -2,8 +2,14 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "types": ["vitest/globals"]
+    "jsxImportSource": "solid-js"
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "test-setup.ts",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/solid-query-persist-client/vitest.config.ts b/packages/solid-query-persist-client/vitest.config.ts
index 28dc4f1356..f11da14164 100644
--- a/packages/solid-query-persist-client/vitest.config.ts
+++ b/packages/solid-query-persist-client/vitest.config.ts
@@ -6,9 +6,8 @@ export default defineConfig({
     name: 'solid-query-persist-client',
     dir: './src',
     watch: false,
-    setupFiles: [],
+    setupFiles: ['test-setup.ts'],
     environment: 'jsdom',
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
   plugins: [solid()],
diff --git a/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx b/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx
index 4ece37cbfb..ec79bd0f94 100644
--- a/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx
+++ b/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx
@@ -1,7 +1,6 @@
+import { describe, expect, it, vi } from 'vitest'
 import { render, screen, waitFor } from '@solidjs/testing-library'
-
 import { QueryCache } from '@tanstack/query-core'
-import { vi } from 'vitest'
 import { QueryClientProvider, createQuery, useQueryClient } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 
diff --git a/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx b/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx
index d3268c11ff..13e7d03f93 100644
--- a/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx
+++ b/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx
@@ -1,3 +1,4 @@
+import { describe, expect, it, vi } from 'vitest'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
 
 import {
@@ -10,7 +11,6 @@ import {
   createSignal,
   on,
 } from 'solid-js'
-import { vi } from 'vitest'
 import {
   QueryCache,
   QueryClientProvider,
diff --git a/packages/solid-query/src/__tests__/createMutation.test.tsx b/packages/solid-query/src/__tests__/createMutation.test.tsx
index 6ea4ecfe88..cb5d16523a 100644
--- a/packages/solid-query/src/__tests__/createMutation.test.tsx
+++ b/packages/solid-query/src/__tests__/createMutation.test.tsx
@@ -1,4 +1,4 @@
-import '@testing-library/jest-dom/vitest'
+import { describe, expect, it, vi } from 'vitest'
 import {
   ErrorBoundary,
   createEffect,
@@ -6,7 +6,6 @@ import {
   createSignal,
 } from 'solid-js'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
-import { vi } from 'vitest'
 import {
   MutationCache,
   QueryCache,
diff --git a/packages/solid-query/src/__tests__/createQueries.test.tsx b/packages/solid-query/src/__tests__/createQueries.test.tsx
index b6dad5dd73..ecbb7b27e1 100644
--- a/packages/solid-query/src/__tests__/createQueries.test.tsx
+++ b/packages/solid-query/src/__tests__/createQueries.test.tsx
@@ -1,8 +1,8 @@
+import { describe, expect, expectTypeOf, it, vi } from 'vitest'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
 import * as QueryCore from '@tanstack/query-core'
 
 import { createRenderEffect, createSignal } from 'solid-js'
-import { vi } from 'vitest'
 import {
   QueriesObserver,
   QueryCache,
diff --git a/packages/solid-query/src/__tests__/createQuery.test.tsx b/packages/solid-query/src/__tests__/createQuery.test.tsx
index 3ee1f0b8b4..5c5886965e 100644
--- a/packages/solid-query/src/__tests__/createQuery.test.tsx
+++ b/packages/solid-query/src/__tests__/createQuery.test.tsx
@@ -1,4 +1,4 @@
-import '@testing-library/jest-dom/vitest'
+import { describe, expect, expectTypeOf, it, vi } from 'vitest'
 import {
   ErrorBoundary,
   Match,
@@ -10,7 +10,6 @@ import {
   on,
 } from 'solid-js'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
-import { vi } from 'vitest'
 import { reconcile } from 'solid-js/store'
 import {
   QueryCache,
diff --git a/packages/solid-query/src/__tests__/createQuery.types.test.tsx b/packages/solid-query/src/__tests__/createQuery.types.test.tsx
index 3907f8351e..d88a1f1e0b 100644
--- a/packages/solid-query/src/__tests__/createQuery.types.test.tsx
+++ b/packages/solid-query/src/__tests__/createQuery.types.test.tsx
@@ -1,3 +1,4 @@
+import { describe, it } from 'vitest'
 import { createQuery, queryOptions } from '../index'
 
 export type Equal<X, Y> = (<T>() => T extends X ? 1 : 2) extends <
diff --git a/packages/solid-query/src/__tests__/suspense.test.tsx b/packages/solid-query/src/__tests__/suspense.test.tsx
index 51dc1a934a..0c3e2d5cb7 100644
--- a/packages/solid-query/src/__tests__/suspense.test.tsx
+++ b/packages/solid-query/src/__tests__/suspense.test.tsx
@@ -1,3 +1,4 @@
+import { describe, expect, it, vi } from 'vitest'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
 
 import {
@@ -8,7 +9,6 @@ import {
   createSignal,
   on,
 } from 'solid-js'
-import { vi } from 'vitest'
 import {
   QueryCache,
   QueryClientProvider,
diff --git a/packages/solid-query/src/__tests__/transition.test.tsx b/packages/solid-query/src/__tests__/transition.test.tsx
index e9fdc585e9..eeccf13d83 100644
--- a/packages/solid-query/src/__tests__/transition.test.tsx
+++ b/packages/solid-query/src/__tests__/transition.test.tsx
@@ -1,5 +1,5 @@
+import { describe, it } from 'vitest'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
-
 import { Show, Suspense, createSignal, startTransition } from 'solid-js'
 import { QueryCache, QueryClientProvider, createQuery } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
diff --git a/packages/solid-query/src/__tests__/useIsFetching.test.tsx b/packages/solid-query/src/__tests__/useIsFetching.test.tsx
index 13ffc594b5..baa0c465eb 100644
--- a/packages/solid-query/src/__tests__/useIsFetching.test.tsx
+++ b/packages/solid-query/src/__tests__/useIsFetching.test.tsx
@@ -1,5 +1,5 @@
+import { describe, expect, it } from 'vitest'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
-
 import { Show, createEffect, createRenderEffect, createSignal } from 'solid-js'
 import { QueryCache, QueryClientProvider, createQuery, useIsFetching } from '..'
 import { createQueryClient, queryKey, setActTimeout, sleep } from './utils'
diff --git a/packages/solid-query/src/__tests__/useIsMutating.test.tsx b/packages/solid-query/src/__tests__/useIsMutating.test.tsx
index cb72c16ed6..a8f81d015b 100644
--- a/packages/solid-query/src/__tests__/useIsMutating.test.tsx
+++ b/packages/solid-query/src/__tests__/useIsMutating.test.tsx
@@ -1,8 +1,7 @@
+import { describe, expect, it, vi } from 'vitest'
 import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
-
 import { Show, createEffect, createRenderEffect, createSignal } from 'solid-js'
 import * as QueryCore from '@tanstack/query-core'
-import { vi } from 'vitest'
 import { QueryClientProvider, createMutation, useIsMutating } from '..'
 import { createQueryClient, setActTimeout, sleep } from './utils'
 
diff --git a/packages/solid-query/src/__tests__/utils.tsx b/packages/solid-query/src/__tests__/utils.tsx
index 88c8b1b1d5..b143a0d8c9 100644
--- a/packages/solid-query/src/__tests__/utils.tsx
+++ b/packages/solid-query/src/__tests__/utils.tsx
@@ -1,5 +1,5 @@
-import { Show, createEffect, createSignal, onCleanup } from 'solid-js'
 import { vi } from 'vitest'
+import { Show, createEffect, createSignal, onCleanup } from 'solid-js'
 import { onlineManager } from '@tanstack/query-core'
 import { QueryClient } from '../QueryClient'
 import type { QueryClientConfig } from '@tanstack/query-core'
diff --git a/packages/solid-query/test-setup.ts b/packages/solid-query/test-setup.ts
new file mode 100644
index 0000000000..c3055e4bd5
--- /dev/null
+++ b/packages/solid-query/test-setup.ts
@@ -0,0 +1,6 @@
+import '@testing-library/jest-dom/vitest'
+import { cleanup } from '@solidjs/testing-library'
+import { afterEach } from 'vitest'
+
+// https://github.com/solidjs/solid-testing-library
+afterEach(() => cleanup())
diff --git a/packages/solid-query/tsconfig.json b/packages/solid-query/tsconfig.json
index 8e3ee045d8..668bca029f 100644
--- a/packages/solid-query/tsconfig.json
+++ b/packages/solid-query/tsconfig.json
@@ -2,8 +2,14 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "types": ["vitest/globals"]
+    "jsxImportSource": "solid-js"
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "test-setup.ts",
+    "tsup.config.js",
+    "vitest.config.ts"
+  ]
 }
diff --git a/packages/solid-query/vitest.config.ts b/packages/solid-query/vitest.config.ts
index 4955b6b7be..4bb76cdd18 100644
--- a/packages/solid-query/vitest.config.ts
+++ b/packages/solid-query/vitest.config.ts
@@ -6,9 +6,8 @@ export default defineConfig({
     name: 'solid-query',
     dir: './src',
     watch: false,
-    setupFiles: [],
+    setupFiles: ['test-setup.ts'],
     environment: 'jsdom',
-    globals: true,
     coverage: { provider: 'istanbul' },
   },
   plugins: [solid()],
diff --git a/packages/svelte-query-persist-client/vitest-setup.ts b/packages/svelte-query-persist-client/test-setup.ts
similarity index 68%
rename from packages/svelte-query-persist-client/vitest-setup.ts
rename to packages/svelte-query-persist-client/test-setup.ts
index 824b0169d2..921f7e3344 100644
--- a/packages/svelte-query-persist-client/vitest-setup.ts
+++ b/packages/svelte-query-persist-client/test-setup.ts
@@ -2,4 +2,5 @@ import '@testing-library/jest-dom/vitest'
 import { cleanup } from '@testing-library/svelte'
 import { afterEach } from 'vitest'
 
+// https://testing-library.com/docs/svelte-testing-library/api/#cleanup
 afterEach(() => cleanup())
diff --git a/packages/svelte-query-persist-client/tsconfig.json b/packages/svelte-query-persist-client/tsconfig.json
index 78271b2e55..39f22d0c42 100644
--- a/packages/svelte-query-persist-client/tsconfig.json
+++ b/packages/svelte-query-persist-client/tsconfig.json
@@ -5,7 +5,7 @@
     "src/**/*.ts",
     "src/**/*.svelte",
     ".eslintrc.cjs",
-    "vite.config.ts",
-    "vitest-setup.ts"
+    "test-setup.ts",
+    "vite.config.ts"
   ]
 }
diff --git a/packages/svelte-query-persist-client/vite.config.ts b/packages/svelte-query-persist-client/vite.config.ts
index 32866a5d10..b9c52fe6c8 100644
--- a/packages/svelte-query-persist-client/vite.config.ts
+++ b/packages/svelte-query-persist-client/vite.config.ts
@@ -9,6 +9,6 @@ export default defineConfig({
     coverage: { provider: 'istanbul' },
     environment: 'jsdom',
     include: ['src/**/*.{test,spec}.{js,ts}'],
-    setupFiles: ['vitest-setup.ts'],
+    setupFiles: ['test-setup.ts'],
   },
 })
diff --git a/packages/svelte-query/vitest-setup.ts b/packages/svelte-query/test-setup.ts
similarity index 68%
rename from packages/svelte-query/vitest-setup.ts
rename to packages/svelte-query/test-setup.ts
index 824b0169d2..921f7e3344 100644
--- a/packages/svelte-query/vitest-setup.ts
+++ b/packages/svelte-query/test-setup.ts
@@ -2,4 +2,5 @@ import '@testing-library/jest-dom/vitest'
 import { cleanup } from '@testing-library/svelte'
 import { afterEach } from 'vitest'
 
+// https://testing-library.com/docs/svelte-testing-library/api/#cleanup
 afterEach(() => cleanup())
diff --git a/packages/svelte-query/tsconfig.json b/packages/svelte-query/tsconfig.json
index 78271b2e55..39f22d0c42 100644
--- a/packages/svelte-query/tsconfig.json
+++ b/packages/svelte-query/tsconfig.json
@@ -5,7 +5,7 @@
     "src/**/*.ts",
     "src/**/*.svelte",
     ".eslintrc.cjs",
-    "vite.config.ts",
-    "vitest-setup.ts"
+    "test-setup.ts",
+    "vite.config.ts"
   ]
 }
diff --git a/packages/svelte-query/vite.config.ts b/packages/svelte-query/vite.config.ts
index 02cd35545d..93042c7c68 100644
--- a/packages/svelte-query/vite.config.ts
+++ b/packages/svelte-query/vite.config.ts
@@ -9,6 +9,6 @@ export default defineConfig({
     coverage: { provider: 'istanbul' },
     environment: 'jsdom',
     include: ['src/**/*.{test,spec}.{js,ts}'],
-    setupFiles: ['vitest-setup.ts'],
+    setupFiles: ['test-setup.ts'],
   },
 })
diff --git a/packages/vue-query/src/__tests__/mutationCache.test.ts b/packages/vue-query/src/__tests__/mutationCache.test.ts
index f53f69b8e9..b7b9764096 100644
--- a/packages/vue-query/src/__tests__/mutationCache.test.ts
+++ b/packages/vue-query/src/__tests__/mutationCache.test.ts
@@ -1,7 +1,6 @@
+import { beforeAll, describe, expect, test, vi } from 'vitest'
 import { ref } from 'vue-demi'
 import { MutationCache as MutationCacheOrigin } from '@tanstack/query-core'
-
-import { vi } from 'vitest'
 import { MutationCache } from '../mutationCache'
 
 describe('MutationCache', () => {
diff --git a/packages/vue-query/src/__tests__/queryCache.test.ts b/packages/vue-query/src/__tests__/queryCache.test.ts
index 844aefe38f..74336b924e 100644
--- a/packages/vue-query/src/__tests__/queryCache.test.ts
+++ b/packages/vue-query/src/__tests__/queryCache.test.ts
@@ -1,7 +1,6 @@
+import { beforeAll, describe, expect, test, vi } from 'vitest'
 import { ref } from 'vue-demi'
 import { QueryCache as QueryCacheOrigin } from '@tanstack/query-core'
-
-import { vi } from 'vitest'
 import { QueryCache } from '../queryCache'
 
 describe('QueryCache', () => {
diff --git a/packages/vue-query/src/__tests__/queryClient.test.ts b/packages/vue-query/src/__tests__/queryClient.test.ts
index fb639de2ad..940cf1affd 100644
--- a/packages/vue-query/src/__tests__/queryClient.test.ts
+++ b/packages/vue-query/src/__tests__/queryClient.test.ts
@@ -1,7 +1,6 @@
+import { describe, expect, test, vi } from 'vitest'
 import { ref } from 'vue-demi'
 import { QueryClient as QueryClientOrigin } from '@tanstack/query-core'
-
-import { vi } from 'vitest'
 import { QueryClient } from '../queryClient'
 
 vi.mock('@tanstack/query-core')
diff --git a/packages/vue-query/src/__tests__/useInfiniteQuery.test.ts b/packages/vue-query/src/__tests__/useInfiniteQuery.test.ts
index 296eea0eec..1c42b38d2c 100644
--- a/packages/vue-query/src/__tests__/useInfiniteQuery.test.ts
+++ b/packages/vue-query/src/__tests__/useInfiniteQuery.test.ts
@@ -1,4 +1,4 @@
-import { vi } from 'vitest'
+import { describe, expect, test, vi } from 'vitest'
 import { useInfiniteQuery } from '../useInfiniteQuery'
 import { flushPromises, infiniteFetcher } from './test-utils'
 
diff --git a/packages/vue-query/src/__tests__/useInfiniteQuery.types.test.tsx b/packages/vue-query/src/__tests__/useInfiniteQuery.types.test.tsx
index 62746f69ef..0f601abba1 100644
--- a/packages/vue-query/src/__tests__/useInfiniteQuery.types.test.tsx
+++ b/packages/vue-query/src/__tests__/useInfiniteQuery.types.test.tsx
@@ -1,3 +1,4 @@
+import { describe, it } from 'vitest'
 import { reactive } from 'vue'
 import { useInfiniteQuery } from '../useInfiniteQuery'
 import { doNotExecute, simpleFetcher } from './test-utils'
diff --git a/packages/vue-query/src/__tests__/useIsFetching.test.ts b/packages/vue-query/src/__tests__/useIsFetching.test.ts
index 118a2575e9..1447176d77 100644
--- a/packages/vue-query/src/__tests__/useIsFetching.test.ts
+++ b/packages/vue-query/src/__tests__/useIsFetching.test.ts
@@ -1,6 +1,5 @@
+import { describe, expect, test, vi } from 'vitest'
 import { onScopeDispose, reactive } from 'vue-demi'
-
-import { vi } from 'vitest'
 import { useQuery } from '../useQuery'
 import { useIsFetching } from '../useIsFetching'
 import { flushPromises, simpleFetcher } from './test-utils'
diff --git a/packages/vue-query/src/__tests__/useIsMutating.test.ts b/packages/vue-query/src/__tests__/useIsMutating.test.ts
index 4a2900703c..efe46d0866 100644
--- a/packages/vue-query/src/__tests__/useIsMutating.test.ts
+++ b/packages/vue-query/src/__tests__/useIsMutating.test.ts
@@ -1,6 +1,5 @@
+import { describe, expect, it, test, vi } from 'vitest'
 import { onScopeDispose, reactive } from 'vue-demi'
-
-import { vi } from 'vitest'
 import { useMutation } from '../useMutation'
 import { useIsMutating, useMutationState } from '../useMutationState'
 import { useQueryClient } from '../useQueryClient'
diff --git a/packages/vue-query/src/__tests__/useMutation.test.ts b/packages/vue-query/src/__tests__/useMutation.test.ts
index 1cc9b3fce7..2c1989d6ac 100644
--- a/packages/vue-query/src/__tests__/useMutation.test.ts
+++ b/packages/vue-query/src/__tests__/useMutation.test.ts
@@ -1,5 +1,5 @@
+import { beforeEach, describe, expect, test, vi } from 'vitest'
 import { reactive, ref } from 'vue-demi'
-import { vi } from 'vitest'
 import { useMutation } from '../useMutation'
 import { useQueryClient } from '../useQueryClient'
 import { errorMutator, flushPromises, successMutator } from './test-utils'
diff --git a/packages/vue-query/src/__tests__/useMutation.types.test.tsx b/packages/vue-query/src/__tests__/useMutation.types.test.tsx
index cf2e5eff25..d1e4f9ff14 100644
--- a/packages/vue-query/src/__tests__/useMutation.types.test.tsx
+++ b/packages/vue-query/src/__tests__/useMutation.types.test.tsx
@@ -1,3 +1,4 @@
+import { describe, it } from 'vitest'
 import { reactive } from 'vue'
 import { useMutation } from '../useMutation'
 import { doNotExecute, successMutator } from './test-utils'
diff --git a/packages/vue-query/src/__tests__/useQueries.test.ts b/packages/vue-query/src/__tests__/useQueries.test.ts
index 6d2935d438..14f160b47c 100644
--- a/packages/vue-query/src/__tests__/useQueries.test.ts
+++ b/packages/vue-query/src/__tests__/useQueries.test.ts
@@ -1,6 +1,5 @@
+import { beforeEach, describe, expect, test, vi } from 'vitest'
 import { onScopeDispose, ref } from 'vue-demi'
-
-import { vi } from 'vitest'
 import { useQueries } from '../useQueries'
 import { useQueryClient } from '../useQueryClient'
 import { QueryClient } from '../queryClient'
diff --git a/packages/vue-query/src/__tests__/useQuery.test.ts b/packages/vue-query/src/__tests__/useQuery.test.ts
index 73d9f0c821..7c1e01bdf8 100644
--- a/packages/vue-query/src/__tests__/useQuery.test.ts
+++ b/packages/vue-query/src/__tests__/useQuery.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, test, vi } from 'vitest'
 import {
   computed,
   getCurrentInstance,
@@ -6,8 +7,6 @@ import {
   ref,
 } from 'vue-demi'
 import { QueryObserver } from '@tanstack/query-core'
-
-import { vi } from 'vitest'
 import { useQuery } from '../useQuery'
 import { useBaseQuery } from '../useBaseQuery'
 import {
diff --git a/packages/vue-query/src/__tests__/useQuery.types.test.tsx b/packages/vue-query/src/__tests__/useQuery.types.test.tsx
index f8acb631fd..2003dfca3c 100644
--- a/packages/vue-query/src/__tests__/useQuery.types.test.tsx
+++ b/packages/vue-query/src/__tests__/useQuery.types.test.tsx
@@ -1,3 +1,4 @@
+import { describe, it } from 'vitest'
 import { reactive } from 'vue'
 import { useQuery } from '../useQuery'
 import { doNotExecute, simpleFetcher } from './test-utils'
diff --git a/packages/vue-query/src/__tests__/useQueryClient.test.ts b/packages/vue-query/src/__tests__/useQueryClient.test.ts
index 434f3b1f1f..c63f517408 100644
--- a/packages/vue-query/src/__tests__/useQueryClient.test.ts
+++ b/packages/vue-query/src/__tests__/useQueryClient.test.ts
@@ -1,5 +1,5 @@
+import { beforeEach, describe, expect, test, vi } from 'vitest'
 import { hasInjectionContext, inject } from 'vue-demi'
-import { vi } from 'vitest'
 import { useQueryClient } from '../useQueryClient'
 import { VUE_QUERY_CLIENT } from '../utils'
 import type { Mock } from 'vitest'
diff --git a/packages/vue-query/src/__tests__/utils.test.ts b/packages/vue-query/src/__tests__/utils.test.ts
index 4060b45121..672739c0a9 100644
--- a/packages/vue-query/src/__tests__/utils.test.ts
+++ b/packages/vue-query/src/__tests__/utils.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, test } from 'vitest'
 import { reactive, ref } from 'vue-demi'
 import { cloneDeep, cloneDeepUnref, updateState } from '../utils'
 
diff --git a/packages/vue-query/src/__tests__/vueQueryPlugin.test.ts b/packages/vue-query/src/__tests__/vueQueryPlugin.test.ts
index 1f0772b136..7d0005bf3c 100644
--- a/packages/vue-query/src/__tests__/vueQueryPlugin.test.ts
+++ b/packages/vue-query/src/__tests__/vueQueryPlugin.test.ts
@@ -1,6 +1,5 @@
+import { describe, expect, test, vi } from 'vitest'
 import { isVue2, isVue3, ref } from 'vue-demi'
-
-import { vi } from 'vitest'
 import { QueryClient } from '../queryClient'
 import { VueQueryPlugin } from '../vueQueryPlugin'
 import { VUE_QUERY_CLIENT } from '../utils'
diff --git a/packages/vue-query/tsconfig.json b/packages/vue-query/tsconfig.json
index c39870cad9..a209f928ac 100644
--- a/packages/vue-query/tsconfig.json
+++ b/packages/vue-query/tsconfig.json
@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "types": ["vitest/globals"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    ".eslintrc.cjs",
+    "test-setup.ts",
+    "tsup.config.js"
+  ]
 }
diff --git a/packages/vue-query/vitest.config.ts b/packages/vue-query/vitest.config.ts
index ba056d7541..ce9c29b0c8 100644
--- a/packages/vue-query/vitest.config.ts
+++ b/packages/vue-query/vitest.config.ts
@@ -6,7 +6,6 @@ export default defineConfig({
     dir: './src',
     watch: false,
     environment: 'jsdom',
-    globals: true,
     setupFiles: ['test-setup.ts'],
     coverage: { provider: 'istanbul' },
     onConsoleLog: function (log) {