diff --git a/src/Components/Blueprints/ImportBlueprintModal.test.tsx b/src/Components/Blueprints/ImportBlueprintModal.test.tsx
index e71985c8..ff9a8047 100644
--- a/src/Components/Blueprints/ImportBlueprintModal.test.tsx
+++ b/src/Components/Blueprints/ImportBlueprintModal.test.tsx
@@ -1,5 +1,3 @@
-import '@testing-library/jest-dom';
-
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/src/test/Components/Blueprints/Blueprints.test.tsx b/src/test/Components/Blueprints/Blueprints.test.tsx
index d5c4adb2..43f596eb 100644
--- a/src/test/Components/Blueprints/Blueprints.test.tsx
+++ b/src/test/Components/Blueprints/Blueprints.test.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 
-import '@testing-library/jest-dom';
 import { screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { http, HttpResponse } from 'msw';
diff --git a/src/test/Components/CreateImageWizard/CreateImageWizard.azure.test.tsx b/src/test/Components/CreateImageWizard/CreateImageWizard.azure.test.tsx
index c7ea5b89..e2c47bc7 100644
--- a/src/test/Components/CreateImageWizard/CreateImageWizard.azure.test.tsx
+++ b/src/test/Components/CreateImageWizard/CreateImageWizard.azure.test.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import '@testing-library/jest-dom';
 
 import type { Router as RemixRouter } from '@remix-run/router';
 import { screen, waitFor } from '@testing-library/react';
diff --git a/src/test/Components/CreateImageWizard/CreateImageWizard.compliance.test.tsx b/src/test/Components/CreateImageWizard/CreateImageWizard.compliance.test.tsx
index 9eefb85f..2ef61820 100644
--- a/src/test/Components/CreateImageWizard/CreateImageWizard.compliance.test.tsx
+++ b/src/test/Components/CreateImageWizard/CreateImageWizard.compliance.test.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
 
-import '@testing-library/jest-dom';
-
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/src/test/Components/CreateImageWizard/CreateImageWizard.content.test.tsx b/src/test/Components/CreateImageWizard/CreateImageWizard.content.test.tsx
index 3b039055..8e57c7cc 100644
--- a/src/test/Components/CreateImageWizard/CreateImageWizard.content.test.tsx
+++ b/src/test/Components/CreateImageWizard/CreateImageWizard.content.test.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
 
-import '@testing-library/jest-dom';
-
 import type { Router as RemixRouter } from '@remix-run/router';
 import { screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
diff --git a/src/test/Components/CreateImageWizard/CreateImageWizard.test.tsx b/src/test/Components/CreateImageWizard/CreateImageWizard.test.tsx
index 9db7337f..05016038 100644
--- a/src/test/Components/CreateImageWizard/CreateImageWizard.test.tsx
+++ b/src/test/Components/CreateImageWizard/CreateImageWizard.test.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
 
-import '@testing-library/jest-dom';
-
 import type { Router as RemixRouter } from '@remix-run/router';
 import {
   screen,
diff --git a/src/test/Components/CreateImageWizard/EditImageWizard.test.tsx b/src/test/Components/CreateImageWizard/EditImageWizard.test.tsx
index 7a0435e4..5113383f 100644
--- a/src/test/Components/CreateImageWizard/EditImageWizard.test.tsx
+++ b/src/test/Components/CreateImageWizard/EditImageWizard.test.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { screen, within } from '@testing-library/react';
 
 import { renderEditMode } from './wizardTestUtils';
diff --git a/src/test/Components/CreateImageWizard/steps/Details/Details.test.tsx b/src/test/Components/CreateImageWizard/steps/Details/Details.test.tsx
index efe23c62..20b7387d 100644
--- a/src/test/Components/CreateImageWizard/steps/Details/Details.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Details/Details.test.tsx
@@ -1,5 +1,4 @@
 import { screen, waitFor } from '@testing-library/react';
-import '@testing-library/jest-dom';
 import { userEvent } from '@testing-library/user-event';
 
 import { CREATE_BLUEPRINT, EDIT_BLUEPRINT } from '../../../../../constants';
diff --git a/src/test/Components/CreateImageWizard/steps/FirstBoot/Firstboot.test.tsx b/src/test/Components/CreateImageWizard/steps/FirstBoot/Firstboot.test.tsx
index 8f484703..3e65d1ac 100644
--- a/src/test/Components/CreateImageWizard/steps/FirstBoot/Firstboot.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/FirstBoot/Firstboot.test.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import '@testing-library/jest-dom';
 import { screen, waitFor } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 
diff --git a/src/test/Components/CreateImageWizard/steps/ImageOutput/TargetEnvironment.test.tsx b/src/test/Components/CreateImageWizard/steps/ImageOutput/TargetEnvironment.test.tsx
index 162042af..10bc91ff 100644
--- a/src/test/Components/CreateImageWizard/steps/ImageOutput/TargetEnvironment.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/ImageOutput/TargetEnvironment.test.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import '@testing-library/jest-dom';
 
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
diff --git a/src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx b/src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx
index 61201150..5cd8ec5d 100644
--- a/src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { screen, waitFor, within } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 
diff --git a/src/test/Components/CreateImageWizard/steps/Repositories/Repositories.test.tsx b/src/test/Components/CreateImageWizard/steps/Repositories/Repositories.test.tsx
index 863634c9..8d50e19f 100644
--- a/src/test/Components/CreateImageWizard/steps/Repositories/Repositories.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Repositories/Repositories.test.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { screen, waitFor } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 
diff --git a/src/test/Components/CreateImageWizard/steps/Snapshot/Snapshot.test.tsx b/src/test/Components/CreateImageWizard/steps/Snapshot/Snapshot.test.tsx
index 0028caa4..dbd811ca 100644
--- a/src/test/Components/CreateImageWizard/steps/Snapshot/Snapshot.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Snapshot/Snapshot.test.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { screen, waitFor } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 
diff --git a/src/test/Components/ImagesTable/ImagesTable.test.tsx b/src/test/Components/ImagesTable/ImagesTable.test.tsx
index d5b20f34..e7d1f115 100644
--- a/src/test/Components/ImagesTable/ImagesTable.test.tsx
+++ b/src/test/Components/ImagesTable/ImagesTable.test.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/src/test/Components/LandingPage/LandingPage.test.tsx b/src/test/Components/LandingPage/LandingPage.test.tsx
index 8e37b250..0b5fb8e9 100644
--- a/src/test/Components/LandingPage/LandingPage.test.tsx
+++ b/src/test/Components/LandingPage/LandingPage.test.tsx
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom';
 import { screen } from '@testing-library/react';
 import { http, HttpResponse } from 'msw';
 
diff --git a/src/test/Components/ShareImageModal/ShareImageModal.test.tsx b/src/test/Components/ShareImageModal/ShareImageModal.test.tsx
index 548b5361..7305b0a3 100644
--- a/src/test/Components/ShareImageModal/ShareImageModal.test.tsx
+++ b/src/test/Components/ShareImageModal/ShareImageModal.test.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 
-import '@testing-library/jest-dom';
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/src/test/Components/edge/EdgeImagesTable.test.tsx b/src/test/Components/edge/EdgeImagesTable.test.tsx
index 044b70c3..d801c814 100644
--- a/src/test/Components/edge/EdgeImagesTable.test.tsx
+++ b/src/test/Components/edge/EdgeImagesTable.test.tsx
@@ -1,5 +1,3 @@
-import '@testing-library/jest-dom';
-
 import { useFlag } from '@unleash/proxy-client-react';
 
 vi.mock('@unleash/proxy-client-react', () => ({
diff --git a/src/test/Components/edge/ImageDetails.test.tsx b/src/test/Components/edge/ImageDetails.test.tsx
index 044b70c3..d801c814 100644
--- a/src/test/Components/edge/ImageDetails.test.tsx
+++ b/src/test/Components/edge/ImageDetails.test.tsx
@@ -1,5 +1,3 @@
-import '@testing-library/jest-dom';
-
 import { useFlag } from '@unleash/proxy-client-react';
 
 vi.mock('@unleash/proxy-client-react', () => ({
diff --git a/src/test/setup.ts b/src/test/setup.ts
index 307f14e7..7edfcb39 100644
--- a/src/test/setup.ts
+++ b/src/test/setup.ts
@@ -1,3 +1,4 @@
+import '@testing-library/jest-dom';
 import { configure } from '@testing-library/react';
 
 import { server } from './mocks/server';