diff --git a/.changeset/dependabot-bf11310.md b/.changeset/dependabot-bf11310.md
index afb732a5da..9b3034eb11 100644
--- a/.changeset/dependabot-bf11310.md
+++ b/.changeset/dependabot-bf11310.md
@@ -3,6 +3,7 @@
 '@backstage/core-app-api': patch
 '@backstage/core-components': patch
 '@backstage/core-plugin-api': patch
+'@backstage/create-app': patch
 '@backstage/dev-utils': patch
 '@backstage/integration-react': patch
 '@backstage/test-utils': patch
@@ -45,6 +46,7 @@
 '@backstage/plugin-newrelic': patch
 '@backstage/plugin-org': patch
 '@backstage/plugin-pagerduty': patch
+'@backstage/plugin-periskop': patch
 '@backstage/plugin-permission-react': patch
 '@backstage/plugin-rollbar': patch
 '@backstage/plugin-scaffolder': patch
diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs
index f7985b497e..7f7e046605 100644
--- a/packages/cli/templates/default-plugin/package.json.hbs
+++ b/packages/cli/templates/default-plugin/package.json.hbs
@@ -45,7 +45,7 @@
     "@backstage/dev-utils": "{{versionQuery '@backstage/dev-utils'}}",
     "@backstage/test-utils": "{{versionQuery '@backstage/test-utils'}}",
     "@testing-library/jest-dom": "{{versionQuery '@testing-library/jest-dom' '5.10.1'}}",
-    "@testing-library/react": "{{versionQuery '@testing-library/react' '11.2.5'}}",
+    "@testing-library/react": "{{versionQuery '@testing-library/react' '12.1.3'}}",
     "@testing-library/user-event": "{{versionQuery '@testing-library/user-event' '13.1.8'}}",
     "@types/jest": "{{versionQuery '@types/jest' '26.0.7'}}",
     "@types/node": "{{versionQuery '@types/node' '14.14.32'}}",
diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs
index 71d2ac9b3b..2ad394c68e 100644
--- a/packages/create-app/templates/default-app/packages/app/package.json.hbs
+++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs
@@ -41,7 +41,7 @@
   "devDependencies": {
     "@backstage/test-utils": "^{{version '@backstage/test-utils'}}",
     "@testing-library/jest-dom": "^5.10.1",
-    "@testing-library/react": "^10.4.1",
+    "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32",
diff --git a/plugins/periskop/package.json b/plugins/periskop/package.json
index 6a7c0d975f..28d7c6ef19 100644
--- a/plugins/periskop/package.json
+++ b/plugins/periskop/package.json
@@ -47,7 +47,7 @@
     "@backstage/dev-utils": "^0.2.25",
     "@backstage/test-utils": "^0.3.0",
     "@testing-library/jest-dom": "^5.10.1",
-    "@testing-library/react": "^11.2.5",
+    "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^13.1.8",
     "@types/jest": "^26.0.7",
     "@types/luxon": "^2.0.4",
diff --git a/plugins/tech-radar/src/components/RadarComponent.test.tsx b/plugins/tech-radar/src/components/RadarComponent.test.tsx
index aeced1a2da..38d289cf1e 100644
--- a/plugins/tech-radar/src/components/RadarComponent.test.tsx
+++ b/plugins/tech-radar/src/components/RadarComponent.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { act, render, waitForElement } from '@testing-library/react';
+import { act, render, waitFor } from '@testing-library/react';
 import { ThemeProvider } from '@material-ui/core';
 import { lightTheme } from '@backstage/theme';
 import { TestApiProvider, withLogCollector } from '@backstage/test-utils';
@@ -73,7 +73,7 @@ describe('RadarComponent', () => {
     });
     expect(getByTestId('progress')).toBeInTheDocument();
 
-    await waitForElement(() => queryByTestId('tech-radar-svg'));
+    await waitFor(() => queryByTestId('tech-radar-svg'));
     jest.useRealTimers();
   });
 
@@ -100,7 +100,7 @@ describe('RadarComponent', () => {
       </ThemeProvider>,
     );
 
-    await waitForElement(() => !queryByTestId('progress'));
+    await waitFor(() => !queryByTestId('progress'));
 
     expect(errorApi.post).toHaveBeenCalledTimes(1);
     expect(errorApi.post).toHaveBeenCalledWith(new Error('404 Page Not Found'));
diff --git a/plugins/tech-radar/src/components/RadarPage.test.tsx b/plugins/tech-radar/src/components/RadarPage.test.tsx
index e9bcb3d314..490a61ee76 100644
--- a/plugins/tech-radar/src/components/RadarPage.test.tsx
+++ b/plugins/tech-radar/src/components/RadarPage.test.tsx
@@ -22,7 +22,7 @@ import {
 } from '@backstage/test-utils';
 import { lightTheme } from '@backstage/theme';
 import { ThemeProvider } from '@material-ui/core';
-import { act, render, waitForElement } from '@testing-library/react';
+import { act, render, waitFor } from '@testing-library/react';
 import React from 'react';
 import GetBBoxPolyfill from '../utils/polyfills/getBBox';
 import { RadarPage } from './RadarPage';
@@ -74,7 +74,7 @@ describe('RadarPage', () => {
     });
     expect(getByTestId('progress')).toBeInTheDocument();
 
-    await waitForElement(() => queryByTestId('tech-radar-svg'));
+    await waitFor(() => queryByTestId('tech-radar-svg'));
     jest.useRealTimers();
   });
 
@@ -94,7 +94,7 @@ describe('RadarPage', () => {
       </ThemeProvider>,
     );
 
-    await waitForElement(() => getByTestId('tech-radar-svg'));
+    await waitFor(() => getByTestId('tech-radar-svg'));
 
     expect(
       getByText('Pick the recommended technologies for your projects'),
@@ -120,7 +120,7 @@ describe('RadarPage', () => {
       </ThemeProvider>,
     );
 
-    await waitForElement(() => getByTestId('tech-radar-svg'));
+    await waitFor(() => getByTestId('tech-radar-svg'));
 
     expect(getByTestId('tech-radar-svg')).toBeInTheDocument();
     expect(mockClient.load).toBeCalledWith('myId');
@@ -152,7 +152,7 @@ describe('RadarPage', () => {
       </ThemeProvider>,
     );
 
-    await waitForElement(() => !queryByTestId('progress'));
+    await waitFor(() => !queryByTestId('progress'));
 
     expect(errorApi.getErrors()).toEqual([
       { error: new Error('404 Page Not Found'), context: undefined },