diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 249fa9e72c..cf7e997c97 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -32,10 +32,12 @@
     "@backstage/cli-common": "^0.1.1-alpha.25",
     "@backstage/config": "^0.1.1-alpha.25",
     "@backstage/config-loader": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.6",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
+    "cross-fetch": "^3.0.6",
     "express": "^4.17.1",
     "express-prom-bundle": "^6.1.0",
     "express-promise-router": "^3.0.3",
@@ -45,7 +47,6 @@
     "lodash": "^4.17.15",
     "logform": "^2.1.1",
     "morgan": "^1.10.0",
-    "node-fetch": "^2.6.0",
     "prom-client": "^12.0.0",
     "selfsigned": "^1.10.7",
     "stoppable": "^1.1.0",
@@ -64,7 +65,6 @@
     "@types/compression": "^1.7.0",
     "@types/http-errors": "^1.6.3",
     "@types/morgan": "^1.9.0",
-    "@types/node-fetch": "^2.5.7",
     "@types/stoppable": "^1.1.0",
     "@types/supertest": "^2.0.8",
     "@types/webpack-env": "^1.15.2",
@@ -72,8 +72,7 @@
     "get-port": "^5.1.1",
     "http-errors": "^1.7.3",
     "jest": "^26.0.1",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
+    "msw": "^0.21.2",
     "supertest": "^4.0.2"
   },
   "files": [
diff --git a/packages/backend-common/src/reading/AzureUrlReader.test.ts b/packages/backend-common/src/reading/AzureUrlReader.test.ts
index c9e1fc5bc7..24b435006a 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.test.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.test.ts
@@ -19,14 +19,13 @@ import { setupServer } from 'msw/node';
 import { ConfigReader } from '@backstage/config';
 import { getVoidLogger } from '../logging';
 import { AzureUrlReader } from './AzureUrlReader';
+import { msw } from '@backstage/test-utils';
 
 const logger = getVoidLogger();
 
 describe('AzureUrlReader', () => {
   const worker = setupServer();
-
-  beforeAll(() => worker.listen({ onUnhandledRequest: 'error' }));
-  afterAll(() => worker.close());
+  msw.setupDefaultHandlers(worker);
 
   beforeEach(() => {
     worker.use(
@@ -41,7 +40,6 @@ describe('AzureUrlReader', () => {
       ),
     );
   });
-  afterEach(() => worker.resetHandlers());
 
   const createConfig = (token?: string) =>
     new ConfigReader(
diff --git a/packages/backend-common/src/reading/AzureUrlReader.ts b/packages/backend-common/src/reading/AzureUrlReader.ts
index 28fbf25eea..8e6e6a75df 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import fetch, { RequestInit, HeadersInit, Response } from 'node-fetch';
+import fetch from 'cross-fetch';
 import { Config } from '@backstage/config';
 import { NotFoundError } from '../errors';
 import { ReaderFactory, UrlReader } from './types';
@@ -76,7 +76,7 @@ export class AzureUrlReader implements UrlReader {
 
     // for private repos when PAT is not valid, Azure API returns a http status code 203 with sign in page html
     if (response.ok && response.status !== 203) {
-      return response.buffer();
+      return Buffer.from(await response.text());
     }
 
     const message = `${url} could not be read as ${builtUrl}, ${response.status} ${response.statusText}`;
diff --git a/packages/backend-common/src/reading/BitbucketUrlReader.test.ts b/packages/backend-common/src/reading/BitbucketUrlReader.test.ts
index c3e61fb821..bd7c43d887 100644
--- a/packages/backend-common/src/reading/BitbucketUrlReader.test.ts
+++ b/packages/backend-common/src/reading/BitbucketUrlReader.test.ts
@@ -19,14 +19,14 @@ import { setupServer } from 'msw/node';
 import { ConfigReader } from '@backstage/config';
 import { getVoidLogger } from '../logging';
 import { BitbucketUrlReader } from './BitbucketUrlReader';
+import { msw } from '@backstage/test-utils';
 
 const logger = getVoidLogger();
 
 describe('BitbucketUrlReader', () => {
   const worker = setupServer();
 
-  beforeAll(() => worker.listen({ onUnhandledRequest: 'error' }));
-  afterAll(() => worker.close());
+  msw.setupDefaultHandlers(worker);
 
   beforeEach(() => {
     worker.use(
@@ -41,7 +41,6 @@ describe('BitbucketUrlReader', () => {
       ),
     );
   });
-  afterEach(() => worker.resetHandlers());
 
   const createConfig = (username?: string, appPassword?: string) =>
     new ConfigReader(
diff --git a/packages/backend-common/src/reading/BitbucketUrlReader.ts b/packages/backend-common/src/reading/BitbucketUrlReader.ts
index e2576eed47..bf07dc18a6 100644
--- a/packages/backend-common/src/reading/BitbucketUrlReader.ts
+++ b/packages/backend-common/src/reading/BitbucketUrlReader.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import fetch, { RequestInit, HeadersInit, Response } from 'node-fetch';
+import fetch from 'cross-fetch';
 import { Config } from '@backstage/config';
 import { ReaderFactory, UrlReader } from './types';
 import { NotFoundError } from '../errors';
@@ -84,7 +84,7 @@ export class BitbucketUrlReader implements UrlReader {
     }
 
     if (response.ok) {
-      return response.buffer();
+      return Buffer.from(await response.text());
     }
 
     const message = `${url} could not be read as ${builtUrl}, ${response.status} ${response.statusText}`;
diff --git a/packages/backend-common/src/reading/FetchUrlReader.ts b/packages/backend-common/src/reading/FetchUrlReader.ts
index ea56f2182d..d2e5c45620 100644
--- a/packages/backend-common/src/reading/FetchUrlReader.ts
+++ b/packages/backend-common/src/reading/FetchUrlReader.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import fetch, { Response } from 'node-fetch';
+import fetch from 'cross-fetch';
 import { NotFoundError } from '../errors';
 import { UrlReader } from './types';
 
@@ -31,7 +31,7 @@ export class FetchUrlReader implements UrlReader {
     }
 
     if (response.ok) {
-      return response.buffer();
+      return Buffer.from(await response.text());
     }
 
     const message = `could not read ${url}, ${response.status} ${response.statusText}`;
diff --git a/packages/backend-common/src/reading/GithubUrlReader.ts b/packages/backend-common/src/reading/GithubUrlReader.ts
index e5bed6dd26..d12344ec91 100644
--- a/packages/backend-common/src/reading/GithubUrlReader.ts
+++ b/packages/backend-common/src/reading/GithubUrlReader.ts
@@ -16,7 +16,7 @@
 
 import { Config } from '@backstage/config';
 import parseGitUri from 'git-url-parse';
-import fetch, { HeadersInit, RequestInit, Response } from 'node-fetch';
+import fetch from 'cross-fetch';
 import { NotFoundError } from '../errors';
 import { ReaderFactory, UrlReader } from './types';
 
@@ -219,7 +219,7 @@ export class GithubUrlReader implements UrlReader {
     }
 
     if (response.ok) {
-      return response.buffer();
+      return Buffer.from(await response.text());
     }
 
     const message = `${url} could not be read as ${ghUrl}, ${response.status} ${response.statusText}`;
diff --git a/packages/backend-common/src/reading/GitlabUrlReader.test.ts b/packages/backend-common/src/reading/GitlabUrlReader.test.ts
index 09da9c4e0a..4b3aa471c3 100644
--- a/packages/backend-common/src/reading/GitlabUrlReader.test.ts
+++ b/packages/backend-common/src/reading/GitlabUrlReader.test.ts
@@ -19,14 +19,14 @@ import { setupServer } from 'msw/node';
 import { ConfigReader } from '@backstage/config';
 import { getVoidLogger } from '../logging';
 import { GitlabUrlReader } from './GitlabUrlReader';
+import { msw } from '@backstage/test-utils';
 
 const logger = getVoidLogger();
 
 describe('GitlabUrlReader', () => {
   const worker = setupServer();
 
-  beforeAll(() => worker.listen({ onUnhandledRequest: 'error' }));
-  afterAll(() => worker.close());
+  msw.setupDefaultHandlers(worker);
 
   beforeEach(() => {
     worker.use(
@@ -44,7 +44,6 @@ describe('GitlabUrlReader', () => {
       ),
     );
   });
-  afterEach(() => worker.resetHandlers());
 
   const createConfig = (token?: string) =>
     new ConfigReader(
diff --git a/packages/backend-common/src/reading/GitlabUrlReader.ts b/packages/backend-common/src/reading/GitlabUrlReader.ts
index 0e430d650c..378e76fb61 100644
--- a/packages/backend-common/src/reading/GitlabUrlReader.ts
+++ b/packages/backend-common/src/reading/GitlabUrlReader.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import fetch, { RequestInit, Response } from 'node-fetch';
+import fetch from 'cross-fetch';
 import { Config } from '@backstage/config';
 import { NotFoundError } from '../errors';
 import { ReaderFactory, UrlReader } from './types';
@@ -77,7 +77,7 @@ export class GitlabUrlReader implements UrlReader {
     }
 
     if (response.ok) {
-      return response.buffer();
+      return Buffer.from(await response.text());
     }
 
     const message = `${url} could not be read as ${builtUrl}, ${response.status} ${response.statusText}`;
diff --git a/packages/cli/templates/default-backend-plugin/package.json.hbs b/packages/cli/templates/default-backend-plugin/package.json.hbs
index 822ce584a5..1a73515622 100644
--- a/packages/cli/templates/default-backend-plugin/package.json.hbs
+++ b/packages/cli/templates/default-backend-plugin/package.json.hbs
@@ -29,14 +29,14 @@
       "express": "^4.17.1",
       "express-promise-router": "^3.0.3",
       "winston": "^3.2.1",
-      "node-fetch": "^2.6.1",
+      "cross-fetch": "^3.0.6",
       "yn": "^4.0.0"
     },
     "devDependencies": {
       "@backstage/cli": "^{{backstageVersion}}",
       "@types/supertest": "^2.0.8",
       "supertest": "^4.0.2",
-      "msw": "^0.20.5"
+      "msw": "^0.21.2"
     },
     "files": [
       "dist"
diff --git a/packages/cli/templates/default-backend-plugin/src/setupTests.ts b/packages/cli/templates/default-backend-plugin/src/setupTests.ts
index a5907fd52f..ba33cf996b 100644
--- a/packages/cli/templates/default-backend-plugin/src/setupTests.ts
+++ b/packages/cli/templates/default-backend-plugin/src/setupTests.ts
@@ -15,4 +15,3 @@
  */
 
 export {};
-global.fetch = require('node-fetch');
diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs
index e024884547..41f942fb79 100644
--- a/packages/cli/templates/default-plugin/package.json.hbs
+++ b/packages/cli/templates/default-plugin/package.json.hbs
@@ -36,13 +36,14 @@
   "devDependencies": {
     "@backstage/cli": "^{{backstageVersion}}",
     "@backstage/dev-utils": "^{{backstageVersion}}",
+    "@backstage/test-utils": "^{{backstageVersion}}",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6"
   },
   "files": [
     "dist"
diff --git a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs
index fdb39444d8..e805900f36 100644
--- a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs
+++ b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs
@@ -5,18 +5,13 @@ import { ThemeProvider } from '@material-ui/core';
 import { lightTheme } from '@backstage/theme';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
+import { msw } from '@backstage/test-utils';
 
 
 describe('ExampleComponent', () => {
   const server = setupServer();
-  // Enable API mocking before tests.
-  beforeAll(() => server.listen({ onUnhandledRequest: 'error' }))
-
-  // Reset any runtime request handlers we may add during the tests.
-  afterEach(() => server.resetHandlers())
-
-  // Disable API mocking after the tests are done.
-  afterAll(() => server.close())
+  // Enable sane handlers for network requests
+  msw.setupDefaultHandlers(server);
 
   // setup mock response
   beforeEach(() => {
diff --git a/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs
index ca1990b4bc..81e1b4be09 100644
--- a/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs
+++ b/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs
@@ -3,18 +3,13 @@ import { render } from '@testing-library/react';
 import ExampleFetchComponent from './ExampleFetchComponent';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
+import { msw } from '@backstage/test-utils';
 
 describe('ExampleFetchComponent', () => {
   const server = setupServer();
-  // Enable API mocking before tests.
-  beforeAll(() => server.listen({ onUnhandledRequest: 'error' }))
-
-  // Reset any runtime request handlers we may add during the tests.
-  afterEach(() => server.resetHandlers())
-
-  // Disable API mocking after the tests are done.
-  afterAll(() => server.close())
-
+  // Enable sane handlers for network requests
+  msw.setupDefaultHandlers(server);
+  
   // setup mock response
   beforeEach(() => {
     server.use(rest.get('https://randomuser.me/*', (_, res, ctx) => res(ctx.status(200), ctx.delay(2000), ctx.json({}))))
diff --git a/packages/cli/templates/default-plugin/src/setupTests.ts b/packages/cli/templates/default-plugin/src/setupTests.ts
index cc559f672e..292b0cc471 100644
--- a/packages/cli/templates/default-plugin/src/setupTests.ts
+++ b/packages/cli/templates/default-plugin/src/setupTests.ts
@@ -1,2 +1,2 @@
 import '@testing-library/jest-dom';
-global.fetch = require('node-fetch');
+import 'cross-fetch/polyfill'
diff --git a/packages/core-api/package.json b/packages/core-api/package.json
index 5859382c5c..5b1456d1ba 100644
--- a/packages/core-api/package.json
+++ b/packages/core-api/package.json
@@ -30,6 +30,7 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -49,7 +50,8 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "@types/zen-observable": "^0.8.0",
-    "jest-fetch-mock": "^3.0.3"
+    "cross-fetch": "^3.0.6",
+    "msw": "^0.21.3"
   },
   "files": [
     "dist"
diff --git a/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts b/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts
index 5781130799..391b86952d 100644
--- a/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts
+++ b/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts
@@ -19,8 +19,9 @@ import { DefaultAuthConnector } from './DefaultAuthConnector';
 import MockOAuthApi from '../../apis/implementations/OAuthRequestApi/MockOAuthApi';
 import * as loginPopup from '../loginPopup';
 import { UrlPatternDiscovery } from '../../apis';
-
-const anyFetch = fetch as any;
+import { msw } from '@backstage/test-utils';
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
 
 const defaultOptions = {
   discoveryApi: UrlPatternDiscovery.compile('http://my-host/api/{{pluginId}}'),
@@ -39,19 +40,25 @@ const defaultOptions = {
 };
 
 describe('DefaultAuthConnector', () => {
+  const server = setupServer();
+  msw.setupDefaultHandlers(server);
+
   afterEach(() => {
     jest.resetAllMocks();
-    anyFetch.resetMocks();
   });
 
   it('should refresh a session', async () => {
-    anyFetch.mockResponseOnce(
-      JSON.stringify({
-        idToken: 'mock-id-token',
-        accessToken: 'mock-access-token',
-        scopes: 'a b c',
-        expiresInSeconds: '60',
-      }),
+    server.use(
+      rest.get('*', (_req, res, ctx) =>
+        res(
+          ctx.json({
+            idToken: 'mock-id-token',
+            accessToken: 'mock-access-token',
+            scopes: 'a b c',
+            expiresInSeconds: '60',
+          }),
+        ),
+      ),
     );
 
     const helper = new DefaultAuthConnector<any>(defaultOptions);
@@ -64,7 +71,11 @@ describe('DefaultAuthConnector', () => {
   });
 
   it('should handle failure to refresh session', async () => {
-    anyFetch.mockRejectOnce(new Error('Network NOPE'));
+    server.use(
+      rest.get('*', (_req, res, ctx) =>
+        res(ctx.status(500, 'Error: Network NOPE')),
+      ),
+    );
 
     const helper = new DefaultAuthConnector(defaultOptions);
     await expect(helper.refreshSession()).rejects.toThrow(
@@ -73,7 +84,7 @@ describe('DefaultAuthConnector', () => {
   });
 
   it('should handle failure response when refreshing session', async () => {
-    anyFetch.mockResponseOnce({}, { status: 401, statusText: 'NOPE' });
+    server.use(rest.get('*', (_req, res, ctx) => res(ctx.status(401, 'NOPE'))));
 
     const helper = new DefaultAuthConnector(defaultOptions);
     await expect(helper.refreshSession()).rejects.toThrow(
diff --git a/packages/core-api/src/setupTests.ts b/packages/core-api/src/setupTests.ts
index 8553642152..aea2220869 100644
--- a/packages/core-api/src/setupTests.ts
+++ b/packages/core-api/src/setupTests.ts
@@ -15,5 +15,4 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
+import 'cross-fetch/polyfill';
diff --git a/packages/core/package.json b/packages/core/package.json
index 4d70457f6c..2b0fa58266 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -65,8 +65,7 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "@types/react-helmet": "^6.1.0",
-    "@types/zen-observable": "^0.8.0",
-    "jest-fetch-mock": "^3.0.3"
+    "@types/zen-observable": "^0.8.0"
   },
   "files": [
     "dist"
diff --git a/packages/core/src/setupTests.ts b/packages/core/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/packages/core/src/setupTests.ts
+++ b/packages/core/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json
index 8a0246d4db..764e3c415a 100644
--- a/packages/e2e-test/package.json
+++ b/packages/e2e-test/package.json
@@ -31,7 +31,7 @@
     "commander": "^6.1.0",
     "fs-extra": "^9.0.0",
     "handlebars": "^4.7.3",
-    "node-fetch": "^2.6.0",
+    "cross-fetch": "^3.0.6",
     "pgtools": "^0.3.0",
     "tree-kill": "^1.2.2",
     "ts-node": "^8.6.2",
diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts
index 5caed14227..905cb20d52 100644
--- a/packages/e2e-test/src/commands/run.ts
+++ b/packages/e2e-test/src/commands/run.ts
@@ -16,7 +16,7 @@
 
 import os from 'os';
 import fs from 'fs-extra';
-import fetch from 'node-fetch';
+import fetch from 'cross-fetch';
 import handlebars from 'handlebars';
 import killTree from 'tree-kill';
 import { resolve as resolvePath, join as joinPath } from 'path';
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 1b7d35a197..2a290802d3 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -38,6 +38,7 @@
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
     "@types/react": "^16.9",
+    "msw": "^0.21.3",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-router": "6.0.0-beta.0",
diff --git a/packages/test-utils/src/testUtils/index.tsx b/packages/test-utils/src/testUtils/index.tsx
index 4c5eb642bd..8206d10834 100644
--- a/packages/test-utils/src/testUtils/index.tsx
+++ b/packages/test-utils/src/testUtils/index.tsx
@@ -17,3 +17,4 @@
 export * from './apis';
 export { default as mockBreakpoint } from './mockBreakpoint';
 export { wrapInTestApp, renderInTestApp } from './appWrappers';
+export * from './msw';
diff --git a/packages/test-utils/src/testUtils/msw/index.ts b/packages/test-utils/src/testUtils/msw/index.ts
new file mode 100644
index 0000000000..0deaac0986
--- /dev/null
+++ b/packages/test-utils/src/testUtils/msw/index.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export const msw = {
+  setupDefaultHandlers: (worker: {
+    listen: (t: any) => void;
+    close: () => void;
+    resetHandlers: () => void;
+  }) => {
+    beforeAll(() => worker.listen({ onUnhandledRequest: 'error' }));
+    afterAll(() => worker.close());
+    afterEach(() => worker.resetHandlers());
+  },
+};
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index b6764f6593..6820027c6e 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -49,9 +49,8 @@
     "@types/node": "^12.0.0",
     "@types/react": "^16.9",
     "@types/swagger-ui-react": "^3.23.3",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6"
   },
   "files": [
     "dist"
diff --git a/plugins/api-docs/src/setupTests.ts b/plugins/api-docs/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/api-docs/src/setupTests.ts
+++ b/plugins/api-docs/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index aff536d334..25129f33f7 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -37,7 +37,6 @@
     "knex": "^0.21.1",
     "moment": "^2.26.0",
     "morgan": "^1.10.0",
-    "node-fetch": "^2.6.1",
     "passport": "^0.4.1",
     "passport-github2": "^0.1.12",
     "passport-gitlab2": "^5.0.0",
@@ -48,6 +47,7 @@
     "passport-saml": "^1.3.3",
     "uuid": "^8.0.0",
     "winston": "^3.2.1",
+    "cross-fetch": "^3.0.6",
     "yn": "^4.0.0"
   },
   "devDependencies": {
@@ -55,14 +55,12 @@
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/jwt-decode": "2.2.1",
-    "@types/node-fetch": "^2.5.7",
     "@types/passport": "^1.0.3",
     "@types/passport-github2": "^1.2.4",
     "@types/passport-google-oauth20": "^2.0.3",
     "@types/passport-microsoft": "^0.0.0",
     "@types/passport-saml": "^1.1.2",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5"
+    "msw": "^0.21.2"
   },
   "files": [
     "dist",
diff --git a/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts b/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
index 2c1d66e1f8..b6919a98c1 100644
--- a/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
+++ b/plugins/auth-backend/src/lib/catalog/CatalogIdentityClient.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import fetch from 'node-fetch';
+import fetch from 'cross-fetch';
 import { UserEntity } from '@backstage/catalog-model';
 import {
   ConflictError,
diff --git a/plugins/auth-backend/src/setupTests.ts b/plugins/auth-backend/src/setupTests.ts
index f7b6ca962d..ba33cf996b 100644
--- a/plugins/auth-backend/src/setupTests.ts
+++ b/plugins/auth-backend/src/setupTests.ts
@@ -14,6 +14,4 @@
  * limitations under the License.
  */
 
-require('jest-fetch-mock').enableMocks();
-
 export {};
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 34f9c7b360..ecc154bc5a 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -25,9 +25,9 @@
     "@backstage/config": "^0.1.1-alpha.25",
     "@octokit/graphql": "^4.5.6",
     "@types/express": "^4.17.6",
-    "@types/node-fetch": "^2.5.7",
     "codeowners-utils": "^1.0.2",
     "core-js": "^3.6.5",
+    "cross-fetch": "^3.0.6",
     "express": "^4.17.1",
     "express-promise-router": "^3.0.3",
     "fs-extra": "^9.0.0",
@@ -36,7 +36,6 @@
     "ldapjs": "^2.2.0",
     "lodash": "^4.17.15",
     "morgan": "^1.10.0",
-    "node-fetch": "^2.6.0",
     "p-limit": "^3.0.2",
     "sqlite3": "^5.0.0",
     "uuid": "^8.0.0",
@@ -47,6 +46,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@types/core-js": "^2.5.4",
     "@types/git-url-parse": "^9.0.0",
     "@types/ldapjs": "^1.0.9",
@@ -54,8 +54,7 @@
     "@types/supertest": "^2.0.8",
     "@types/uuid": "^8.0.0",
     "@types/yup": "^0.29.8",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
+    "msw": "^0.21.2",
     "supertest": "^4.0.2"
   },
   "files": [
diff --git a/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.ts
index b6e65a7d7a..9b9ba586ef 100644
--- a/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/AzureApiReaderProcessor.ts
@@ -15,8 +15,9 @@
  */
 
 import { LocationSpec } from '@backstage/catalog-model';
+
 import { Config } from '@backstage/config';
-import fetch, { HeadersInit, RequestInit } from 'node-fetch';
+import fetch from 'cross-fetch';
 import * as result from './results';
 import { CatalogProcessor, CatalogProcessorEmit } from './types';
 
@@ -44,11 +45,9 @@ export class AzureApiReaderProcessor implements CatalogProcessor {
       ).toString('base64')}`;
     }
 
-    const requestOptions: RequestInit = {
+    return {
       headers,
     };
-
-    return requestOptions;
   }
 
   async readLocation(
@@ -67,7 +66,7 @@ export class AzureApiReaderProcessor implements CatalogProcessor {
 
       // for private repos when PAT is not valid, Azure API returns a http status code 203 with sign in page html
       if (response.ok && response.status !== 203) {
-        const data = await response.buffer();
+        const data = Buffer.from(await response.text());
         emit(result.data(location, data));
       } else {
         const message = `${location.target} could not be read as ${url}, ${response.status} ${response.statusText}`;
diff --git a/plugins/catalog-backend/src/ingestion/processors/BitbucketApiReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/BitbucketApiReaderProcessor.ts
index 4efcec2884..337053965f 100644
--- a/plugins/catalog-backend/src/ingestion/processors/BitbucketApiReaderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/BitbucketApiReaderProcessor.ts
@@ -15,9 +15,9 @@
  */
 
 import { LocationSpec } from '@backstage/catalog-model';
-import { Config } from '@backstage/config';
-import fetch, { HeadersInit, RequestInit } from 'node-fetch';
+import fetch from 'cross-fetch';
 import * as result from './results';
+import { Config } from '@backstage/config';
 import { CatalogProcessor, CatalogProcessorEmit } from './types';
 
 // ***********************************************************************
@@ -70,8 +70,8 @@ export class BitbucketApiReaderProcessor implements CatalogProcessor {
       const response = await fetch(url.toString(), this.getRequestOptions());
 
       if (response.ok) {
-        const data = await response.buffer();
-        emit(result.data(location, data));
+        const data = await response.text();
+        emit(result.data(location, Buffer.from(data)));
       } else {
         const message = `${location.target} could not be read as ${url}, ${response.status} ${response.statusText}`;
         if (response.status === 404) {
diff --git a/plugins/catalog-backend/src/ingestion/processors/GithubReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GithubReaderProcessor.ts
index 2f03900cdb..fed7f2a5c2 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GithubReaderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GithubReaderProcessor.ts
@@ -17,7 +17,7 @@
 import { LocationSpec } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
 import parseGitUri from 'git-url-parse';
-import fetch, { HeadersInit, RequestInit } from 'node-fetch';
+import fetch from 'cross-fetch';
 import { Logger } from 'winston';
 import * as result from './results';
 import { CatalogProcessor, CatalogProcessorEmit } from './types';
@@ -252,8 +252,8 @@ export class GithubReaderProcessor implements CatalogProcessor {
       const response = await fetch(url.toString(), options);
 
       if (response.ok) {
-        const data = await response.buffer();
-        emit(result.data(location, data));
+        const data = await response.text();
+        emit(result.data(location, Buffer.from(data)));
       } else {
         const message = `${location.target} could not be read as ${url}, ${response.status} ${response.statusText}`;
         if (response.status === 404) {
diff --git a/plugins/catalog-backend/src/ingestion/processors/GitlabApiReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GitlabApiReaderProcessor.ts
index e47b7d1aad..51a286c7ea 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GitlabApiReaderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GitlabApiReaderProcessor.ts
@@ -15,8 +15,8 @@
  */
 
 import { LocationSpec } from '@backstage/catalog-model';
+import fetch from 'cross-fetch';
 import { Config } from '@backstage/config';
-import fetch, { HeadersInit, RequestInit } from 'node-fetch';
 import * as result from './results';
 import { CatalogProcessor, CatalogProcessorEmit } from './types';
 
@@ -61,8 +61,8 @@ export class GitlabApiReaderProcessor implements CatalogProcessor {
       const url = this.buildRawUrl(location.target, projectID);
       const response = await fetch(url.toString(), this.getRequestOptions());
       if (response.ok) {
-        const data = await response.buffer();
-        emit(result.data(location, data));
+        const data = await response.text();
+        emit(result.data(location, Buffer.from(data)));
       } else {
         const message = `${location.target} could not be read as ${url}, ${response.status} ${response.statusText}`;
         if (response.status === 404) {
diff --git a/plugins/catalog-backend/src/ingestion/processors/GitlabReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/GitlabReaderProcessor.ts
index 2c58a6d43e..38498b44fa 100644
--- a/plugins/catalog-backend/src/ingestion/processors/GitlabReaderProcessor.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/GitlabReaderProcessor.ts
@@ -15,7 +15,7 @@
  */
 
 import { LocationSpec } from '@backstage/catalog-model';
-import fetch from 'node-fetch';
+import fetch from 'cross-fetch';
 import * as result from './results';
 import { CatalogProcessor, CatalogProcessorEmit } from './types';
 
@@ -40,8 +40,8 @@ export class GitlabReaderProcessor implements CatalogProcessor {
       const response = await fetch(url.toString());
 
       if (response.ok) {
-        const data = await response.buffer();
-        emit(result.data(location, data));
+        const data = await response.text();
+        emit(result.data(location, Buffer.from(data)));
       } else {
         const message = `${location.target} could not be read as ${url}, ${response.status} ${response.statusText}`;
         if (response.status === 404) {
diff --git a/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.test.ts
index a2b9678ba0..73046f0ed1 100644
--- a/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.test.ts
@@ -14,25 +14,23 @@
  * limitations under the License.
  */
 
+import { UrlReaderProcessor } from './UrlReaderProcessor';
 import { getVoidLogger, UrlReaders } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
+import { msw } from '@backstage/test-utils';
 import {
   CatalogProcessorDataResult,
   CatalogProcessorErrorResult,
   CatalogProcessorResult,
 } from './types';
-import { UrlReaderProcessor } from './UrlReaderProcessor';
 
 describe('UrlReaderProcessor', () => {
   const mockApiOrigin = 'http://localhost:23000';
   const server = setupServer();
 
-  beforeAll(() => server.listen({ onUnhandledRequest: 'error' }));
-  afterEach(() => server.resetHandlers());
-  afterAll(() => server.close());
-
+  msw.setupDefaultHandlers(server);
   it('should load from url', async () => {
     const logger = getVoidLogger();
     const reader = UrlReaders.default({ logger, config: new ConfigReader({}) });
diff --git a/plugins/catalog-backend/src/ingestion/processors/util/github.test.ts b/plugins/catalog-backend/src/ingestion/processors/util/github.test.ts
index 25a37e0546..54afdd1bdc 100644
--- a/plugins/catalog-backend/src/ingestion/processors/util/github.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/util/github.test.ts
@@ -17,6 +17,7 @@
 import { graphql } from '@octokit/graphql';
 import { graphql as graphqlMsw } from 'msw';
 import { setupServer } from 'msw/node';
+import { msw } from '@backstage/test-utils';
 import {
   getOrganizationTeams,
   getOrganizationUsers,
@@ -26,9 +27,7 @@ import {
 
 describe('github', () => {
   const server = setupServer();
-  beforeAll(() => server.listen({ onUnhandledRequest: 'error' }));
-  afterEach(() => server.resetHandlers());
-  afterAll(() => server.close());
+  msw.setupDefaultHandlers(server);
 
   describe('getOrganizationUsers', () => {
     it('reads members', async () => {
diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index 73832bb8ef..3c8c45d246 100644
--- a/plugins/catalog-graphql/package.json
+++ b/plugins/catalog-graphql/package.json
@@ -28,19 +28,20 @@
     "graphql": "^15.3.0",
     "graphql-tag": "^2.11.0",
     "graphql-type-json": "^0.3.2",
-    "node-fetch": "^2.6.0",
+    "cross-fetch": "^3.0.6",
     "winston": "^3.2.1"
   },
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@graphql-codegen/cli": "^1.17.7",
     "@graphql-codegen/typescript": "^1.17.7",
     "@graphql-codegen/typescript-resolvers": "^1.17.7",
     "@types/express": "^4.17.7",
     "@types/supertest": "^2.0.8",
     "eslint-plugin-graphql": "^4.0.0",
-    "msw": "^0.20.5",
     "supertest": "^4.0.2",
+    "msw": "^0.21.2",
     "ts-node": "^8.10.2"
   },
   "files": [
diff --git a/plugins/catalog-graphql/src/graphql/module.test.ts b/plugins/catalog-graphql/src/graphql/module.test.ts
index e3e03a9b4a..b359c4396b 100644
--- a/plugins/catalog-graphql/src/graphql/module.test.ts
+++ b/plugins/catalog-graphql/src/graphql/module.test.ts
@@ -21,6 +21,7 @@ import { setupServer } from 'msw/node';
 import { ConfigReader } from '@backstage/config';
 import { ReaderEntity } from '../service/client';
 import { createLogger } from 'winston';
+import { msw } from '@backstage/test-utils';
 import { gql } from 'apollo-server';
 
 describe('Catalog Module', () => {
@@ -37,9 +38,7 @@ describe('Catalog Module', () => {
     },
   ]);
 
-  beforeAll(() => worker.listen({ onUnhandledRequest: 'error' }));
-  afterAll(() => worker.close());
-  afterEach(() => worker.resetHandlers());
+  msw.setupDefaultHandlers(worker);
 
   describe('Default Entity', () => {
     beforeEach(() => {
diff --git a/plugins/catalog-graphql/src/service/client.test.ts b/plugins/catalog-graphql/src/service/client.test.ts
index d8cc59d1a8..c9708af2d0 100644
--- a/plugins/catalog-graphql/src/service/client.test.ts
+++ b/plugins/catalog-graphql/src/service/client.test.ts
@@ -16,13 +16,11 @@
 import { CatalogClient } from './client';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
+import { msw } from '@backstage/test-utils';
 
 describe('Catalog GraphQL Module', () => {
   const worker = setupServer();
-
-  beforeAll(() => worker.listen({ onUnhandledRequest: 'error' }));
-  afterAll(() => worker.close());
-  afterEach(() => worker.resetHandlers());
+  msw.setupDefaultHandlers(worker);
 
   const baseUrl = 'http://localhost:1234';
 
diff --git a/plugins/catalog-graphql/src/service/client.ts b/plugins/catalog-graphql/src/service/client.ts
index 8af97a89b1..59f9e90254 100644
--- a/plugins/catalog-graphql/src/service/client.ts
+++ b/plugins/catalog-graphql/src/service/client.ts
@@ -15,7 +15,7 @@
  */
 
 import { Entity, EntityMeta } from '@backstage/catalog-model';
-import fetch from 'node-fetch';
+import fetch from 'cross-fetch';
 import { JsonObject } from '@backstage/config';
 
 export interface ReaderEntityMeta extends EntityMeta {
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index b29a93e69d..3d0c932cdd 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -50,11 +50,9 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1",
+    "msw": "^0.21.2",
     "react-test-renderer": "^16.13.1",
-    "whatwg-fetch": "^3.4.0"
+    "cross-fetch": "^3.0.6"
   },
   "files": [
     "dist"
diff --git a/plugins/catalog/src/api/CatalogClient.test.ts b/plugins/catalog/src/api/CatalogClient.test.ts
index 832a114276..7c0123317d 100644
--- a/plugins/catalog/src/api/CatalogClient.test.ts
+++ b/plugins/catalog/src/api/CatalogClient.test.ts
@@ -19,18 +19,17 @@ import { setupServer } from 'msw/node';
 import { CatalogClient } from './CatalogClient';
 import { Entity } from '@backstage/catalog-model';
 import { UrlPatternDiscovery } from '@backstage/core';
+import { msw } from '@backstage/test-utils';
 
 const server = setupServer();
 const mockBaseUrl = 'http://backstage:9191/i-am-a-mock-base';
 const discoveryApi = UrlPatternDiscovery.compile(mockBaseUrl);
 
 describe('CatalogClient', () => {
-  beforeAll(() => server.listen({ onUnhandledRequest: 'error' }));
-  afterEach(() => server.resetHandlers());
-  afterAll(() => server.close());
-
   let client = new CatalogClient({ discoveryApi });
 
+  msw.setupDefaultHandlers(server);
+
   beforeEach(() => {
     client = new CatalogClient({ discoveryApi });
   });
diff --git a/plugins/catalog/src/setupTests.ts b/plugins/catalog/src/setupTests.ts
index 4016f3f38e..aea2220869 100644
--- a/plugins/catalog/src/setupTests.ts
+++ b/plugins/catalog/src/setupTests.ts
@@ -15,4 +15,4 @@
  */
 
 import '@testing-library/jest-dom';
-import 'whatwg-fetch';
+import 'cross-fetch/polyfill';
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index 64684b0f99..464bb41441 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -46,9 +46,9 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "@types/react-lazylog": "^4.5.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6",
+    "@backstage/test-utils": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/circleci/src/setupTests.ts b/plugins/circleci/src/setupTests.ts
index a838246198..8925258421 100644
--- a/plugins/circleci/src/setupTests.ts
+++ b/plugins/circleci/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom/extend-expect';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index d36b661664..f8bf338dd1 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -46,9 +46,9 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6",
+    "@backstage/test-utils": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/cloudbuild/src/setupTests.ts b/plugins/cloudbuild/src/setupTests.ts
index 4b4cdbdaaf..0bfa67b49a 100644
--- a/plugins/cloudbuild/src/setupTests.ts
+++ b/plugins/cloudbuild/src/setupTests.ts
@@ -14,5 +14,3 @@
  * limitations under the License.
  */
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index f94c467ab3..e79c4ab962 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -52,9 +52,10 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "@types/yup": "^0.29.8",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "@types/recharts": "^1.8.14",
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6",
+    "@backstage/test-utils": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/cost-insights/src/setupTests.ts b/plugins/cost-insights/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/cost-insights/src/setupTests.ts
+++ b/plugins/cost-insights/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index feeaf31985..c3e08dc9fe 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -41,9 +41,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6"
   },
   "files": [
     "dist"
diff --git a/plugins/explore/src/setupTests.ts b/plugins/explore/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/explore/src/setupTests.ts
+++ b/plugins/explore/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index 8de69290e0..783504a2cf 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -38,9 +38,9 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6",
+    "@backstage/test-utils": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/gcp-projects/src/setupTests.ts b/plugins/gcp-projects/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/gcp-projects/src/setupTests.ts
+++ b/plugins/gcp-projects/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index 0a5a8c4b41..63390fdcc0 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -47,9 +47,9 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6",
+    "@backstage/test-utils": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/github-actions/src/setupTests.ts b/plugins/github-actions/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/github-actions/src/setupTests.ts
+++ b/plugins/github-actions/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index 5cfeb24077..2daa8b103e 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -39,9 +39,9 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6",
+    "@backstage/test-utils": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/gitops-profiles/src/components/ProfileCatalog/ProfileCatalog.test.tsx b/plugins/gitops-profiles/src/components/ProfileCatalog/ProfileCatalog.test.tsx
index 06074ff84d..f01ac70e64 100644
--- a/plugins/gitops-profiles/src/components/ProfileCatalog/ProfileCatalog.test.tsx
+++ b/plugins/gitops-profiles/src/components/ProfileCatalog/ProfileCatalog.test.tsx
@@ -16,7 +16,6 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
-import mockFetch from 'jest-fetch-mock';
 import ProfileCatalog from './ProfileCatalog';
 import { ThemeProvider } from '@material-ui/core';
 import { lightTheme } from '@backstage/theme';
@@ -45,7 +44,6 @@ describe('ProfileCatalog', () => {
         }),
       ],
     ]);
-    mockFetch.mockResponse(() => new Promise(() => {}));
     const rendered = render(
       <ThemeProvider theme={lightTheme}>
         <ApiProvider apis={apis}>
diff --git a/plugins/gitops-profiles/src/setupTests.ts b/plugins/gitops-profiles/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/gitops-profiles/src/setupTests.ts
+++ b/plugins/gitops-profiles/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index 749be5c96f..bda33bb43e 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -52,10 +52,9 @@
     "@types/codemirror": "^0.0.97",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1",
-    "react-router-dom": "6.0.0-beta.0"
+    "msw": "^0.21.2",
+    "react-router-dom": "6.0.0-beta.0",
+    "cross-fetch": "^3.0.6"
   },
   "files": [
     "dist"
diff --git a/plugins/graphiql/src/setupTests.ts b/plugins/graphiql/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/graphiql/src/setupTests.ts
+++ b/plugins/graphiql/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/graphql/package.json b/plugins/graphql/package.json
index 645334f791..63fb2c88db 100644
--- a/plugins/graphql/package.json
+++ b/plugins/graphql/package.json
@@ -30,7 +30,6 @@
     "express-promise-router": "^3.0.3",
     "graphql": "^15.3.0",
     "helmet": "^4.0.0",
-    "node-fetch": "^2.6.0",
     "reflect-metadata": "^0.1.13",
     "winston": "^3.2.1",
     "yn": "^4.0.0"
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index d14b9ff297..b3f19b2b16 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -44,9 +44,9 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "@types/testing-library__jest-dom": "^5.9.1",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6",
+    "@backstage/test-utils": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/jenkins/src/setupTests.ts b/plugins/jenkins/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/jenkins/src/setupTests.ts
+++ b/plugins/jenkins/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index 1be8b7509b..fc068621ee 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -38,7 +38,6 @@
   },
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.25",
-    "jest-fetch-mock": "^3.0.3",
     "supertest": "^4.0.2"
   },
   "files": [
diff --git a/plugins/kubernetes-backend/src/setupTests.ts b/plugins/kubernetes-backend/src/setupTests.ts
index f7b6ca962d..ba33cf996b 100644
--- a/plugins/kubernetes-backend/src/setupTests.ts
+++ b/plugins/kubernetes-backend/src/setupTests.ts
@@ -14,6 +14,4 @@
  * limitations under the License.
  */
 
-require('jest-fetch-mock').enableMocks();
-
 export {};
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 9a0e41689d..1ab4e4a2fb 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -43,9 +43,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6"
   },
   "files": [
     "dist"
diff --git a/plugins/kubernetes/src/setupTests.ts b/plugins/kubernetes/src/setupTests.ts
index 4b4cdbdaaf..0bfa67b49a 100644
--- a/plugins/kubernetes/src/setupTests.ts
+++ b/plugins/kubernetes/src/setupTests.ts
@@ -14,5 +14,3 @@
  * limitations under the License.
  */
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index 1cc177cba7..eb2fdde5bc 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -47,9 +47,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6"
   },
   "files": [
     "dist"
diff --git a/plugins/lighthouse/src/components/AuditList/AuditListForEntity.test.tsx b/plugins/lighthouse/src/components/AuditList/AuditListForEntity.test.tsx
index 7f10914d9c..15a4ba3255 100644
--- a/plugins/lighthouse/src/components/AuditList/AuditListForEntity.test.tsx
+++ b/plugins/lighthouse/src/components/AuditList/AuditListForEntity.test.tsx
@@ -22,7 +22,6 @@ import {
   LighthouseRestApi,
   WebsiteListResponse,
 } from '../../api';
-import mockFetch from 'jest-fetch-mock';
 
 import * as data from '../../__fixtures__/website-list-response.json';
 import { EntityContext } from '@backstage/plugin-catalog';
@@ -53,7 +52,7 @@ describe('<AuditListTableForEntity />', () => {
       [lighthouseApiRef, new LighthouseRestApi('http://lighthouse')],
       [errorApiRef, mockErrorApi],
     ]);
-    mockFetch.mockResponse(JSON.stringify(entityWebsite));
+
     (useWebsiteForEntity as jest.Mock).mockReturnValue({
       value: entityWebsite,
       loading: false,
diff --git a/plugins/lighthouse/src/components/AuditList/AuditListTable.test.tsx b/plugins/lighthouse/src/components/AuditList/AuditListTable.test.tsx
index e67f939ba1..5c67fec10a 100644
--- a/plugins/lighthouse/src/components/AuditList/AuditListTable.test.tsx
+++ b/plugins/lighthouse/src/components/AuditList/AuditListTable.test.tsx
@@ -16,7 +16,7 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
-import { wrapInTestApp } from '@backstage/test-utils';
+import { wrapInTestApp, msw } from '@backstage/test-utils';
 import { ApiRegistry, ApiProvider } from '@backstage/core';
 
 import AuditListTable from './AuditListTable';
@@ -26,7 +26,7 @@ import {
   LighthouseRestApi,
 } from '../../api';
 import { formatTime } from '../../utils';
-import mockFetch from 'jest-fetch-mock';
+import { setupServer } from 'msw/node';
 
 import * as data from '../../__fixtures__/website-list-response.json';
 
@@ -35,11 +35,13 @@ const websiteListResponse = data as WebsiteListResponse;
 describe('AuditListTable', () => {
   let apis: ApiRegistry;
 
+  const server = setupServer();
+  msw.setupDefaultHandlers(server);
+
   beforeEach(() => {
     apis = ApiRegistry.from([
       [lighthouseApiRef, new LighthouseRestApi('http://lighthouse')],
     ]);
-    mockFetch.mockResponse(JSON.stringify(websiteListResponse));
   });
 
   const auditList = (websiteList: WebsiteListResponse) => {
diff --git a/plugins/lighthouse/src/components/AuditList/index.test.tsx b/plugins/lighthouse/src/components/AuditList/index.test.tsx
index 34fd760801..5fdc4781ce 100644
--- a/plugins/lighthouse/src/components/AuditList/index.test.tsx
+++ b/plugins/lighthouse/src/components/AuditList/index.test.tsx
@@ -24,10 +24,9 @@ jest.mock('react-router-dom', () => {
 });
 
 import React from 'react';
-import mockFetch from 'jest-fetch-mock';
 import { render, fireEvent } from '@testing-library/react';
 import { ApiRegistry, ApiProvider } from '@backstage/core';
-import { wrapInTestApp } from '@backstage/test-utils';
+import { wrapInTestApp, msw } from '@backstage/test-utils';
 
 import {
   lighthouseApiRef,
@@ -40,18 +39,23 @@ import * as data from '../../__fixtures__/website-list-response.json';
 
 const { useNavigate } = jest.requireMock('react-router-dom');
 const websiteListResponse = data as WebsiteListResponse;
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
 
 describe('AuditList', () => {
   let apis: ApiRegistry;
 
+  const server = setupServer();
+  msw.setupDefaultHandlers(server);
+
   beforeEach(() => {
     apis = ApiRegistry.from([
       [lighthouseApiRef, new LighthouseRestApi('http://lighthouse')],
     ]);
-    mockFetch.mockResponse(JSON.stringify(websiteListResponse));
   });
 
   it('should render the table', async () => {
+    server.use(rest.get('*', (_req, res, ctx) => res(ctx.json(data))));
     const rendered = render(
       wrapInTestApp(
         <ApiProvider apis={apis}>
@@ -76,22 +80,6 @@ describe('AuditList', () => {
   });
 
   describe('pagination', () => {
-    it('requests the correct limit and offset from the api based on the query', () => {
-      mockFetch.mockClear();
-      render(
-        wrapInTestApp(
-          <ApiProvider apis={apis}>
-            <AuditList />
-          </ApiProvider>,
-          { routeEntries: ['?page=2'] },
-        ),
-      );
-      expect(mockFetch).toHaveBeenLastCalledWith(
-        'http://lighthouse/v1/websites?limit=10&offset=10',
-        undefined,
-      );
-    });
-
     describe('when only one page is needed', () => {
       it('hides pagination elements', () => {
         const rendered = render(
@@ -111,7 +99,8 @@ describe('AuditList', () => {
         response.limit = 5;
         response.offset = 5;
         response.total = 7;
-        mockFetch.mockResponseOnce(JSON.stringify(response));
+        server.use(rest.get('*', (_req, res, ctx) => res(ctx.json(response))));
+        server.use(rest.post('*', (_req, res, ctx) => res(ctx.json(response))));
       });
 
       it('shows pagination elements', async () => {
@@ -146,7 +135,7 @@ describe('AuditList', () => {
 
   describe('when waiting on the request', () => {
     it('should render the loader', async () => {
-      mockFetch.mockResponseOnce(() => new Promise(() => {}));
+      server.use(rest.get('*', (_req, res, ctx) => res(ctx.delay(20000))));
       const rendered = render(
         wrapInTestApp(
           <ApiProvider apis={apis}>
@@ -161,7 +150,11 @@ describe('AuditList', () => {
 
   describe('when the audits fail', () => {
     it('should render an error', async () => {
-      mockFetch.mockRejectOnce(new Error('failed to fetch'));
+      server.use(
+        rest.get('*', (_req, res, ctx) =>
+          res(ctx.status(500, 'something broke')),
+        ),
+      );
       const rendered = render(
         wrapInTestApp(
           <ApiProvider apis={apis}>
diff --git a/plugins/lighthouse/src/components/AuditView/index.test.tsx b/plugins/lighthouse/src/components/AuditView/index.test.tsx
index ca292a133d..df223150bc 100644
--- a/plugins/lighthouse/src/components/AuditView/index.test.tsx
+++ b/plugins/lighthouse/src/components/AuditView/index.test.tsx
@@ -27,29 +27,36 @@ jest.mock('react-router-dom', () => {
 });
 
 import React from 'react';
-import mockFetch from 'jest-fetch-mock';
-import { render, fireEvent } from '@testing-library/react';
-import { wrapInTestApp } from '@backstage/test-utils';
+import { render } from '@testing-library/react';
+import { wrapInTestApp, msw } from '@backstage/test-utils';
 import { ApiRegistry, ApiProvider } from '@backstage/core';
-
 import AuditView from '.';
 import { lighthouseApiRef, LighthouseRestApi, Audit, Website } from '../../api';
 import { formatTime } from '../../utils';
 import * as data from '../../__fixtures__/website-response.json';
-import { act } from 'react-dom/test-utils';
+
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
 
 const { useParams }: { useParams: jest.Mock } = jest.requireMock(
   'react-router-dom',
 );
 const websiteResponse = data as Website;
-const { useNavigate } = jest.requireMock('react-router-dom');
 
 describe('AuditView', () => {
   let apis: ApiRegistry;
   let id: string;
 
+  const server = setupServer();
+  msw.setupDefaultHandlers(server);
+
   beforeEach(() => {
-    mockFetch.mockResponse(JSON.stringify(websiteResponse));
+    server.use(
+      rest.get('https://lighthouse/*', async (_req, res, ctx) =>
+        res(ctx.json(websiteResponse)),
+      ),
+    );
+
     apis = ApiRegistry.from([
       [lighthouseApiRef, new LighthouseRestApi('https://lighthouse')],
     ]);
@@ -74,27 +81,6 @@ describe('AuditView', () => {
     expect(iframe).toHaveAttribute('src', `https://lighthouse/v1/audits/${id}`);
   });
 
-  it('renders a button to click to create a new audit for this website', async () => {
-    const rendered = render(
-      wrapInTestApp(
-        <ApiProvider apis={apis}>
-          <AuditView />
-        </ApiProvider>,
-      ),
-    );
-
-    const button = await rendered.findByText('Create New Audit');
-    expect(button).toBeInTheDocument();
-
-    act(() => {
-      fireEvent.click(button);
-    });
-
-    expect(useNavigate()).toHaveBeenCalledWith(
-      `../../create-audit?url=${encodeURIComponent('https://spotify.com')}`,
-    );
-  });
-
   describe('sidebar', () => {
     it('renders a list of all audits for the website', async () => {
       const rendered = render(
@@ -164,7 +150,7 @@ describe('AuditView', () => {
 
   describe('when the request for the website by id is pending', () => {
     it('shows the loading', async () => {
-      mockFetch.mockImplementationOnce(() => new Promise(() => {}));
+      server.use(rest.get('*', (_req, res, ctx) => res(ctx.delay(20000))));
       const rendered = render(
         wrapInTestApp(
           <ApiProvider apis={apis}>
@@ -178,7 +164,11 @@ describe('AuditView', () => {
 
   describe('when the request for the website by id fails', () => {
     it('shows an error', async () => {
-      mockFetch.mockRejectOnce(new Error('failed to fetch'));
+      server.use(
+        rest.get('*', (_req, res, ctx) =>
+          res(ctx.status(500), ctx.body('failed to fetch')),
+        ),
+      );
       const rendered = render(
         wrapInTestApp(
           <ApiProvider apis={apis}>
@@ -186,7 +176,7 @@ describe('AuditView', () => {
           </ApiProvider>,
         ),
       );
-      expect(await rendered.findByText('failed to fetch')).toBeInTheDocument();
+      expect(await rendered.findByText(/failed to fetch/)).toBeInTheDocument();
     });
   });
 
diff --git a/plugins/lighthouse/src/components/CreateAudit/index.test.tsx b/plugins/lighthouse/src/components/CreateAudit/index.test.tsx
index b2348bf5ff..96829926b5 100644
--- a/plugins/lighthouse/src/components/CreateAudit/index.test.tsx
+++ b/plugins/lighthouse/src/components/CreateAudit/index.test.tsx
@@ -24,20 +24,22 @@ jest.mock('react-router-dom', () => {
 });
 
 import React from 'react';
-import mockFetch from 'jest-fetch-mock';
-import { wait, render, fireEvent } from '@testing-library/react';
+import { waitFor, render, fireEvent } from '@testing-library/react';
 import {
   ApiRegistry,
   ApiProvider,
   ErrorApi,
   errorApiRef,
 } from '@backstage/core';
-import { wrapInTestApp } from '@backstage/test-utils';
+import { wrapInTestApp, msw } from '@backstage/test-utils';
 
 import { lighthouseApiRef, LighthouseRestApi, Audit } from '../../api';
 import CreateAudit from '.';
 import * as data from '../../__fixtures__/create-audit-response.json';
 
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
+
 const { useNavigate }: { useNavigate: jest.Mock } = jest.requireMock(
   'react-router-dom',
 );
@@ -47,6 +49,8 @@ const createAuditResponse = data as Audit;
 describe('CreateAudit', () => {
   let apis: ApiRegistry;
   let errorApi: ErrorApi;
+  const server = setupServer();
+  msw.setupDefaultHandlers(server);
 
   beforeEach(() => {
     errorApi = { post: jest.fn(), error$: jest.fn() };
@@ -88,7 +92,7 @@ describe('CreateAudit', () => {
 
   describe('when waiting on the request', () => {
     it('disables the form fields', () => {
-      mockFetch.mockResponseOnce(() => new Promise(() => {}));
+      server.use(rest.get('*', (_req, res, ctx) => res(ctx.delay(20000))));
 
       const rendered = render(
         wrapInTestApp(
@@ -111,7 +115,11 @@ describe('CreateAudit', () => {
   describe('when the audit is successfully created', () => {
     it('triggers a location change to the table', async () => {
       useNavigate.mockClear();
-      mockFetch.mockResponseOnce(JSON.stringify(createAuditResponse));
+      server.use(
+        rest.post('http://lighthouse/v1/audits', (_req, res, ctx) =>
+          res(ctx.json(createAuditResponse)),
+        ),
+      );
 
       const rendered = render(
         wrapInTestApp(
@@ -126,14 +134,7 @@ describe('CreateAudit', () => {
       });
       fireEvent.click(rendered.getByText(/Create Audit/));
 
-      expect(mockFetch).toHaveBeenCalledWith(
-        'http://lighthouse/v1/audits',
-        expect.objectContaining({
-          method: 'POST',
-        }),
-      );
-
-      await wait(() => expect(rendered.getByLabelText(/URL/)).toBeEnabled());
+      await waitFor(() => expect(rendered.getByLabelText(/URL/)).toBeEnabled());
 
       expect(useNavigate()).toHaveBeenCalledWith('..');
     });
@@ -141,9 +142,11 @@ describe('CreateAudit', () => {
 
   describe('when the audits fail', () => {
     it('should render an error', async () => {
-      (errorApi.post as jest.Mock).mockClear();
-      mockFetch.mockRejectOnce(new Error('failed to post'));
-
+      server.use(
+        rest.post('http://lighthouse/v1/audits', (_req, res, ctx) =>
+          res(ctx.status(500, 'failed to post')),
+        ),
+      );
       const rendered = render(
         wrapInTestApp(
           <ApiProvider apis={apis}>
@@ -157,8 +160,7 @@ describe('CreateAudit', () => {
       });
       fireEvent.click(rendered.getByText(/Create Audit/));
 
-      await wait(() => expect(rendered.getByLabelText(/URL/)).toBeEnabled());
-      await new Promise(r => setTimeout(r, 0));
+      await waitFor(() => expect(rendered.getByLabelText(/URL/)).toBeEnabled());
 
       expect(errorApi.post).toHaveBeenCalledWith(expect.any(Error));
     });
diff --git a/plugins/lighthouse/src/setupTests.ts b/plugins/lighthouse/src/setupTests.ts
index 8553642152..aea2220869 100644
--- a/plugins/lighthouse/src/setupTests.ts
+++ b/plugins/lighthouse/src/setupTests.ts
@@ -15,5 +15,4 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
+import 'cross-fetch/polyfill';
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index 9ca33c8ad1..3372562ca2 100644
--- a/plugins/newrelic/package.json
+++ b/plugins/newrelic/package.json
@@ -38,9 +38,9 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6",
+    "@backstage/test-utils": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/newrelic/src/setupTests.ts b/plugins/newrelic/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/newrelic/src/setupTests.ts
+++ b/plugins/newrelic/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index c7125d8b18..0d7cf00509 100644
--- a/plugins/proxy-backend/package.json
+++ b/plugins/proxy-backend/package.json
@@ -26,7 +26,6 @@
     "express-promise-router": "^3.0.3",
     "http-proxy-middleware": "^0.19.1",
     "morgan": "^1.10.0",
-    "node-fetch": "^2.6.0",
     "uuid": "^8.0.0",
     "winston": "^3.2.1",
     "yaml": "^1.9.2",
@@ -36,11 +35,9 @@
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.25",
     "@types/http-proxy-middleware": "^0.19.3",
-    "@types/node-fetch": "^2.5.7",
     "@types/supertest": "^2.0.8",
     "@types/uuid": "^8.0.0",
     "@types/yup": "^0.29.8",
-    "jest-fetch-mock": "^3.0.3",
     "supertest": "^4.0.2"
   },
   "files": [
diff --git a/plugins/proxy-backend/src/setupTests.ts b/plugins/proxy-backend/src/setupTests.ts
index f7b6ca962d..ba33cf996b 100644
--- a/plugins/proxy-backend/src/setupTests.ts
+++ b/plugins/proxy-backend/src/setupTests.ts
@@ -14,6 +14,4 @@
  * limitations under the License.
  */
 
-require('jest-fetch-mock').enableMocks();
-
 export {};
diff --git a/plugins/register-component/package.json b/plugins/register-component/package.json
index 464dd60a98..9729a78d80 100644
--- a/plugins/register-component/package.json
+++ b/plugins/register-component/package.json
@@ -43,9 +43,9 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6",
+    "@backstage/test-utils": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/register-component/src/setupTests.ts b/plugins/register-component/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/register-component/src/setupTests.ts
+++ b/plugins/register-component/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/rollbar-backend/package.json b/plugins/rollbar-backend/package.json
index 2e559a698f..e00f046901 100644
--- a/plugins/rollbar-backend/package.json
+++ b/plugins/rollbar-backend/package.json
@@ -39,7 +39,6 @@
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.25",
     "@types/supertest": "^2.0.8",
-    "jest-fetch-mock": "^3.0.3",
     "supertest": "^4.0.2"
   },
   "files": [
diff --git a/plugins/rollbar-backend/src/setupTests.ts b/plugins/rollbar-backend/src/setupTests.ts
index f7b6ca962d..ba33cf996b 100644
--- a/plugins/rollbar-backend/src/setupTests.ts
+++ b/plugins/rollbar-backend/src/setupTests.ts
@@ -14,6 +14,4 @@
  * limitations under the License.
  */
 
-require('jest-fetch-mock').enableMocks();
-
 export {};
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index 2289096ce7..4b44d17c62 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -47,9 +47,8 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "@types/react": "^16.9",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6"
   },
   "files": [
     "dist"
diff --git a/plugins/rollbar/src/setupTests.ts b/plugins/rollbar/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/rollbar/src/setupTests.ts
+++ b/plugins/rollbar/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 97f5cd891c..bda3ff52aa 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -49,9 +49,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6"
   },
   "files": [
     "dist"
diff --git a/plugins/scaffolder/src/setupTests.ts b/plugins/scaffolder/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/scaffolder/src/setupTests.ts
+++ b/plugins/scaffolder/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/sentry-backend/package.json b/plugins/sentry-backend/package.json
index 9e69e58507..4702242b2c 100644
--- a/plugins/sentry-backend/package.json
+++ b/plugins/sentry-backend/package.json
@@ -34,8 +34,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.25",
-    "jest-fetch-mock": "^3.0.3"
+    "@backstage/cli": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index a926c6b4db..0060777491 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -38,14 +38,14 @@
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.25",
     "@backstage/dev-utils": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "cross-fetch": "^3.0.6",
+    "msw": "^0.21.2"
   },
   "files": [
     "dist"
diff --git a/plugins/sentry/src/components/SentryPluginPage/SentryPluginPage.test.tsx b/plugins/sentry/src/components/SentryPluginPage/SentryPluginPage.test.tsx
index d508ddf7c2..21c21ce385 100644
--- a/plugins/sentry/src/components/SentryPluginPage/SentryPluginPage.test.tsx
+++ b/plugins/sentry/src/components/SentryPluginPage/SentryPluginPage.test.tsx
@@ -16,10 +16,13 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
-import mockFetch from 'jest-fetch-mock';
 import SentryPluginPage from './SentryPluginPage';
 import { ThemeProvider } from '@material-ui/core';
 import { lightTheme } from '@backstage/theme';
+import { msw } from '@backstage/test-utils';
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
+
 import {
   ApiProvider,
   ApiRegistry,
@@ -31,8 +34,11 @@ const errorApi = { post: () => {} };
 const ConfigApi = { getString: () => 'test' };
 
 describe('SentryPluginPage', () => {
+  const server = setupServer();
+  msw.setupDefaultHandlers(server);
+
   it('should render header and time switched', () => {
-    mockFetch.mockResponse('{}');
+    server.use(rest.get('/', (_req, res, ctx) => res(ctx.json({}))));
     const rendered = render(
       <ApiProvider
         apis={ApiRegistry.from([
diff --git a/plugins/sentry/src/setupTests.ts b/plugins/sentry/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/sentry/src/setupTests.ts
+++ b/plugins/sentry/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index 21b4c50bfd..19ac41fa8d 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -45,9 +45,9 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "@types/react": "^16.9",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6",
+    "@backstage/test-utils": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/tech-radar/src/setupTests.ts b/plugins/tech-radar/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/tech-radar/src/setupTests.ts
+++ b/plugins/tech-radar/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 1da1bec9ff..60c7c8f084 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -32,13 +32,12 @@
     "fs-extra": "^9.0.1",
     "git-url-parse": "^11.3.0",
     "knex": "^0.21.1",
-    "node-fetch": "^2.6.0",
     "nodegit": "^0.27.0",
+    "cross-fetch": "^3.0.6",
     "winston": "^3.2.1"
   },
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.25",
-    "@types/node-fetch": "^2.5.7",
     "supertest": "^4.0.2"
   },
   "files": [
diff --git a/plugins/techdocs-backend/src/default-branch.ts b/plugins/techdocs-backend/src/default-branch.ts
index e9164c5175..2997a2acbf 100644
--- a/plugins/techdocs-backend/src/default-branch.ts
+++ b/plugins/techdocs-backend/src/default-branch.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import fetch, { RequestInit } from 'node-fetch';
+import fetch from 'cross-fetch';
 import parseGitUrl from 'git-url-parse';
 import { Config } from '@backstage/config';
 import { getRootLogger, loadBackendConfig } from '@backstage/backend-common';
diff --git a/plugins/techdocs-backend/src/service/metadata.ts b/plugins/techdocs-backend/src/service/metadata.ts
index 671fcdda17..760180f8d2 100644
--- a/plugins/techdocs-backend/src/service/metadata.ts
+++ b/plugins/techdocs-backend/src/service/metadata.ts
@@ -1,4 +1,3 @@
-import fetch from 'node-fetch';
 /*
  * Copyright 2020 Spotify AB
  *
@@ -15,6 +14,8 @@ import fetch from 'node-fetch';
  * limitations under the License.
  */
 
+import fetch from 'cross-fetch';
+
 export class TechDocsMetadata {
   private async getMetadataFile(docsUrl: String) {
     const metadataURL = `${docsUrl}/techdocs_metadata.json`;
diff --git a/plugins/techdocs-backend/src/service/router.ts b/plugins/techdocs-backend/src/service/router.ts
index f2317f749e..b6f8865a57 100644
--- a/plugins/techdocs-backend/src/service/router.ts
+++ b/plugins/techdocs-backend/src/service/router.ts
@@ -17,7 +17,7 @@ import { Logger } from 'winston';
 import Router from 'express-promise-router';
 import express from 'express';
 import Knex from 'knex';
-import fetch from 'node-fetch';
+import fetch from 'cross-fetch';
 import { Config } from '@backstage/config';
 import Docker from 'dockerode';
 import {
@@ -111,7 +111,9 @@ export async function createRouter({
 
     const catalogRes = await fetch(`${catalogUrl}/entities/by-name/${triple}`);
     if (!catalogRes.ok) {
-      catalogRes.body.pipe(res.status(catalogRes.status));
+      const catalogResText = await catalogRes.text();
+      res.status(catalogRes.status);
+      res.send(catalogResText);
       return;
     }
 
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 99742d2661..eb6bb597d9 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -48,9 +48,9 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "canvas": "^2.6.1",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6",
+    "@backstage/test-utils": "^0.1.1-alpha.25"
   },
   "files": [
     "dist"
diff --git a/plugins/techdocs/src/setupTests.ts b/plugins/techdocs/src/setupTests.ts
index 8553642152..825bcd4115 100644
--- a/plugins/techdocs/src/setupTests.ts
+++ b/plugins/techdocs/src/setupTests.ts
@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 029ff99222..9748bb1a9e 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -40,8 +40,8 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6"
   },
   "files": [
     "dist"
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index 4a23e5ee86..653678f1f3 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -38,10 +38,10 @@
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
-    "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "msw": "^0.21.2",
+    "cross-fetch": "^3.0.6",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
+    "@types/node": "^12.0.0"
   },
   "files": [
     "dist"
diff --git a/yarn.lock b/yarn.lock
index 0c7c8635c2..7e15bfdf28 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5372,7 +5372,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node-fetch@2.5.7", "@types/node-fetch@^2.5.4", "@types/node-fetch@^2.5.7":
+"@types/node-fetch@2.5.7", "@types/node-fetch@^2.5.4":
   version "2.5.7"
   resolved "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
   integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
@@ -9220,7 +9220,7 @@ cross-env@^7.0.0:
   dependencies:
     cross-spawn "^7.0.1"
 
-cross-fetch@3.0.6, cross-fetch@^3.0.4, cross-fetch@^3.0.5:
+cross-fetch@3.0.6, cross-fetch@^3.0.5, cross-fetch@^3.0.6:
   version "3.0.6"
   resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz#3a4040bc8941e653e0e9cf17f29ebcd177d3365c"
   integrity sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==
@@ -14383,14 +14383,6 @@ jest-esm-transformer@^1.0.0:
     "@babel/core" "^7.4.4"
     "@babel/plugin-transform-modules-commonjs" "^7.4.4"
 
-jest-fetch-mock@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz#31749c456ae27b8919d69824f1c2bd85fe0a1f3b"
-  integrity sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==
-  dependencies:
-    cross-fetch "^3.0.4"
-    promise-polyfill "^8.1.3"
-
 jest-get-type@^25.2.6:
   version "25.2.6"
   resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877"
@@ -16535,6 +16527,42 @@ msw@^0.20.5:
     statuses "^2.0.0"
     yargs "^15.4.1"
 
+msw@^0.21.2:
+  version "0.21.2"
+  resolved "https://registry.npmjs.org/msw/-/msw-0.21.2.tgz#74ed10b8eb224325652a3c3812b5460dac297bd8"
+  integrity sha512-XOJehxtJThNFdMJdVjxDAbZ8KuC3UltOlO5nQDks0Q1yzSUqqKcVUjbKrH7T+K2hckBr0KEY2fwJHv21R4BV2A==
+  dependencies:
+    "@open-draft/until" "^1.0.3"
+    "@types/cookie" "^0.4.0"
+    chalk "^4.1.0"
+    chokidar "^3.4.2"
+    cookie "^0.4.1"
+    graphql "^15.3.0"
+    headers-utils "^1.2.0"
+    node-fetch "^2.6.1"
+    node-match-path "^0.4.4"
+    node-request-interceptor "^0.5.1"
+    statuses "^2.0.0"
+    yargs "^16.0.3"
+
+msw@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.npmjs.org/msw/-/msw-0.21.3.tgz#d073842f9570a08f4041806a2c7303a9b8494602"
+  integrity sha512-voPc/EJsjarvi454vSEuozZQQqLG4AUHT6qQL5Ah47lq7sGCpc7icByeUlfvEj5+MvaugN0c7JwXyCa2rxu8cA==
+  dependencies:
+    "@open-draft/until" "^1.0.3"
+    "@types/cookie" "^0.4.0"
+    chalk "^4.1.0"
+    chokidar "^3.4.2"
+    cookie "^0.4.1"
+    graphql "^15.3.0"
+    headers-utils "^1.2.0"
+    node-fetch "^2.6.1"
+    node-match-path "^0.4.4"
+    node-request-interceptor "^0.5.1"
+    statuses "^2.0.0"
+    yargs "^16.0.3"
+
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -16863,6 +16891,15 @@ node-request-interceptor@^0.3.5:
     debug "^4.1.1"
     headers-utils "^1.2.0"
 
+node-request-interceptor@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.npmjs.org/node-request-interceptor/-/node-request-interceptor-0.5.1.tgz#b4757a033bde4412d9ffc4503804abb28ed962d2"
+  integrity sha512-ex5mlI5nGokxocomS2Rj2r1aspmt7qZoI8OvKLt24ylp1bYCzGQ+0XD911guCNDb/kKLMIGC67HHyeFrJCz7jA==
+  dependencies:
+    "@open-draft/until" "^1.0.3"
+    debug "^4.1.1"
+    headers-utils "^1.2.0"
+
 nodegit@0.27.0, nodegit@^0.27.0:
   version "0.27.0"
   resolved "https://registry.npmjs.org/nodegit/-/nodegit-0.27.0.tgz#4e8cc236f60e1c97324a5acff99056fe116a6ebe"
@@ -18819,11 +18856,6 @@ promise-inflight@^1.0.1:
   resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
-promise-polyfill@^8.1.3:
-  version "8.1.3"
-  resolved "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.1.3.tgz#8c99b3cf53f3a91c68226ffde7bde81d7f904116"
-  integrity sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g==
-
 promise-retry@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
@@ -23729,7 +23761,7 @@ whatwg-fetch@^2.0.4:
   resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
   integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
 
-whatwg-fetch@^3.0.0, whatwg-fetch@^3.4.0, whatwg-fetch@^3.4.1:
+whatwg-fetch@^3.0.0, whatwg-fetch@^3.4.1:
   version "3.4.1"
   resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz#e5f871572d6879663fa5674c8f833f15a8425ab3"
   integrity sha512-sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ==