diff --git a/packages/core-components/src/layout/HeaderTabs/HeaderTabs.test.tsx b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.test.tsx
index 0d5f3d5586..f656696f8a 100644
--- a/packages/core-components/src/layout/HeaderTabs/HeaderTabs.test.tsx
+++ b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.test.tsx
@@ -19,7 +19,6 @@ import Badge from '@material-ui/core/Badge';
 import { makeStyles } from '@material-ui/core/styles';
 import React from 'react';
 import { HeaderTabs } from './HeaderTabs';
-import { act } from 'react-dom/test-utils';
 import userEvent from '@testing-library/user-event';
 
 const mockTabs = [
@@ -43,7 +42,7 @@ describe('<HeaderTabs />', () => {
       'false',
     );
 
-    await act(() => userEvent.click(rendered.getByText('Docs')));
+    await userEvent.click(rendered.getByText('Docs'));
 
     expect(rendered.getByText('Docs').parentElement).toHaveAttribute(
       'aria-selected',
diff --git a/plugins/bitrise/src/components/BitriseBuildDetailsDialog/BitriseBuildDetailsDialog.test.tsx b/plugins/bitrise/src/components/BitriseBuildDetailsDialog/BitriseBuildDetailsDialog.test.tsx
index e283448b36..65efb9b64f 100644
--- a/plugins/bitrise/src/components/BitriseBuildDetailsDialog/BitriseBuildDetailsDialog.test.tsx
+++ b/plugins/bitrise/src/components/BitriseBuildDetailsDialog/BitriseBuildDetailsDialog.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { act, render } from '@testing-library/react';
+import { render } from '@testing-library/react';
 import { BitriseBuildDetailsDialog } from './BitriseBuildDetailsDialog';
 import { BitriseBuildResult } from '../../api/bitriseApi.model';
 import userEvent from '@testing-library/user-event';
@@ -49,7 +49,7 @@ describe('BitriseArtifactsComponent', () => {
 
     expect(rendered.queryByText('VISIBLE')).not.toBeInTheDocument();
 
-    await act(() => userEvent.click(btn));
+    await userEvent.click(btn);
 
     expect(rendered.getByText('VISIBLE')).toBeInTheDocument();
   });
diff --git a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx
index af2e4dc886..614e3fcff0 100644
--- a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx
+++ b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx
@@ -23,7 +23,6 @@ import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
 import { ApiProvider } from '@backstage/core-app-api';
 import { rootRouteRef } from '../../routes';
 import { userEvent } from '@testing-library/user-event';
-import { act } from 'react-dom/test-utils';
 
 const scaffolderApiMock: jest.Mocked<ScaffolderApi> = {
   scaffold: jest.fn(),
@@ -263,7 +262,7 @@ describe('TemplatePage', () => {
     expect(rendered.queryByText('nested prop b')).not.toBeInTheDocument();
     expect(rendered.queryByText('number')).not.toBeInTheDocument();
 
-    await act(() => userEvent.click(objectChip));
+    await userEvent.click(objectChip);
 
     expect(rendered.queryByText('nested prop a')).toBeInTheDocument();
     expect(rendered.queryByText('string')).toBeInTheDocument();
@@ -325,7 +324,7 @@ describe('TemplatePage', () => {
     expect(rendered.queryByText('nested prop b')).not.toBeInTheDocument();
     expect(rendered.queryByText('nested object c')).not.toBeInTheDocument();
 
-    await act(() => userEvent.click(objectChip));
+    await userEvent.click(objectChip);
 
     expect(rendered.queryByText('nested object a')).toBeInTheDocument();
     expect(rendered.queryByText('nested prop b')).toBeInTheDocument();
@@ -333,7 +332,7 @@ describe('TemplatePage', () => {
 
     const allObjectChips = rendered.getAllByText('object');
     expect(allObjectChips.length).toBe(2);
-    await act(() => userEvent.click(allObjectChips[1]));
+    await userEvent.click(allObjectChips[1]);
 
     expect(rendered.queryByText('nested object a')).toBeInTheDocument();
     expect(rendered.queryByText('nested prop b')).toBeInTheDocument();
@@ -376,7 +375,7 @@ describe('TemplatePage', () => {
 
     expect(rendered.queryByText('No schema defined')).not.toBeInTheDocument();
 
-    await act(() => userEvent.click(objectChip));
+    await userEvent.click(objectChip);
 
     expect(rendered.queryByText('No schema defined')).toBeInTheDocument();
   });
@@ -473,7 +472,7 @@ describe('TemplatePage', () => {
     expect(rendered.queryByText('nested object a')).not.toBeInTheDocument();
     expect(rendered.queryByText('nested prop b')).not.toBeInTheDocument();
 
-    await act(() => userEvent.click(objectChip));
+    await userEvent.click(objectChip);
 
     expect(rendered.queryByText('nested object a')).toBeInTheDocument();
     expect(rendered.queryByText('nested prop b')).toBeInTheDocument();
diff --git a/plugins/scaffolder/src/next/TemplateEditorPage/DryRunResults/DryRunResultsView.test.tsx b/plugins/scaffolder/src/next/TemplateEditorPage/DryRunResults/DryRunResultsView.test.tsx
index 36cdbec088..c5c391907e 100644
--- a/plugins/scaffolder/src/next/TemplateEditorPage/DryRunResults/DryRunResultsView.test.tsx
+++ b/plugins/scaffolder/src/next/TemplateEditorPage/DryRunResults/DryRunResultsView.test.tsx
@@ -16,7 +16,7 @@
 
 import { entityRouteRef } from '@backstage/plugin-catalog-react';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
-import { act, screen } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { ReactNode, useEffect } from 'react';
 import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
@@ -90,10 +90,14 @@ describe('DryRunResultsView', () => {
     expect(screen.queryByText('Foo Message')).not.toBeInTheDocument();
     expect(screen.queryByText('Foo Link')).not.toBeInTheDocument();
 
-    await act(() => userEvent.click(screen.getByText('Log')));
-    expect(screen.getByText('Foo Message')).toBeInTheDocument();
+    await userEvent.click(screen.getByText('Log'));
+    await waitFor(() => {
+      expect(screen.getByText('Foo Message')).toBeInTheDocument();
+    });
 
-    await act(() => userEvent.click(screen.getByText('Output')));
-    expect(screen.getByText('Foo Link')).toBeInTheDocument();
+    await userEvent.click(screen.getByText('Output'));
+    await waitFor(() => {
+      expect(screen.getByText('Foo Link')).toBeInTheDocument();
+    });
   });
 });
diff --git a/plugins/search-react/src/components/SearchFilter/SearchFilter.Autocomplete.test.tsx b/plugins/search-react/src/components/SearchFilter/SearchFilter.Autocomplete.test.tsx
index 3bb1140852..abf5e828f6 100644
--- a/plugins/search-react/src/components/SearchFilter/SearchFilter.Autocomplete.test.tsx
+++ b/plugins/search-react/src/components/SearchFilter/SearchFilter.Autocomplete.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
-import { screen, render, waitFor, within, act } from '@testing-library/react';
+import { screen, render, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
@@ -364,7 +364,7 @@ describe('SearchFilter.Autocomplete', () => {
       });
 
       // Blur the field and only one tag should be shown with a +1.
-      await act(() => userEvent.tab());
+      await userEvent.tab();
       expect(
         screen.queryByRole('button', { name: values[0] }),
       ).not.toBeInTheDocument();
diff --git a/plugins/techdocs/src/reader/components/TechDocsBuildLogs.test.tsx b/plugins/techdocs/src/reader/components/TechDocsBuildLogs.test.tsx
index 85253f54ef..34aaf76394 100644
--- a/plugins/techdocs/src/reader/components/TechDocsBuildLogs.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsBuildLogs.test.tsx
@@ -21,7 +21,6 @@ import {
   TechDocsBuildLogsDrawerContent,
 } from './TechDocsBuildLogs';
 import { userEvent } from '@testing-library/user-event';
-import { act } from 'react-dom/test-utils';
 
 // The <AutoSizer> inside <LogViewer> needs mocking to render in jsdom
 jest.mock('react-virtualized-auto-sizer', () => ({
@@ -40,7 +39,7 @@ describe('<TechDocsBuildLogs />', () => {
 
   it('should open drawer', async () => {
     const rendered = await renderInTestApp(<TechDocsBuildLogs buildLog={[]} />);
-    await act(() => userEvent.click(rendered.getByText(/Show Build Logs/i)));
+    await userEvent.click(rendered.getByText(/Show Build Logs/i));
     expect(rendered.getByText(/Build Details/i)).toBeInTheDocument();
   });
 });