diff --git a/src/components/InPageNavigation/InPageNavigation.test.tsx b/src/components/InPageNavigation/InPageNavigation.test.tsx
index 7a1c6bd6f6..b90c58f768 100644
--- a/src/components/InPageNavigation/InPageNavigation.test.tsx
+++ b/src/components/InPageNavigation/InPageNavigation.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { screen, render, getByRole } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 import { InPageNavigation } from './InPageNavigation'
 import { HeadingLevel } from '../../types/headingLevel'
 import { CONTENT } from './content'
diff --git a/src/components/Modal/Modal.test.tsx b/src/components/Modal/Modal.test.tsx
index 46f09fde72..f467277340 100644
--- a/src/components/Modal/Modal.test.tsx
+++ b/src/components/Modal/Modal.test.tsx
@@ -7,7 +7,7 @@ import {
   fireEvent,
   RenderOptions,
 } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 import { Modal, ModalRef } from './Modal'
 import { ModalHeading } from './ModalHeading/ModalHeading'
diff --git a/src/components/Modal/ModalCloseButton/ModalCloseButton.test.tsx b/src/components/Modal/ModalCloseButton/ModalCloseButton.test.tsx
index e531d7f1ed..29f24d52cb 100644
--- a/src/components/Modal/ModalCloseButton/ModalCloseButton.test.tsx
+++ b/src/components/Modal/ModalCloseButton/ModalCloseButton.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 import { ModalCloseButton } from './ModalCloseButton'
 
diff --git a/src/components/Modal/ModalOpenLink.test.tsx b/src/components/Modal/ModalOpenLink.test.tsx
index f9dac0be2d..ba9ac7ba17 100644
--- a/src/components/Modal/ModalOpenLink.test.tsx
+++ b/src/components/Modal/ModalOpenLink.test.tsx
@@ -3,7 +3,7 @@ import { render, screen, waitFor } from '@testing-library/react'
 
 import { ModalRef } from './Modal'
 import { ModalOpenLink } from './ModalOpenLink'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 describe('ModalOpenLink', () => {
   it('renders an anchor tag with the modal control attributes', () => {
diff --git a/src/components/Modal/ModalToggleButton.test.tsx b/src/components/Modal/ModalToggleButton.test.tsx
index 91fd1c20b3..25dd55759b 100644
--- a/src/components/Modal/ModalToggleButton.test.tsx
+++ b/src/components/Modal/ModalToggleButton.test.tsx
@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/react'
 
 import { ModalRef } from './Modal'
 import { ModalToggleButton } from './ModalToggleButton'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 describe('ModalToggleButton', () => {
   it('renders a button with the modal control attributes', () => {
diff --git a/src/components/forms/ComboBox/ComboBox.test.tsx b/src/components/forms/ComboBox/ComboBox.test.tsx
index 419e3dc3aa..a71a3693d2 100644
--- a/src/components/forms/ComboBox/ComboBox.test.tsx
+++ b/src/components/forms/ComboBox/ComboBox.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { screen, render, waitFor } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 import { ComboBox, ComboBoxRef } from './ComboBox'
 import { TextInput } from '../TextInput/TextInput'
diff --git a/src/components/forms/DatePicker/Calendar.test.tsx b/src/components/forms/DatePicker/Calendar.test.tsx
index 277d87daf2..db4b45f349 100644
--- a/src/components/forms/DatePicker/Calendar.test.tsx
+++ b/src/components/forms/DatePicker/Calendar.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { render, waitFor } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 import { Calendar } from './Calendar'
 import { parseDateString, today } from './utils'
diff --git a/src/components/forms/DatePicker/DatePicker.test.tsx b/src/components/forms/DatePicker/DatePicker.test.tsx
index bd263079d4..9348bd766f 100644
--- a/src/components/forms/DatePicker/DatePicker.test.tsx
+++ b/src/components/forms/DatePicker/DatePicker.test.tsx
@@ -6,7 +6,7 @@ import {
   waitFor,
   screen,
 } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 import { DatePicker } from './DatePicker'
 import { sampleLocalization } from './i18n'
diff --git a/src/components/forms/DatePicker/Day.test.tsx b/src/components/forms/DatePicker/Day.test.tsx
index 3f82c6f9ed..51653dce98 100644
--- a/src/components/forms/DatePicker/Day.test.tsx
+++ b/src/components/forms/DatePicker/Day.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { fireEvent, render } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 import { Day } from './Day'
 
diff --git a/src/components/forms/DatePicker/MonthPicker.test.tsx b/src/components/forms/DatePicker/MonthPicker.test.tsx
index aae483a7c1..f1f6216990 100644
--- a/src/components/forms/DatePicker/MonthPicker.test.tsx
+++ b/src/components/forms/DatePicker/MonthPicker.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { render, fireEvent } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 import { MonthPicker } from './MonthPicker'
 import { MONTH_LABELS } from './constants'
diff --git a/src/components/forms/DatePicker/YearPicker.test.tsx b/src/components/forms/DatePicker/YearPicker.test.tsx
index e1c9b0eef5..fbb95ecf1f 100644
--- a/src/components/forms/DatePicker/YearPicker.test.tsx
+++ b/src/components/forms/DatePicker/YearPicker.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { render, fireEvent, waitFor } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 import { YearPicker } from './YearPicker'
 import { parseDateString } from './utils'
diff --git a/src/components/forms/DateRangePicker/DateRangePicker.test.tsx b/src/components/forms/DateRangePicker/DateRangePicker.test.tsx
index 318a898db6..edb925c1af 100644
--- a/src/components/forms/DateRangePicker/DateRangePicker.test.tsx
+++ b/src/components/forms/DateRangePicker/DateRangePicker.test.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { render } from '@testing-library/react'
 
 import { DateRangePicker } from './DateRangePicker'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 const startDatePickerTestProps = {
   id: 'start-date',
diff --git a/src/components/forms/FileInput/FileInput.test.tsx b/src/components/forms/FileInput/FileInput.test.tsx
index 098dc25af3..e9ce3fbb7b 100644
--- a/src/components/forms/FileInput/FileInput.test.tsx
+++ b/src/components/forms/FileInput/FileInput.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { fireEvent, render, screen, within } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 import { FileInput, FileInputRef } from './FileInput'
 import {
diff --git a/src/components/forms/TextInputMask/TextInputMask.test.tsx b/src/components/forms/TextInputMask/TextInputMask.test.tsx
index 2e985ebfe6..73df61f125 100644
--- a/src/components/forms/TextInputMask/TextInputMask.test.tsx
+++ b/src/components/forms/TextInputMask/TextInputMask.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { screen, render } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 import { TextInputMask } from './TextInputMask'
 
 describe('TextInputMask component', () => {
diff --git a/src/components/forms/TimePicker/TimePicker.test.tsx b/src/components/forms/TimePicker/TimePicker.test.tsx
index 3fcf579d88..cc85ecefec 100644
--- a/src/components/forms/TimePicker/TimePicker.test.tsx
+++ b/src/components/forms/TimePicker/TimePicker.test.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { render, waitFor, within } from '@testing-library/react'
 
 import { TimePicker } from './TimePicker'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 
 describe('TimePicker Component', () => {
   beforeEach(() => {