diff --git a/package.json b/package.json
index a5f2a9b3704e..fc69c4417337 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "@faker-js/faker": "8.0.2",
     "@npmcli/arborist": "7.2.2",
     "@playwright/test": "1.40.1",
-    "@testing-library/jest-dom": "5.17.0",
+    "@testing-library/jest-dom": "6.1.5",
     "@testing-library/react": "14.1.2",
     "@testing-library/user-event": "14.5.1",
     "@types/babel__generator": "7.6.7",
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 9b910e2fd4f2..ab0905c97460 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@babel/cli": "7.23.4",
     "@babel/core": "^7.22.20",
-    "@testing-library/jest-dom": "5.17.0",
+    "@testing-library/jest-dom": "6.1.5",
     "@testing-library/react": "14.1.2",
     "jest": "29.7.0",
     "msw": "1.3.2",
diff --git a/packages/auth/src/__tests__/AuthProvider.test.tsx b/packages/auth/src/__tests__/AuthProvider.test.tsx
index 2bd325f615f0..ea0e601a3973 100644
--- a/packages/auth/src/__tests__/AuthProvider.test.tsx
+++ b/packages/auth/src/__tests__/AuthProvider.test.tsx
@@ -10,7 +10,7 @@ import {
   configure,
 } from '@testing-library/react'
 import { renderHook, act } from '@testing-library/react'
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 import { graphql } from 'msw'
 import { setupServer } from 'msw/node'
 
diff --git a/packages/forms/package.json b/packages/forms/package.json
index 46b22f3903ea..d37a952de207 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -31,7 +31,7 @@
     "@babel/cli": "7.23.4",
     "@babel/core": "^7.22.20",
     "@testing-library/dom": "9.3.3",
-    "@testing-library/jest-dom": "5.17.0",
+    "@testing-library/jest-dom": "6.1.5",
     "@testing-library/react": "14.1.2",
     "@testing-library/user-event": "14.5.1",
     "@types/pascalcase": "1.0.3",
diff --git a/packages/router/src/__tests__/location.test.tsx b/packages/router/src/__tests__/location.test.tsx
index 524bf3875a87..805fc419d643 100644
--- a/packages/router/src/__tests__/location.test.tsx
+++ b/packages/router/src/__tests__/location.test.tsx
@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react'
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 
 import { LocationProvider, useLocation } from '../location'
 
diff --git a/packages/router/src/__tests__/nestedSets.test.tsx b/packages/router/src/__tests__/nestedSets.test.tsx
index a251513aefa1..a16dcb6545dd 100644
--- a/packages/router/src/__tests__/nestedSets.test.tsx
+++ b/packages/router/src/__tests__/nestedSets.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import type { ReactNode } from 'react'
 
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 import { act, render } from '@testing-library/react'
 
 import { navigate, Route, Router } from '../'
diff --git a/packages/router/src/__tests__/route-announcer.test.tsx b/packages/router/src/__tests__/route-announcer.test.tsx
index 606dd45a2bbf..0e0f1a8660c2 100644
--- a/packages/router/src/__tests__/route-announcer.test.tsx
+++ b/packages/router/src/__tests__/route-announcer.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 
 import { render, waitFor, act } from '@testing-library/react'
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 
 import { getAnnouncement } from '../a11yUtils'
 import { navigate } from '../history'
diff --git a/packages/router/src/__tests__/route-focus.test.tsx b/packages/router/src/__tests__/route-focus.test.tsx
index 59cecad3e3a2..ca50c24106b8 100644
--- a/packages/router/src/__tests__/route-focus.test.tsx
+++ b/packages/router/src/__tests__/route-focus.test.tsx
@@ -1,5 +1,5 @@
 import { render, waitFor } from '@testing-library/react'
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 
 import { getFocus } from '../a11yUtils'
 import RouteFocus from '../route-focus'
diff --git a/packages/router/src/__tests__/routeScrollReset.test.tsx b/packages/router/src/__tests__/routeScrollReset.test.tsx
index bf9475f62b0e..885ba12dc9d9 100644
--- a/packages/router/src/__tests__/routeScrollReset.test.tsx
+++ b/packages/router/src/__tests__/routeScrollReset.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 import { act, cleanup, render, screen } from '@testing-library/react'
 
 import { navigate } from '../history'
