diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs
index e024884547..cf07851f31 100644
--- a/packages/cli/templates/default-plugin/package.json.hbs
+++ b/packages/cli/templates/default-plugin/package.json.hbs
@@ -41,8 +41,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/packages/cli/templates/default-plugin/src/setupTests.ts b/packages/cli/templates/default-plugin/src/setupTests.ts
index cc559f672e..ddc061ad7e 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/register'
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index a703b6afe5..ba3a21ab1f 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -49,7 +49,6 @@
     "@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"
   },
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 fca8fb7178..4579892d34 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -61,7 +61,6 @@
     "@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"
   },
   "files": [
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 f16f629c44..83b9391732 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -23,6 +23,7 @@
     "@backstage/backend-common": "^0.1.1-alpha.24",
     "@backstage/catalog-model": "^0.1.1-alpha.24",
     "@backstage/config": "^0.1.1-alpha.24",
+    "@backstage/test-utils": "^0.1.1-alpha.24",
     "@octokit/graphql": "^4.5.6",
     "@types/express": "^4.17.6",
     "@types/node-fetch": "^2.5.7",
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/src/setupTests.ts b/plugins/catalog/src/setupTests.ts
index aef3b98817..778a9dfaa4 100644
--- a/plugins/catalog/src/setupTests.ts
+++ b/plugins/catalog/src/setupTests.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import fetch from 'node-fetch';
 import '@testing-library/jest-dom';
+import fetch from 'node-fetch';
 
-global.fetch = fetch as any;
+window.fetch = fetch;
diff --git a/yarn.lock b/yarn.lock
index b9f5733acd..2d2665fcb4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23514,7 +23514,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==