diff --git a/package.json b/package.json
index e1ad5529315..fa87d8bfe1a 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "@microsoft/api-extractor": "7.18.16",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.0-rc.6",
     "@rtsao/plugin-proposal-class-properties": "7.0.1-patch.1",
-    "@testing-library/dom": "7.29.4",
+    "@testing-library/dom": "8.10.1",
     "@testing-library/jest-dom": "5.11.5",
     "@testing-library/react": "12.1.2",
     "@testing-library/react-hooks": "7.0.2",
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index 2de679a60d3..46024ff5501 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -42,7 +42,7 @@
     "@rollup/plugin-commonjs": "16.0.0",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "10.0.0",
-    "@testing-library/dom": "7.29.4",
+    "@testing-library/dom": "8.10.1",
     "@testing-library/jest-dom": "5.11.9",
     "@testing-library/react": "11.1.2",
     "@testing-library/react-hooks": "^3.2.1",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index d91372e868a..b1babdbbc14 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -110,7 +110,7 @@
     "@storybook/manager-webpack5": "6.3.7",
     "@storybook/react": "6.3.7",
     "@storybook/theming": "6.3.7",
-    "@testing-library/dom": "7.29.4",
+    "@testing-library/dom": "8.10.1",
     "@testing-library/jest-dom": "5.11.9",
     "@testing-library/react": "11.1.2",
     "@testing-library/react-hooks": "^3.2.1",
