diff --git a/plugins/proxy-backend/src/service/router.credentials.test.ts b/plugins/proxy-backend/src/service/router.credentials.test.ts
index 54c865ba11..0bfaa7f40a 100644
--- a/plugins/proxy-backend/src/service/router.credentials.test.ts
+++ b/plugins/proxy-backend/src/service/router.credentials.test.ts
@@ -18,11 +18,7 @@ import {
   authServiceFactory,
   httpAuthServiceFactory,
 } from '@backstage/backend-app-api';
-import {
-  mockServices,
-  setupRequestMockHandlers,
-  startTestBackend,
-} from '@backstage/backend-test-utils';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { ResponseError } from '@backstage/errors';
 import { JsonObject } from '@backstage/types';
 import { HttpResponse, http, passthrough } from 'msw';
@@ -34,7 +30,8 @@ import fetch from 'node-fetch';
 
 describe('credentials', () => {
   const worker = setupServer();
-  setupRequestMockHandlers(worker);
+  beforeAll(() => worker.listen({ onUnhandledRequest: 'error' }));
+  afterEach(() => worker.resetHandlers());
 
   it('handles all valid credentials settings', async () => {
     const config = {