diff --git a/app/src/organisms/Alerts/__tests__/Alerts.test.tsx b/app/src/organisms/Alerts/__tests__/Alerts.test.tsx
index 8c21097b1e93..1eed718cb73a 100644
--- a/app/src/organisms/Alerts/__tests__/Alerts.test.tsx
+++ b/app/src/organisms/Alerts/__tests__/Alerts.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import * as AppAlerts from '../../../redux/alerts'
 import { Alerts } from '..'
 import { LostConnectionAlert } from '../LostConnectionAlert'
diff --git a/app/src/organisms/CalibratePipetteOffset/__tests__/useCalibratePipetteOffset.test.tsx b/app/src/organisms/CalibratePipetteOffset/__tests__/useCalibratePipetteOffset.test.tsx
index 22e75d087964..5b5780a2d8ac 100644
--- a/app/src/organisms/CalibratePipetteOffset/__tests__/useCalibratePipetteOffset.test.tsx
+++ b/app/src/organisms/CalibratePipetteOffset/__tests__/useCalibratePipetteOffset.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import uniqueId from 'lodash/uniqueId'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import { act } from 'react-dom/test-utils'
 
 import * as RobotApi from '../../../redux/robot-api'
diff --git a/app/src/organisms/CalibrateTipLength/__tests__/AskForCalibrationBlockModal.test.tsx b/app/src/organisms/CalibrateTipLength/__tests__/AskForCalibrationBlockModal.test.tsx
index 931326029a80..eb0b9d676a15 100644
--- a/app/src/organisms/CalibrateTipLength/__tests__/AskForCalibrationBlockModal.test.tsx
+++ b/app/src/organisms/CalibrateTipLength/__tests__/AskForCalibrationBlockModal.test.tsx
@@ -1,12 +1,12 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import { act } from 'react-dom/test-utils'
 
 import { AskForCalibrationBlockModal } from '../AskForCalibrationBlockModal'
 import { CheckboxField } from '@opentrons/components'
 import { setUseTrashSurfaceForTipCal } from '../../../redux/calibration'
 
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 
 type RenderReturnType = WrapperWithStore<
   React.ComponentProps<typeof AskForCalibrationBlockModal>
diff --git a/app/src/organisms/CalibrationPanels/__tests__/ChooseTipRack.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/ChooseTipRack.test.tsx
index 769967bcac71..ba20cb47faab 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/ChooseTipRack.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/ChooseTipRack.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 
 import { mockAttachedPipette } from '../../../redux/pipettes/__fixtures__'
 import { mockDeckCalTipRack } from '../../../redux/sessions/__fixtures__'
@@ -17,7 +17,7 @@ import { getAttachedPipettes } from '../../../redux/pipettes'
 import { ChooseTipRack } from '../ChooseTipRack'
 import type { AttachedPipettesByMount } from '../../../redux/pipettes/types'
 import type { ReactWrapper } from 'enzyme'
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 
 jest.mock('../../../redux/pipettes/selectors')
 jest.mock('../../../redux/calibration/')
