diff --git a/packages/forms/jest.config.js b/packages/forms/jest.config.js
index 4f370b2726de..e53963f4f146 100644
--- a/packages/forms/jest.config.js
+++ b/packages/forms/jest.config.js
@@ -1,4 +1,5 @@
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
+  setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
   testEnvironment: 'jest-environment-jsdom',
 }
diff --git a/packages/forms/jest.setup.ts b/packages/forms/jest.setup.ts
new file mode 100644
index 000000000000..c44951a680db
--- /dev/null
+++ b/packages/forms/jest.setup.ts
@@ -0,0 +1 @@
+import '@testing-library/jest-dom'
diff --git a/packages/forms/src/__tests__/form.test.tsx b/packages/forms/src/__tests__/form.test.tsx
index bae4836cbbbb..e4ea6006241c 100644
--- a/packages/forms/src/__tests__/form.test.tsx
+++ b/packages/forms/src/__tests__/form.test.tsx
@@ -1,10 +1,5 @@
 import React from 'react'
 
-import {
-  toHaveFocus,
-  toHaveClass,
-  toBeInTheDocument,
-} from '@testing-library/jest-dom/matchers'
 import {
   screen,
   render,
@@ -27,7 +22,6 @@ import {
   FieldError,
   Label,
 } from '../index'
-expect.extend({ toHaveFocus, toHaveClass, toBeInTheDocument })
 
 describe('Form', () => {
   const TestComponent = ({ onSubmit = () => {} }) => {
diff --git a/packages/router/jest.config.js b/packages/router/jest.config.js
index ef06e5a2a089..5d3be18871c2 100644
--- a/packages/router/jest.config.js
+++ b/packages/router/jest.config.js
@@ -1,6 +1,6 @@
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  setupFilesAfterEnv: ['./jest.setup.js'],
+  setupFilesAfterEnv: ['./jest.setup.ts'],
   testEnvironment: 'jest-environment-jsdom',
   testMatch: ['**/*.test.+(ts|tsx|js|jsx)', '!**/__typetests__/*.ts'],
 }
diff --git a/packages/router/jest.setup.js b/packages/router/jest.setup.js
deleted file mode 100644
index ec7eb6c73d57..000000000000
--- a/packages/router/jest.setup.js
+++ /dev/null
@@ -1 +0,0 @@
-globalThis.scrollTo = jest.fn()
diff --git a/packages/router/jest.setup.ts b/packages/router/jest.setup.ts
new file mode 100644
index 000000000000..47cb7c090c57
--- /dev/null
+++ b/packages/router/jest.setup.ts
@@ -0,0 +1,3 @@
+import '@testing-library/jest-dom'
+
+globalThis.scrollTo = jest.fn()
diff --git a/packages/router/src/__tests__/links.test.tsx b/packages/router/src/__tests__/links.test.tsx
index 85dbbfeebb2a..0b364ea11cb9 100644
--- a/packages/router/src/__tests__/links.test.tsx
+++ b/packages/router/src/__tests__/links.test.tsx
@@ -1,12 +1,7 @@
 import React from 'react'
 
-import { toHaveClass, toHaveStyle } from '@testing-library/jest-dom/matchers'
 import { render } from '@testing-library/react'
 
-// TODO: Remove when jest configs are in place
-// @ts-expect-error - Issue with TS and jest-dom
-expect.extend({ toHaveClass, toHaveStyle })
-
 import { NavLink, useMatch, Link } from '../links'
 import { LocationProvider } from '../location'
 import { flattenSearchParams } from '../util'