diff --git a/packages/grafana-ui/src/components/Cascader/Cascader.test.tsx b/packages/grafana-ui/src/components/Cascader/Cascader.test.tsx
index 81a50957b81..702a98a0509 100644
--- a/packages/grafana-ui/src/components/Cascader/Cascader.test.tsx
+++ b/packages/grafana-ui/src/components/Cascader/Cascader.test.tsx
@@ -46,7 +46,7 @@ describe('Cascader', () => {
 
   describe('options from state change', () => {
     beforeEach(() => {
-      jest.useFakeTimers();
+      jest.useFakeTimers('modern');
     });
 
     it('displays updated options', () => {
diff --git a/packages/grafana-ui/src/components/Logs/LogRows.test.tsx b/packages/grafana-ui/src/components/Logs/LogRows.test.tsx
index 82c9f9efb84..4de84bae8da 100644
--- a/packages/grafana-ui/src/components/Logs/LogRows.test.tsx
+++ b/packages/grafana-ui/src/components/Logs/LogRows.test.tsx
@@ -29,7 +29,7 @@ describe('LogRows', () => {
 
   it('renders rows only limited number of rows first', () => {
     const rows: LogRowModel[] = [makeLog({ uid: '1' }), makeLog({ uid: '2' }), makeLog({ uid: '3' })];
-    jest.useFakeTimers();
+    jest.useFakeTimers('modern');
     const wrapper = mount(
       <LogRows
         logRows={rows}
diff --git a/public/app/core/specs/backend_srv.test.ts b/public/app/core/specs/backend_srv.test.ts
index fc6a958ab82..1206745a5e3 100644
--- a/public/app/core/specs/backend_srv.test.ts
+++ b/public/app/core/specs/backend_srv.test.ts
@@ -153,7 +153,7 @@ describe('backendSrv', () => {
 
     describe('when making an unsuccessful call and conditions for retry are favorable and loginPing does not throw', () => {
       it('then it should retry', async () => {
-        jest.useFakeTimers();
+        jest.useFakeTimers('modern');
         const url = '/api/dashboard/';
         const { backendSrv, appEventsMock, logoutMock, expectRequestCallChain } = getTestContext({
           ok: false,
@@ -219,7 +219,7 @@ describe('backendSrv', () => {
 
     describe('when making an unsuccessful call and conditions for retry are favorable and retry throws', () => {
       it('then it throw error', async () => {
-        jest.useFakeTimers();
+        jest.useFakeTimers('modern');
         const { backendSrv, appEventsMock, logoutMock, expectRequestCallChain } = getTestContext({
           ok: false,
           status: 401,
@@ -274,7 +274,7 @@ describe('backendSrv', () => {
 
     describe('when making an unsuccessful 422 call', () => {
       it('then it should emit Validation failed message', async () => {
-        jest.useFakeTimers();
+        jest.useFakeTimers('modern');
         const { backendSrv, appEventsMock, logoutMock, expectRequestCallChain } = getTestContext({
           ok: false,
           status: 422,
@@ -307,7 +307,7 @@ describe('backendSrv', () => {
 
     describe('when making an unsuccessful call and we handle the error', () => {
       it('then it should not emit message', async () => {
-        jest.useFakeTimers();
+        jest.useFakeTimers('modern');
         const { backendSrv, appEventsMock, logoutMock, expectRequestCallChain } = getTestContext({
           ok: false,
           status: 404,
diff --git a/public/app/features/search/components/DashboardSearch.test.tsx b/public/app/features/search/components/DashboardSearch.test.tsx
index 068548163f1..212c1a4fb9b 100644
--- a/public/app/features/search/components/DashboardSearch.test.tsx
+++ b/public/app/features/search/components/DashboardSearch.test.tsx
@@ -14,7 +14,7 @@ jest.mock('app/core/services/search_srv');
 const { mockSearch } = SearchSrv as typeof MockSearchSrv;
 
 beforeEach(() => {
-  jest.useFakeTimers();
+  jest.useFakeTimers('modern');
   mockSearch.mockClear();
 });
 
diff --git a/yarn.lock b/yarn.lock
index ec721b368d8..d481cb92adb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2363,7 +2363,7 @@ __metadata:
     "@rollup/plugin-commonjs": 16.0.0
     "@rollup/plugin-json": 4.1.0
     "@rollup/plugin-node-resolve": 10.0.0
-    "@testing-library/dom": 7.29.4
+    "@testing-library/dom": 8.10.1
     "@testing-library/jest-dom": 5.11.9
     "@testing-library/react": 11.1.2
     "@testing-library/react-hooks": ^3.2.1
@@ -2713,7 +2713,7 @@ __metadata:
     "@storybook/manager-webpack5": 6.3.7
     "@storybook/react": 6.3.7
     "@storybook/theming": 6.3.7
-    "@testing-library/dom": 7.29.4
+    "@testing-library/dom": 8.10.1
     "@testing-library/jest-dom": 5.11.9
     "@testing-library/react": 11.1.2
     "@testing-library/react-hooks": ^3.2.1
@@ -6723,23 +6723,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/dom@npm:7.29.4":
-  version: 7.29.4
-  resolution: "@testing-library/dom@npm:7.29.4"
-  dependencies:
-    "@babel/code-frame": ^7.10.4
-    "@babel/runtime": ^7.12.5
-    "@types/aria-query": ^4.2.0
-    aria-query: ^4.2.2
-    chalk: ^4.1.0
-    dom-accessibility-api: ^0.5.4
-    lz-string: ^1.4.4
-    pretty-format: ^26.6.2
-  checksum: 205d125e1e8d5f711f2592f2f3d25994f481641f6bad17724f8e077431042c3204ae585a8c7df483d84ea8562e75229bf915cb6090a4657c5897fbd3f742a3b9
-  languageName: node
-  linkType: hard
-
-"@testing-library/dom@npm:>=7, @testing-library/dom@npm:^8.0.0":
+"@testing-library/dom@npm:8.10.1, @testing-library/dom@npm:>=7, @testing-library/dom@npm:^8.0.0":
   version: 8.10.1
   resolution: "@testing-library/dom@npm:8.10.1"
   dependencies:
@@ -14853,7 +14837,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dom-accessibility-api@npm:^0.5.4, dom-accessibility-api@npm:^0.5.6, dom-accessibility-api@npm:^0.5.9":
+"dom-accessibility-api@npm:^0.5.6, dom-accessibility-api@npm:^0.5.9":
   version: 0.5.9
   resolution: "dom-accessibility-api@npm:0.5.9"
   checksum: 3988bd1c58e115e972179b9ef881e65ab5da9c2e9d08f4e9646870301971fb0c72d0e0866559e0c06b91b9da6f1fed2f31f0fcbf0b6cffd959b01c0601da2c56
@@ -18019,7 +18003,7 @@ __metadata:
     "@sentry/browser": 5.25.0
     "@sentry/types": 5.24.2
     "@sentry/utils": 6.13.2
-    "@testing-library/dom": 7.29.4
+    "@testing-library/dom": 8.10.1
     "@testing-library/jest-dom": 5.11.5
     "@testing-library/react": 12.1.2
     "@testing-library/react-hooks": 7.0.2