diff --git a/packages/router/src/__tests__/router.test.tsx b/packages/router/src/__tests__/router.test.tsx
index 47c93faaf1ba..ca436d3e3c0f 100644
--- a/packages/router/src/__tests__/router.test.tsx
+++ b/packages/router/src/__tests__/router.test.tsx
@@ -20,7 +20,7 @@ jest.mock('../util', () => {
 
 import React, { useEffect, useState } from 'react'
 
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 import {
   act,
   configure,
diff --git a/packages/router/src/__tests__/set.test.tsx b/packages/router/src/__tests__/set.test.tsx
index 5e5fe6a24680..a1cc61e2781d 100644
--- a/packages/router/src/__tests__/set.test.tsx
+++ b/packages/router/src/__tests__/set.test.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import type { ReactNode } from 'react'
 
 import { act, render, waitFor } from '@testing-library/react'
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 
 import { navigate } from '../history'
 import { Route, Router } from '../router'
diff --git a/packages/router/src/__tests__/setContextReuse.test.tsx b/packages/router/src/__tests__/setContextReuse.test.tsx
index 920f466d263e..5d6a698ec2f1 100644
--- a/packages/router/src/__tests__/setContextReuse.test.tsx
+++ b/packages/router/src/__tests__/setContextReuse.test.tsx
@@ -5,7 +5,7 @@ import { act, render, waitFor } from '@testing-library/react'
 import { Route, Router, navigate } from '../'
 import { Set } from '../Set'
 
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 
 const HomePage = () => {
   return <p>Home Page</p>
diff --git a/packages/testing/jest.setup.ts b/packages/testing/jest.setup.ts
index 6bbc20490012..e445304cc298 100644
--- a/packages/testing/jest.setup.ts
+++ b/packages/testing/jest.setup.ts
@@ -1,4 +1,4 @@
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 import '@testing-library/jest-dom'
 
 import { startMSW } from './src/web/mockRequests'
diff --git a/packages/testing/package.json b/packages/testing/package.json
index 8e79a5cd9071..e027128e2444 100644
--- a/packages/testing/package.json
+++ b/packages/testing/package.json
@@ -34,7 +34,7 @@
     "@redwoodjs/project-config": "6.0.7",
     "@redwoodjs/router": "6.0.7",
     "@redwoodjs/web": "6.0.7",
-    "@testing-library/jest-dom": "5.17.0",
+    "@testing-library/jest-dom": "6.1.5",
     "@testing-library/react": "14.1.2",
     "@testing-library/user-event": "14.5.1",
     "@types/aws-lambda": "8.10.126",
diff --git a/packages/web/package.json b/packages/web/package.json
index 00daa1962af9..4538f9461b31 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -52,7 +52,7 @@
     "@apollo/experimental-nextjs-app-support": "0.5.1",
     "@babel/cli": "7.23.4",
     "@babel/core": "^7.22.20",
-    "@testing-library/jest-dom": "5.17.0",
+    "@testing-library/jest-dom": "6.1.5",
     "@testing-library/react": "14.1.2",
     "@types/react": "18.2.37",
     "@types/react-dom": "18.2.15",
diff --git a/packages/web/src/components/FetchConfigProvider.test.tsx b/packages/web/src/components/FetchConfigProvider.test.tsx
index d7342d0aa025..db47d6523911 100644
--- a/packages/web/src/components/FetchConfigProvider.test.tsx
+++ b/packages/web/src/components/FetchConfigProvider.test.tsx
@@ -7,7 +7,7 @@ import React from 'react'
 import { render, screen, waitFor } from '@testing-library/react'
 
 import type { AuthContextInterface } from '@redwoodjs/auth'
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 
 globalThis.RWJS_API_GRAPHQL_URL = 'https://api.example.com/graphql'
 
diff --git a/packages/web/src/components/GraphQLHooksProvider.test.tsx b/packages/web/src/components/GraphQLHooksProvider.test.tsx
index 6153bd69d7a9..eaf75aa2897b 100644
--- a/packages/web/src/components/GraphQLHooksProvider.test.tsx
+++ b/packages/web/src/components/GraphQLHooksProvider.test.tsx
@@ -3,7 +3,7 @@
  */
 
 import { render, screen, waitFor } from '@testing-library/react'
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 
 import {
   GraphQLHooksProvider,
diff --git a/packages/web/src/components/cell/createCell.test.tsx b/packages/web/src/components/cell/createCell.test.tsx
index 42e5095ad9ae..7b7aed4e1936 100644
--- a/packages/web/src/components/cell/createCell.test.tsx
+++ b/packages/web/src/components/cell/createCell.test.tsx
@@ -3,7 +3,7 @@
  */
 
 import { render, screen } from '@testing-library/react'
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 
 import { GraphQLHooksProvider } from '../GraphQLHooksProvider'
 
diff --git a/packages/web/src/components/cell/createSuspendingCell.test.tsx b/packages/web/src/components/cell/createSuspendingCell.test.tsx
index 749636fd3d2c..8135ef043d48 100644
--- a/packages/web/src/components/cell/createSuspendingCell.test.tsx
+++ b/packages/web/src/components/cell/createSuspendingCell.test.tsx
@@ -4,7 +4,7 @@
 import type { useReadQuery, useBackgroundQuery } from '@apollo/client'
 import { loadErrorMessages, loadDevMessages } from '@apollo/client/dev'
 import { render, screen } from '@testing-library/react'
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 
 import { GraphQLHooksProvider } from '../GraphQLHooksProvider'
 
diff --git a/packages/web/src/components/portalHead.test.tsx b/packages/web/src/components/portalHead.test.tsx
index 74e8916c3d31..74f62e218ec2 100644
--- a/packages/web/src/components/portalHead.test.tsx
+++ b/packages/web/src/components/portalHead.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
 import { render } from '@testing-library/react'
 
 import PortalHead from './PortalHead'
diff --git a/yarn.lock b/yarn.lock
index 600dd952aa07..f060c2c16577 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -86,10 +86,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@adobe/css-tools@npm:^4.0.1":
-  version: 4.3.1
-  resolution: "@adobe/css-tools@npm:4.3.1"
-  checksum: 05672719b544cc0c21ae3ed0eb6349bf458e9d09457578eeeb07cf0f696469ac6417e9c9be1b129e5d6a18098a061c1db55b2275591760ef30a79822436fcbfa
+"@adobe/css-tools@npm:^4.3.1":
+  version: 4.3.2
+  resolution: "@adobe/css-tools@npm:4.3.2"
+  checksum: 296a03dd29f227c60500d2da8c7f64991fecf1d8b456ce2b4adb8cec7363d9c08b5b03f1463673fc8cbfe54b538745588e7a13c736d2dd14a80c01a20f127f39
   languageName: node
   linkType: hard
 
@@ -8668,7 +8668,7 @@ __metadata:
     "@babel/cli": 7.23.4
     "@babel/core": ^7.22.20
     "@babel/runtime-corejs3": 7.23.5
-    "@testing-library/jest-dom": 5.17.0
+    "@testing-library/jest-dom": 6.1.5
     "@testing-library/react": 14.1.2
     core-js: 3.33.3
     jest: 29.7.0
@@ -9037,7 +9037,7 @@ __metadata:
     "@babel/core": ^7.22.20
     "@babel/runtime-corejs3": 7.23.5
     "@testing-library/dom": 9.3.3
-    "@testing-library/jest-dom": 5.17.0
+    "@testing-library/jest-dom": 6.1.5
     "@testing-library/react": 14.1.2
     "@testing-library/user-event": 14.5.1
     "@types/pascalcase": 1.0.3
@@ -9510,7 +9510,7 @@ __metadata:
     "@redwoodjs/project-config": 6.0.7
     "@redwoodjs/router": 6.0.7
     "@redwoodjs/web": 6.0.7
-    "@testing-library/jest-dom": 5.17.0
+    "@testing-library/jest-dom": 6.1.5
     "@testing-library/react": 14.1.2
     "@testing-library/user-event": 14.5.1
     "@types/aws-lambda": 8.10.126
@@ -9619,7 +9619,7 @@ __metadata:
     "@babel/core": ^7.22.20
     "@babel/runtime-corejs3": 7.23.5
     "@redwoodjs/auth": 6.0.7
-    "@testing-library/jest-dom": 5.17.0
+    "@testing-library/jest-dom": 6.1.5
     "@testing-library/react": 14.1.2
     "@types/react": 18.2.37
     "@types/react-dom": 18.2.15
@@ -11172,20 +11172,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/jest-dom@npm:5.17.0":
-  version: 5.17.0
-  resolution: "@testing-library/jest-dom@npm:5.17.0"
+"@testing-library/jest-dom@npm:6.1.5":
+  version: 6.1.5
+  resolution: "@testing-library/jest-dom@npm:6.1.5"
   dependencies:
-    "@adobe/css-tools": ^4.0.1
+    "@adobe/css-tools": ^4.3.1
     "@babel/runtime": ^7.9.2
-    "@types/testing-library__jest-dom": ^5.9.1
     aria-query: ^5.0.0
     chalk: ^3.0.0
     css.escape: ^1.5.1
     dom-accessibility-api: ^0.5.6
     lodash: ^4.17.15
     redent: ^3.0.0
-  checksum: 24e09c5779ea44644945ec26f2e4e5f48aecfe57d469decf2317a3253a5db28d865c55ad0ea4818d8d1df7572a6486c45daa06fa09644a833a7dd84563881939
+  peerDependencies:
+    "@jest/globals": ">= 28"
+    "@types/jest": ">= 28"
+    jest: ">= 28"
+    vitest: ">= 0.32"
+  peerDependenciesMeta:
+    "@jest/globals":
+      optional: true
+    "@types/jest":
+      optional: true
+    jest:
+      optional: true
+    vitest:
+      optional: true
+  checksum: f3643a56fcd970b5c7e8fd10faf3c4817d8ab0e74fb1198d726643bdc5ac675ceaac3b0068c5b4fbad254470e8f98ed50028741de875a29ceaa2f854570979c9
   languageName: node
   linkType: hard
 
@@ -12568,7 +12581,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/testing-library__jest-dom@npm:5.14.9, @types/testing-library__jest-dom@npm:^5.9.1":
+"@types/testing-library__jest-dom@npm:5.14.9":
   version: 5.14.9
   resolution: "@types/testing-library__jest-dom@npm:5.14.9"
   dependencies:
@@ -31798,7 +31811,7 @@ __metadata:
     "@faker-js/faker": 8.0.2
     "@npmcli/arborist": 7.2.2
     "@playwright/test": 1.40.1
-    "@testing-library/jest-dom": 5.17.0
+    "@testing-library/jest-dom": 6.1.5
     "@testing-library/react": 14.1.2
     "@testing-library/user-event": 14.5.1
     "@types/babel__generator": 7.6.7