diff --git a/packages/toolkit/src/query/tests/createApi.test.ts b/packages/toolkit/src/query/tests/createApi.test.ts
index 9a4107f3c1..a9898e74a7 100644
--- a/packages/toolkit/src/query/tests/createApi.test.ts
+++ b/packages/toolkit/src/query/tests/createApi.test.ts
@@ -159,6 +159,8 @@ describe('wrong tagTypes log errors', () => {
     ['invalidateWrongTypeWithId', true],
     ['invalidateWrongTypeWithIdAndCallback', true],
   ])(`endpoint %s should log an error? %s`, async (endpoint, shouldError) => {
+    vi.stubEnv('NODE_ENV', 'development')
+
     // @ts-ignore
     store.dispatch(api.endpoints[endpoint].initiate())
     let result: { status: string }
@@ -402,6 +404,8 @@ describe('endpoint definition typings', () => {
     })
 
     test('warn on wrong tagType', async () => {
+      vi.stubEnv('NODE_ENV', 'development')
+
       const storeRef = setupApiStore(api, undefined, {
         withoutTestLifecycles: true,
       })
diff --git a/packages/toolkit/src/query/tests/infiniteQueries.test.ts b/packages/toolkit/src/query/tests/infiniteQueries.test.ts
index dd4ca4e4ac..26126cfa5f 100644
--- a/packages/toolkit/src/query/tests/infiniteQueries.test.ts
+++ b/packages/toolkit/src/query/tests/infiniteQueries.test.ts
@@ -1,33 +1,13 @@
-import { configureStore, isAllOf } from '@reduxjs/toolkit'
-import {
-  act,
-  fireEvent,
-  render,
-  renderHook,
-  screen,
-  waitFor,
-} from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { HttpResponse, delay, http } from 'msw'
-import util from 'util'
-import type {
-  InfiniteQueryActionCreatorResult,
-  QueryCacheKey,
-} from '@reduxjs/toolkit/query/react'
+import { server } from '@internal/query/tests/mocks/server'
+import type { InfiniteQueryActionCreatorResult } from '@reduxjs/toolkit/query/react'
 import {
   QueryStatus,
   createApi,
-  fetchBaseQuery,
   fakeBaseQuery,
-  skipToken,
+  fetchBaseQuery,
 } from '@reduxjs/toolkit/query/react'
-import {
-  actionsReducer,
-  setupApiStore,
-  withProvider,
-} from '../../tests/utils/helpers'
-import type { BaseQueryApi } from '../baseQueryTypes'
-import { server } from '@internal/query/tests/mocks/server'
+import { HttpResponse, delay, http } from 'msw'
+import { actionsReducer, setupApiStore } from '../../tests/utils/helpers'
 import type { InfiniteQueryResultFlags } from '../core/buildSelectors'
 
 describe('Infinite queries', () => {
@@ -171,12 +151,6 @@ describe('Infinite queries', () => {
 
     hitCounter = 0
     queryCounter = 0
-
-    process.env.NODE_ENV = 'development'
-  })
-
-  afterEach(() => {
-    process.env.NODE_ENV = 'test'
   })
 
   type InfiniteQueryResult = Awaited<InfiniteQueryActionCreatorResult<any>>
@@ -387,6 +361,8 @@ describe('Infinite queries', () => {
   })
 
   test('validates maxPages during createApi call', async () => {
+    vi.stubEnv('NODE_ENV', 'development')
+
     const createApiWithMaxPages = (
       maxPages: number,
       getPreviousPageParam: (() => number) | undefined,
diff --git a/packages/toolkit/vitest.config.mts b/packages/toolkit/vitest.config.mts
index 6327d7e388..41a7534dc5 100644
--- a/packages/toolkit/vitest.config.mts
+++ b/packages/toolkit/vitest.config.mts
@@ -23,5 +23,6 @@ export default defineConfig({
     setupFiles: ['./vitest.setup.ts'],
     include: ['./src/**/*.(spec|test).[jt]s?(x)'],
     server: { deps: { inline: ['redux', '@reduxjs/toolkit'] } },
+    unstubEnvs: true,
   },
 })