diff --git a/app/src/organisms/ChangePipette/__tests__/ConfirmPipette.test.tsx b/app/src/organisms/ChangePipette/__tests__/ConfirmPipette.test.tsx
index 95eccac2a2fd..bc49f9aa7faa 100644
--- a/app/src/organisms/ChangePipette/__tests__/ConfirmPipette.test.tsx
+++ b/app/src/organisms/ChangePipette/__tests__/ConfirmPipette.test.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import {
   mountWithStore,
   WrapperWithStore,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 
 import { ConfirmPipette } from '../ConfirmPipette'
 import { CheckPipettesButton } from '../CheckPipettesButton'
diff --git a/app/src/organisms/ProtocolModuleList/__tests__/ProtocolModuleList.test.tsx b/app/src/organisms/ProtocolModuleList/__tests__/ProtocolModuleList.test.tsx
index 60f583590bbb..9489a5433e4c 100644
--- a/app/src/organisms/ProtocolModuleList/__tests__/ProtocolModuleList.test.tsx
+++ b/app/src/organisms/ProtocolModuleList/__tests__/ProtocolModuleList.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { StaticRouter } from 'react-router-dom'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../i18n'
 import { Box, Flex, ListItem, Tooltip } from '@opentrons/components'
diff --git a/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/ExtraAttentionWarning.test.tsx b/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/ExtraAttentionWarning.test.tsx
index c1aaee84e826..45b94695b945 100644
--- a/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/ExtraAttentionWarning.test.tsx
+++ b/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/ExtraAttentionWarning.test.tsx
@@ -4,7 +4,7 @@ import { fireEvent, screen } from '@testing-library/react'
 import {
   partialComponentPropsMatcher,
   renderWithProviders,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { ExtraAttentionWarning } from '../ExtraAttentionWarning'
 import { SecureLabwareModal } from '../SecureLabwareModal'
diff --git a/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareInfoOverlay.test.tsx b/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareInfoOverlay.test.tsx
index e77c775b0351..93fa485a166d 100644
--- a/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareInfoOverlay.test.tsx
+++ b/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareInfoOverlay.test.tsx
@@ -5,7 +5,7 @@ import {
   LabwareDefinition2,
 } from '@opentrons/shared-data'
 import fixture_tiprack_300_ul from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul.json'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { LabwareInfoOverlay } from '../LabwareInfoOverlay'
 
diff --git a/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareSetup.test.tsx b/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareSetup.test.tsx
index afa5fbc45f2e..a74659b56cb6 100644
--- a/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareSetup.test.tsx
+++ b/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareSetup.test.tsx
@@ -15,7 +15,7 @@ import {
   renderWithProviders,
   componentPropsMatcher,
   partialComponentPropsMatcher,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { LabwareSetup } from '..'
 import { LabwareSetupModal } from '../LabwareSetupModal'
diff --git a/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareSetupModal.test.tsx b/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareSetupModal.test.tsx
index f59538604250..1b3a94f7dd69 100644
--- a/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareSetupModal.test.tsx
+++ b/app/src/organisms/ProtocolSetup/RunSetupCard/LabwareSetup/__tests__/LabwareSetupModal.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { LabwareSetupModal } from '../LabwareSetupModal'
 
diff --git a/app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/ModuleInfo.test.tsx b/app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/ModuleInfo.test.tsx
index 300498e6e034..807b174730eb 100644
--- a/app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/ModuleInfo.test.tsx
+++ b/app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/ModuleInfo.test.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import '@testing-library/jest-dom'
 import { ModuleModel, ModuleType } from '@opentrons/shared-data'
 import { ModuleInfo } from '../ModuleInfo'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 
 const render = (props: React.ComponentProps<typeof ModuleInfo>) => {
diff --git a/app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/ModuleSetup.test.tsx b/app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/ModuleSetup.test.tsx
index de5971d6ff1b..f3dde6877163 100644
--- a/app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/ModuleSetup.test.tsx
+++ b/app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/ModuleSetup.test.tsx
@@ -8,7 +8,7 @@ import {
   renderWithProviders,
   partialComponentPropsMatcher,
   componentPropsMatcher,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { ModuleSetup } from '..'
 import { ModuleInfo } from '../ModuleInfo'
diff --git a/app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/MultipleModuleModal.test.tsx b/app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/MultipleModuleModal.test.tsx
index e87d3a39a0d9..33f1abdbbeee 100644
--- a/app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/MultipleModuleModal.test.tsx
+++ b/app/src/organisms/ProtocolSetup/RunSetupCard/ModuleSetup/__tests__/MultipleModuleModal.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { MultipleModulesModal } from '../MultipleModulesModal'
 
diff --git a/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/CalibrationItem.test.tsx b/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/CalibrationItem.test.tsx
index 3c372b1fe0c6..623b59be0627 100644
--- a/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/CalibrationItem.test.tsx
+++ b/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/CalibrationItem.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../../i18n'
 import { CalibrationItem } from '../CalibrationItem'
diff --git a/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/DeckCalibration.test.tsx b/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/DeckCalibration.test.tsx
index bd84288a31f0..f2ab5e3c9863 100644
--- a/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/DeckCalibration.test.tsx
+++ b/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/DeckCalibration.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { mockDeckCalData } from '../../../../../redux/calibration/__fixtures__'
 import * as calibrationSelectors from '../../../../../redux/calibration/selectors'
 
diff --git a/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/PipetteCalibration.test.tsx b/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/PipetteCalibration.test.tsx
index 9a86c5d611c0..4dd68ec8a3a6 100644
--- a/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/PipetteCalibration.test.tsx
+++ b/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/PipetteCalibration.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import { mockProtocolPipetteTipRackCalInfo } from '../../../../../redux/pipettes/__fixtures__'
 import { PipetteCalibration } from '../PipetteCalibration'
diff --git a/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/RobotCalibration.test.tsx b/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/RobotCalibration.test.tsx
index 1f9f70334601..10db86722878 100644
--- a/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/RobotCalibration.test.tsx
+++ b/app/src/organisms/ProtocolSetup/RunSetupCard/RobotCalibration/__tests__/RobotCalibration.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../../i18n'
 import * as PipetteOffset from '../../../../../redux/calibration/pipette-offset'
 import * as TipLength from '../../../../../redux/calibration/tip-length'
diff --git a/app/src/organisms/ProtocolSetup/RunSetupCard/__tests__/ProceedToRunCta.test.tsx b/app/src/organisms/ProtocolSetup/RunSetupCard/__tests__/ProceedToRunCta.test.tsx
index 05cd181c83b3..1543bb59806d 100644
--- a/app/src/organisms/ProtocolSetup/RunSetupCard/__tests__/ProceedToRunCta.test.tsx
+++ b/app/src/organisms/ProtocolSetup/RunSetupCard/__tests__/ProceedToRunCta.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
 import { StaticRouter } from 'react-router-dom'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../i18n'
 import * as hooks from '../hooks'
 import { ProceedToRunCta } from '../ProceedToRunCta'
diff --git a/app/src/organisms/ProtocolSetup/__tests__/CollapsibleStep.test.tsx b/app/src/organisms/ProtocolSetup/__tests__/CollapsibleStep.test.tsx
index 3d4647ab7d2b..47bd179e44f8 100644
--- a/app/src/organisms/ProtocolSetup/__tests__/CollapsibleStep.test.tsx
+++ b/app/src/organisms/ProtocolSetup/__tests__/CollapsibleStep.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../i18n'
 import { CollapsibleStep } from '../RunSetupCard/CollapsibleStep'
diff --git a/app/src/organisms/ProtocolSetup/__tests__/MetadataCard.test.tsx b/app/src/organisms/ProtocolSetup/__tests__/MetadataCard.test.tsx
index 23770ac88311..87c48d1b0889 100644
--- a/app/src/organisms/ProtocolSetup/__tests__/MetadataCard.test.tsx
+++ b/app/src/organisms/ProtocolSetup/__tests__/MetadataCard.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../i18n'
 import { MetadataCard } from '../MetadataCard'
diff --git a/app/src/organisms/ProtocolSetup/__tests__/RunSetupCard.test.tsx b/app/src/organisms/ProtocolSetup/__tests__/RunSetupCard.test.tsx
index b58d24cf034b..e0dfe340f927 100644
--- a/app/src/organisms/ProtocolSetup/__tests__/RunSetupCard.test.tsx
+++ b/app/src/organisms/ProtocolSetup/__tests__/RunSetupCard.test.tsx
@@ -6,7 +6,7 @@ import {
   componentPropsMatcher,
   partialComponentPropsMatcher,
   renderWithProviders,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 import noModulesProtocol from '@opentrons/shared-data/protocol/fixtures/4/simpleV4.json'
 import withModulesProtocol from '@opentrons/shared-data/protocol/fixtures/4/testModulesProtocol.json'
 
diff --git a/app/src/organisms/ProtocolUpload/__tests__/ProtocolUpload.test.tsx b/app/src/organisms/ProtocolUpload/__tests__/ProtocolUpload.test.tsx
index e07ce7330901..f69e046eb17c 100644
--- a/app/src/organisms/ProtocolUpload/__tests__/ProtocolUpload.test.tsx
+++ b/app/src/organisms/ProtocolUpload/__tests__/ProtocolUpload.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 import withModulesProtocol from '@opentrons/shared-data/protocol/fixtures/4/testModulesProtocol.json'
 
 import { i18n } from '../../../i18n'
diff --git a/app/src/organisms/ProtocolUpload/__tests__/UploadInput.test.tsx b/app/src/organisms/ProtocolUpload/__tests__/UploadInput.test.tsx
index 5b09c5623f76..95fc91ab56f4 100644
--- a/app/src/organisms/ProtocolUpload/__tests__/UploadInput.test.tsx
+++ b/app/src/organisms/ProtocolUpload/__tests__/UploadInput.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import '@testing-library/jest-dom'
 import { fireEvent } from '@testing-library/react'
-import { renderWithProviders } from '@opentrons/components/__utils__'
+import { renderWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../i18n'
 import { UploadInput } from '../UploadInput'
diff --git a/app/src/organisms/UpdateAppModal/__tests__/UpdateAppModal.test.tsx b/app/src/organisms/UpdateAppModal/__tests__/UpdateAppModal.test.tsx
index 705701ffed64..721d3a255c0a 100644
--- a/app/src/organisms/UpdateAppModal/__tests__/UpdateAppModal.test.tsx
+++ b/app/src/organisms/UpdateAppModal/__tests__/UpdateAppModal.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Link as InternalLink } from 'react-router-dom'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 
 import { BaseModal, Flex, Icon } from '@opentrons/components'
 import * as Shell from '../../../redux/shell'
diff --git a/app/src/pages/Calibrate/CalibratePanel/__tests__/CalibrationData.test.tsx b/app/src/pages/Calibrate/CalibratePanel/__tests__/CalibrationData.test.tsx
index 56e5c0b4c0d7..e07a9a3376c9 100644
--- a/app/src/pages/Calibrate/CalibratePanel/__tests__/CalibrationData.test.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/__tests__/CalibrationData.test.tsx
@@ -1,10 +1,10 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import { CalibrationData } from '../CalibrationData'
 
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 
 describe('CalibrationData', () => {
   let render: (
diff --git a/app/src/pages/Calibrate/CalibratePanel/__tests__/LabwareGroup.test.tsx b/app/src/pages/Calibrate/CalibratePanel/__tests__/LabwareGroup.test.tsx
index 7addfb91c34c..177d15e84aa9 100644
--- a/app/src/pages/Calibrate/CalibratePanel/__tests__/LabwareGroup.test.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/__tests__/LabwareGroup.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import wellPlate96Def from '@opentrons/shared-data/labware/fixtures/2/fixture_96_plate.json'
diff --git a/app/src/pages/Calibrate/CalibratePanel/__tests__/PipetteList.test.tsx b/app/src/pages/Calibrate/CalibratePanel/__tests__/PipetteList.test.tsx
index 53aec58ddd3d..56995e780265 100644
--- a/app/src/pages/Calibrate/CalibratePanel/__tests__/PipetteList.test.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/__tests__/PipetteList.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { StaticRouter } from 'react-router-dom'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import * as PipettesSelectors from '../../../../redux/pipettes/selectors'
diff --git a/app/src/pages/Calibrate/CalibratePanel/__tests__/TipLengthCalibrationData.test.tsx b/app/src/pages/Calibrate/CalibratePanel/__tests__/TipLengthCalibrationData.test.tsx
index a849cb7892a4..990538aec3df 100644
--- a/app/src/pages/Calibrate/CalibratePanel/__tests__/TipLengthCalibrationData.test.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/__tests__/TipLengthCalibrationData.test.tsx
@@ -1,10 +1,10 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import { TipLengthCalibrationData } from '../TipLengthCalibrationData'
 
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 
 describe('TipLengthCalibrationData', () => {
   let render: (
diff --git a/app/src/pages/Calibrate/__tests__/CalibrateTipLengthControl.test.tsx b/app/src/pages/Calibrate/__tests__/CalibrateTipLengthControl.test.tsx
index 6941aa2cce1a..8203adbe34b1 100644
--- a/app/src/pages/Calibrate/__tests__/CalibrateTipLengthControl.test.tsx
+++ b/app/src/pages/Calibrate/__tests__/CalibrateTipLengthControl.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 
 import wellPlate96Def from '@opentrons/shared-data/labware/fixtures/2/fixture_96_plate.json'
 import tiprack300Def from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul.json'
@@ -16,7 +16,7 @@ import * as Analytics from '../../../redux/analytics/actions'
 import type { Labware } from '../../../redux/robot/types'
 import type { State } from '../../../redux/types'
 import type { DispatchApiRequestType } from '../../../redux/robot-api'
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 
 jest.mock('../../../redux/robot-api')
 jest.mock('../../../redux/robot/selectors')
diff --git a/app/src/pages/More/AddLabwareCard/__tests__/AddLabwareCard.test.tsx b/app/src/pages/More/AddLabwareCard/__tests__/AddLabwareCard.test.tsx
index c2c9d3a4d734..fbd3c37f2d6c 100644
--- a/app/src/pages/More/AddLabwareCard/__tests__/AddLabwareCard.test.tsx
+++ b/app/src/pages/More/AddLabwareCard/__tests__/AddLabwareCard.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 
 import * as CustomLabware from '../../../../redux/custom-labware'
 import * as CustomLabwareFixtures from '../../../../redux/custom-labware/__fixtures__'
@@ -8,7 +8,7 @@ import { ManagePath } from '../ManagePath'
 import { AddLabware } from '../AddLabware'
 import { AddLabwareFailureModal } from '../AddLabwareFailureModal'
 
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 import type { State, Action } from '../../../../redux/types'
 
 jest.mock('../../../../redux/custom-labware/selectors')
diff --git a/app/src/pages/More/AppSettings/__tests__/AppAdvancedSettingsCard.test.tsx b/app/src/pages/More/AppSettings/__tests__/AppAdvancedSettingsCard.test.tsx
index 01d82a10212b..4dca8187e0b8 100644
--- a/app/src/pages/More/AppSettings/__tests__/AppAdvancedSettingsCard.test.tsx
+++ b/app/src/pages/More/AppSettings/__tests__/AppAdvancedSettingsCard.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import * as Config from '../../../../redux/config'
 import { AppAdvancedSettingsCard } from '../AppAdvancedSettingsCard'
 
diff --git a/app/src/pages/More/AppSettings/__tests__/AppSoftwareSettingsCard.test.tsx b/app/src/pages/More/AppSettings/__tests__/AppSoftwareSettingsCard.test.tsx
index 74758881bfc2..13fa649bef98 100644
--- a/app/src/pages/More/AppSettings/__tests__/AppSoftwareSettingsCard.test.tsx
+++ b/app/src/pages/More/AppSettings/__tests__/AppSoftwareSettingsCard.test.tsx
@@ -1,7 +1,7 @@
 // tests for the AppSoftwareSettingsCard
 import * as React from 'react'
 
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import { Card, LabeledValue, Link, SecondaryBtn } from '@opentrons/components'
 import * as Shell from '../../../../redux/shell'
 import { Portal } from '../../../../App/portal'
diff --git a/app/src/pages/More/AppSettings/__tests__/UpdateNotificationsControl.test.tsx b/app/src/pages/More/AppSettings/__tests__/UpdateNotificationsControl.test.tsx
index 88e731dba7ac..4855712c1d51 100644
--- a/app/src/pages/More/AppSettings/__tests__/UpdateNotificationsControl.test.tsx
+++ b/app/src/pages/More/AppSettings/__tests__/UpdateNotificationsControl.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 
 import { BORDER_SOLID_LIGHT } from '@opentrons/components'
 import * as Alerts from '../../../../redux/alerts'
diff --git a/app/src/pages/Robots/InstrumentSettings/__tests__/PipetteInfo.test.tsx b/app/src/pages/Robots/InstrumentSettings/__tests__/PipetteInfo.test.tsx
index ba31d39ab5a0..eeae982bc1f5 100644
--- a/app/src/pages/Robots/InstrumentSettings/__tests__/PipetteInfo.test.tsx
+++ b/app/src/pages/Robots/InstrumentSettings/__tests__/PipetteInfo.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 
 import * as Config from '../../../../redux/config'
 import {
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/UpdateBuildroot.test.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/UpdateBuildroot.test.tsx
index 387f33424d1b..f3d0f3c30454 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/UpdateBuildroot.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/UpdateBuildroot.test.tsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 import {
   mountWithStore,
   WrapperWithStore,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 import { mockConnectableRobot as mockRobot } from '../../../../../redux/discovery/__fixtures__'
 import * as Buildroot from '../../../../../redux/buildroot'
 import { UpdateBuildroot } from '..'
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/VersionInfoModal.test.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/VersionInfoModal.test.tsx
index 242242f6ee9b..1e44b23eec56 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/VersionInfoModal.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/VersionInfoModal.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import { AlertModal, OutlineButton } from '@opentrons/components'
 import { mockReachableRobot } from '../../../../../redux/discovery/__fixtures__'
 import { UPGRADE, DOWNGRADE, REINSTALL } from '../../../../../redux/buildroot'
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/ViewUpdateModal.test.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/ViewUpdateModal.test.tsx
index 2d2143af4bb6..fdbe651ec05e 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/ViewUpdateModal.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/ViewUpdateModal.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import * as Buildroot from '../../../../../redux/buildroot'
 
 import { DownloadUpdateModal } from '../DownloadUpdateModal'
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/AdvancedSettingsCard.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/AdvancedSettingsCard.test.tsx
index c499811000ad..686d424fd46f 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/AdvancedSettingsCard.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/AdvancedSettingsCard.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/CalibrationCard.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/CalibrationCard.test.tsx
index 48c1876cc27a..4817e4bba247 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/CalibrationCard.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/CalibrationCard.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 import { saveAs } from 'file-saver'
 
 import { i18n } from '../../../../i18n'
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/CheckCalibrationControl.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/CheckCalibrationControl.test.tsx
index 40a06db7f1f6..6d4967b99d12 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/CheckCalibrationControl.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/CheckCalibrationControl.test.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import {
   mountWithProviders,
   WrapperWithStore,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import * as Sessions from '../../../../redux/sessions'
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/ConnectionCard.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/ConnectionCard.test.tsx
index ffd2163d9cac..f6862f0a7925 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/ConnectionCard.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/ConnectionCard.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../i18n'
 
 import * as Networking from '../../../../redux/networking'
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/ControlsCard.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/ControlsCard.test.tsx
index 76f989c87d48..72a9b72cbaf8 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/ControlsCard.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/ControlsCard.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import * as RobotControls from '../../../../redux/robot-controls'
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/DeckCalibrationControl.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/DeckCalibrationControl.test.tsx
index 88c469996cd1..3588df5a866c 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/DeckCalibrationControl.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/DeckCalibrationControl.test.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import {
   mountWithProviders,
   WrapperWithStore,
-} from '@opentrons/components/__utils__'
+} from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/InformationCard.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/InformationCard.test.tsx
index f6bde96bc426..e1521efd3c9f 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/InformationCard.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/InformationCard.test.tsx
@@ -2,7 +2,7 @@
 import * as React from 'react'
 import { Link } from 'react-router-dom'
 
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 import { SecondaryBtn, Tooltip } from '@opentrons/components'
 import { i18n } from '../../../../i18n'
 
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/OpenJupyterControl.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/OpenJupyterControl.test.tsx
index f66955effe8b..e7e2658083c6 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/OpenJupyterControl.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/OpenJupyterControl.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 import { SecondaryBtn } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/PipetteOffsetItem.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/PipetteOffsetItem.test.tsx
index d7bebc04ee72..818538b4efc7 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/PipetteOffsetItem.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/PipetteOffsetItem.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 import { getLabwareDisplayName } from '@opentrons/shared-data'
 import { i18n } from '../../../../i18n'
 import { PipetteOffsetItem } from '../PipetteOffsetItem'
@@ -7,7 +7,7 @@ import { findLabwareDefWithCustom } from '../../../../assets/labware/findLabware
 
 import type { ReactWrapper } from 'enzyme'
 import type { State, Action } from '../../../../redux/types'
-import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { WrapperWithStore } from '@opentrons/components'
 import type {
   AttachedPipette,
   PipetteCalibrations,
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/RobotSettings.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/RobotSettings.test.tsx
index c424577f2802..a60bbd43278c 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/RobotSettings.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/RobotSettings.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { StaticRouter, Route, Redirect } from 'react-router-dom'
 
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../i18n'
 import {
   mockConnectableRobot,
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/StatusCard.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/StatusCard.test.tsx
index 741633c1217a..12659cc2a1ae 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/StatusCard.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/StatusCard.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 import { i18n } from '../../../../i18n'
 
 import * as Fixtures from '../../../../redux/discovery/__fixtures__'
diff --git a/app/src/pages/Run/RunPanel/__tests__/RunTimer.test.tsx b/app/src/pages/Run/RunPanel/__tests__/RunTimer.test.tsx
index aba2fca99f8e..8120d9d7723e 100644
--- a/app/src/pages/Run/RunPanel/__tests__/RunTimer.test.tsx
+++ b/app/src/pages/Run/RunPanel/__tests__/RunTimer.test.tsx
@@ -3,7 +3,7 @@ import { when } from 'jest-when'
 
 import { RunTimer } from '../RunTimer'
 import { formatSeconds, formatTime } from '../utils'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import * as selectors from '../../../../redux/robot/selectors'
 import { State } from '../../../../redux/types'
 
diff --git a/app/src/pages/Upload/FileInfo/__tests__/ProtocolLabwareList.test.tsx b/app/src/pages/Upload/FileInfo/__tests__/ProtocolLabwareList.test.tsx
index e85279213048..eb652028faa7 100644
--- a/app/src/pages/Upload/FileInfo/__tests__/ProtocolLabwareList.test.tsx
+++ b/app/src/pages/Upload/FileInfo/__tests__/ProtocolLabwareList.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 import { Tooltip, Text } from '@opentrons/components'
diff --git a/app/src/pages/Upload/UploadPanel/__tests__/index.test.tsx b/app/src/pages/Upload/UploadPanel/__tests__/index.test.tsx
index d0e2de1d13cf..0884ef8caffa 100644
--- a/app/src/pages/Upload/UploadPanel/__tests__/index.test.tsx
+++ b/app/src/pages/Upload/UploadPanel/__tests__/index.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { StaticRouter, Route } from 'react-router-dom'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../../i18n'
 
diff --git a/app/src/pages/Upload/__tests__/index.test.tsx b/app/src/pages/Upload/__tests__/index.test.tsx
index 605e2dda450b..281892ed9fd8 100644
--- a/app/src/pages/Upload/__tests__/index.test.tsx
+++ b/app/src/pages/Upload/__tests__/index.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { StaticRouter, Route } from 'react-router-dom'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import { mountWithProviders } from '@opentrons/components'
 
 import { i18n } from '../../../i18n'
 
diff --git a/app/src/redux/robot-api/__tests__/hooks.test.tsx b/app/src/redux/robot-api/__tests__/hooks.test.tsx
index 32db9a149981..bc6a9ee90232 100644
--- a/app/src/redux/robot-api/__tests__/hooks.test.tsx
+++ b/app/src/redux/robot-api/__tests__/hooks.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import uniqueId from 'lodash/uniqueId'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import { mountWithStore } from '@opentrons/components'
 import { PENDING, SUCCESS } from '../constants'
 import { useDispatchApiRequest, useDispatchApiRequests } from '../hooks'
 
diff --git a/components/__utils__/tsconfig.json b/components/__utils__/tsconfig.json
deleted file mode 100644
index 15246f82d7c7..000000000000
--- a/components/__utils__/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "../../tsconfig-base.json",
-  "references": [],
-  "compilerOptions": {
-    "composite": true,
-    "emitDeclarationOnly": false,
-    "rootDir": ".",
-    "outDir": "lib"
-  }
-}
diff --git a/components/src/hardware-sim/Pipette/__tests__/EightEmanatingNozzles.test.tsx b/components/src/hardware-sim/Pipette/__tests__/EightEmanatingNozzles.test.tsx
index c42f33ea9039..283b9a6a0b69 100644
--- a/components/src/hardware-sim/Pipette/__tests__/EightEmanatingNozzles.test.tsx
+++ b/components/src/hardware-sim/Pipette/__tests__/EightEmanatingNozzles.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { render } from '@testing-library/react'
 import { when } from 'jest-when'
-import { anyProps } from '../../../../__utils__/matchers'
+import { anyProps } from '../../../testing/utils'
 import { EightEmanatingNozzles } from '../EightEmanatingNozzles'
 import { EmanatingNozzle } from '../EmanatingNozzle'
 
diff --git a/components/src/hardware-sim/Pipette/__tests__/PipetteRender.test.tsx b/components/src/hardware-sim/Pipette/__tests__/PipetteRender.test.tsx
index a9f944598216..86d91657e1d7 100644
--- a/components/src/hardware-sim/Pipette/__tests__/PipetteRender.test.tsx
+++ b/components/src/hardware-sim/Pipette/__tests__/PipetteRender.test.tsx
@@ -2,10 +2,7 @@ import * as React from 'react'
 import { when, resetAllWhenMocks } from 'jest-when'
 import { render } from '@testing-library/react'
 import _uncasted_fixtureTiprack300Ul from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul.json'
-import {
-  anyProps,
-  partialComponentPropsMatcher,
-} from '../../../../__utils__/matchers'
+import { anyProps, partialComponentPropsMatcher } from '../../../testing/utils'
 import { RobotCoordsForeignDiv } from '../../Deck/RobotCoordsForeignDiv'
 import { PipetteRender } from '../PipetteRender'
 import { EmanatingNozzle } from '../EmanatingNozzle'
diff --git a/components/src/index.ts b/components/src/index.ts
index ac2d2147ac92..03c7687ca099 100644
--- a/components/src/index.ts
+++ b/components/src/index.ts
@@ -28,3 +28,6 @@ export * from './styles'
 
 // Pure Types
 export * from './robot-types'
+
+// testing utilities
+export * from './testing/utils'
diff --git a/components/__utils__/index.ts b/components/src/testing/utils/index.ts
similarity index 100%
rename from components/__utils__/index.ts
rename to components/src/testing/utils/index.ts
diff --git a/components/__utils__/matchers.ts b/components/src/testing/utils/matchers.ts
similarity index 90%
rename from components/__utils__/matchers.ts
rename to components/src/testing/utils/matchers.ts
index f5f3c4434d96..06b07dec1cab 100644
--- a/components/__utils__/matchers.ts
+++ b/components/src/testing/utils/matchers.ts
@@ -2,11 +2,11 @@ import { when } from 'jest-when'
 
 // these are needed because under the hood react calls components with two arguments (props and some second argument nobody seems to know)
 // https://github.com/timkindberg/jest-when/issues/66
-export const componentPropsMatcher = (matcher: unknown) =>
+export const componentPropsMatcher = (matcher: unknown): any =>
   // @ts-expect-error(sa, 2021-08-03): when.allArgs not part of type definition yet for jest-when
   when.allArgs((args, equals) => equals(args[0], matcher))
 
-export const partialComponentPropsMatcher = (argsToMatch: unknown) =>
+export const partialComponentPropsMatcher = (argsToMatch: unknown): any =>
   // @ts-expect-error(sa, 2021-08-03): when.allArgs not part of type definition yet for jest-when
   when.allArgs((args, equals) =>
     equals(args[0], expect.objectContaining(argsToMatch))
diff --git a/components/__utils__/mountWithProviders.tsx b/components/src/testing/utils/mountWithProviders.tsx
similarity index 100%
rename from components/__utils__/mountWithProviders.tsx
rename to components/src/testing/utils/mountWithProviders.tsx
diff --git a/components/__utils__/mountWithStore.ts b/components/src/testing/utils/mountWithStore.ts
similarity index 100%
rename from components/__utils__/mountWithStore.ts
rename to components/src/testing/utils/mountWithStore.ts
diff --git a/components/__utils__/renderWithProviders.tsx b/components/src/testing/utils/renderWithProviders.tsx
similarity index 100%
rename from components/__utils__/renderWithProviders.tsx
rename to components/src/testing/utils/renderWithProviders.tsx
diff --git a/components/tsconfig.json b/components/tsconfig.json
index b5959f9c43d3..094c62855028 100644
--- a/components/tsconfig.json
+++ b/components/tsconfig.json
@@ -1,9 +1,6 @@
 {
   "extends": "../tsconfig-base.json",
   "references": [
-    {
-      "path": "./__utils__"
-    },
     {
       "path": "../shared-data"
     }