diff --git a/.changeset/few-books-provide.md b/.changeset/few-books-provide.md
new file mode 100644
index 000000000..bce492ac0
--- /dev/null
+++ b/.changeset/few-books-provide.md
@@ -0,0 +1,17 @@
+---
+'@lion/button': patch
+'@lion/combobox': patch
+'@lion/core': patch
+'@lion/dialog': patch
+'@lion/form': patch
+'@lion/form-core': patch
+'@lion/form-integrations': patch
+'@lion/input': patch
+'@lion/listbox': patch
+'@lion/localize': patch
+'@lion/overlays': patch
+'@lion/select-rich': patch
+'@lion/tooltip': patch
+---
+
+use html & unsafeStatic from @open-wc/testing instead of directly from lit
diff --git a/.changeset/twelve-zoos-turn.md b/.changeset/twelve-zoos-turn.md
index c4c08fe64..e008e46a3 100644
--- a/.changeset/twelve-zoos-turn.md
+++ b/.changeset/twelve-zoos-turn.md
@@ -1,5 +1,5 @@
 ---
-"providence-analytics": patch
+'providence-analytics': patch
 ---
 
 Correct default target in Windows if no -t
diff --git a/packages/button/test-suites/LionButton.suite.js b/packages/button/test-suites/LionButton.suite.js
index ce329fbad..15ff25edc 100644
--- a/packages/button/test-suites/LionButton.suite.js
+++ b/packages/button/test-suites/LionButton.suite.js
@@ -1,11 +1,17 @@
 /* eslint-disable lit-a11y/click-events-have-key-events */
-import { browserDetection } from '@lion/core';
-import { aTimeout, expect, fixture, oneEvent, defineCE } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-
 import { LionButton } from '@lion/button';
-import sinon from 'sinon';
+import { browserDetection } from '@lion/core';
 import '@lion/core/differentKeyEventNamesShimIE';
+import {
+  aTimeout,
+  defineCE,
+  expect,
+  fixture,
+  html,
+  oneEvent,
+  unsafeStatic,
+} from '@open-wc/testing';
+import sinon from 'sinon';
 
 export function LionButtonSuite({ klass = LionButton } = {}) {
   const tagStringButton = defineCE(class extends klass {});
diff --git a/packages/button/test-suites/LionButtonReset.suite.js b/packages/button/test-suites/LionButtonReset.suite.js
index e541eb753..a9a0a0ba0 100644
--- a/packages/button/test-suites/LionButtonReset.suite.js
+++ b/packages/button/test-suites/LionButtonReset.suite.js
@@ -1,10 +1,8 @@
 /* eslint-disable lit-a11y/click-events-have-key-events */
-import { aTimeout, expect, fixture, defineCE } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-
 import { LionButtonReset } from '@lion/button';
-import sinon from 'sinon';
 import '@lion/core/differentKeyEventNamesShimIE';
+import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
+import sinon from 'sinon';
 
 export function LionButtonResetSuite({ klass = LionButtonReset } = {}) {
   const tagStringButtonReset = defineCE(class extends klass {});
diff --git a/packages/button/test-suites/LionButtonSubmit.suite.js b/packages/button/test-suites/LionButtonSubmit.suite.js
index b5bbd2538..f294c911b 100644
--- a/packages/button/test-suites/LionButtonSubmit.suite.js
+++ b/packages/button/test-suites/LionButtonSubmit.suite.js
@@ -1,11 +1,9 @@
 /* eslint-disable lit-a11y/click-events-have-key-events */
-import { aTimeout, expect, fixture, defineCE } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-
-import { sendKeys } from '@web/test-runner-commands';
 import { LionButtonSubmit } from '@lion/button';
-import sinon from 'sinon';
 import '@lion/core/differentKeyEventNamesShimIE';
+import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
+import { sendKeys } from '@web/test-runner-commands';
+import sinon from 'sinon';
 
 export function LionButtonSubmitSuite({ klass = LionButtonSubmit } = {}) {
   const tagStringButton = defineCE(class extends klass {});
diff --git a/packages/combobox/test/lion-combobox.test.js b/packages/combobox/test/lion-combobox.test.js
index 31de70e98..4a67bb430 100644
--- a/packages/combobox/test/lion-combobox.test.js
+++ b/packages/combobox/test/lion-combobox.test.js
@@ -1,11 +1,10 @@
-import '@lion/listbox/define-option';
-import { expect, fixture, defineCE } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-import sinon from 'sinon';
 import '@lion/combobox/define';
 import { browserDetection, LitElement } from '@lion/core';
-import { getListboxMembers } from '@lion/listbox/test-helpers';
 import { Required } from '@lion/form-core';
+import '@lion/listbox/define-option';
+import { getListboxMembers } from '@lion/listbox/test-helpers';
+import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
+import sinon from 'sinon';
 import { LionCombobox } from '../src/LionCombobox.js';
 
 /**
diff --git a/packages/core/test/DelegateMixin.test.js b/packages/core/test/DelegateMixin.test.js
index 1acc9babf..46fa03192 100644
--- a/packages/core/test/DelegateMixin.test.js
+++ b/packages/core/test/DelegateMixin.test.js
@@ -1,5 +1,4 @@
-import { defineCE, expect, fixture } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
+import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
 import { LitElement } from '../index.js';
 import { DelegateMixin } from '../src/DelegateMixin.js';
diff --git a/packages/dialog/test/lion-dialog.test.js b/packages/dialog/test/lion-dialog.test.js
index 41d71a2a5..0ef4892a4 100644
--- a/packages/dialog/test/lion-dialog.test.js
+++ b/packages/dialog/test/lion-dialog.test.js
@@ -1,5 +1,4 @@
-import { expect, fixture as _fixture } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
+import { expect, fixture as _fixture, html, unsafeStatic } from '@open-wc/testing';
 import { runOverlayMixinSuite } from '../../overlays/test-suites/OverlayMixin.suite.js';
 import '@lion/dialog/define';
 
diff --git a/packages/form-core/test-suites/FormatMixin.suite.js b/packages/form-core/test-suites/FormatMixin.suite.js
index 16b1ac57f..7bfa1c144 100644
--- a/packages/form-core/test-suites/FormatMixin.suite.js
+++ b/packages/form-core/test-suites/FormatMixin.suite.js
@@ -1,11 +1,9 @@
 import { LitElement } from '@lion/core';
 import { parseDate } from '@lion/localize';
-import { aTimeout, defineCE, expect, fixture } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-
+import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
-import { FormatMixin } from '../src/FormatMixin.js';
 import { Unparseable, Validator } from '../index.js';
+import { FormatMixin } from '../src/FormatMixin.js';
 import { getFormControlMembers } from '../test-helpers/getFormControlMembers.js';
 
 /**
diff --git a/packages/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js b/packages/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js
index 186263314..621665a03 100644
--- a/packages/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js
+++ b/packages/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js
@@ -1,10 +1,8 @@
 import { LitElement } from '@lion/core';
-import { LionInput } from '@lion/input';
 import '@lion/fieldset/define';
 import { FormGroupMixin, Required } from '@lion/form-core';
-import { expect, fixture, fixtureSync } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-
+import { LionInput } from '@lion/input';
+import { expect, fixture, fixtureSync, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
 import { ChoiceGroupMixin } from '../../src/choice-group/ChoiceGroupMixin.js';
 import { ChoiceInputMixin } from '../../src/choice-group/ChoiceInputMixin.js';
diff --git a/packages/form-core/test-suites/form-group/FormGroupMixin-input.suite.js b/packages/form-core/test-suites/form-group/FormGroupMixin-input.suite.js
index ead12dd89..0e50d3d8f 100644
--- a/packages/form-core/test-suites/form-group/FormGroupMixin-input.suite.js
+++ b/packages/form-core/test-suites/form-group/FormGroupMixin-input.suite.js
@@ -1,10 +1,9 @@
 import { LitElement } from '@lion/core';
-import { localizeTearDown } from '@lion/localize/test-helpers';
-import { html, unsafeStatic } from 'lit/static-html.js';
-import { defineCE, expect, fixture } from '@open-wc/testing';
+import '@lion/form-core/define';
 import { getFormControlMembers } from '@lion/form-core/test-helpers';
 import { LionInput } from '@lion/input';
-import '@lion/form-core/define';
+import { localizeTearDown } from '@lion/localize/test-helpers';
+import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import { FormGroupMixin } from '../../src/form-group/FormGroupMixin.js';
 
 /**
diff --git a/packages/form-core/test-suites/form-group/FormGroupMixin.suite.js b/packages/form-core/test-suites/form-group/FormGroupMixin.suite.js
index 992dc36fc..171dc4bf3 100644
--- a/packages/form-core/test-suites/form-group/FormGroupMixin.suite.js
+++ b/packages/form-core/test-suites/form-group/FormGroupMixin.suite.js
@@ -1,10 +1,17 @@
-import { LitElement, ifDefined } from '@lion/core';
-import { html, unsafeStatic } from 'lit/static-html.js';
-import { localizeTearDown } from '@lion/localize/test-helpers';
-import { defineCE, expect, triggerFocusFor, fixture, aTimeout } from '@open-wc/testing';
-import sinon from 'sinon';
-import { IsNumber, Validator, LionField } from '@lion/form-core';
+import { ifDefined, LitElement } from '@lion/core';
+import { IsNumber, LionField, Validator } from '@lion/form-core';
 import '@lion/form-core/define';
+import { localizeTearDown } from '@lion/localize/test-helpers';
+import {
+  aTimeout,
+  defineCE,
+  expect,
+  fixture,
+  html,
+  triggerFocusFor,
+  unsafeStatic,
+} from '@open-wc/testing';
+import sinon from 'sinon';
 import { FormGroupMixin } from '../../src/form-group/FormGroupMixin.js';
 import { getFormControlMembers } from '../../test-helpers/getFormControlMembers.js';
 
diff --git a/packages/form-core/test/FocusMixin.test.js b/packages/form-core/test/FocusMixin.test.js
index b32ef4619..0a1aaf113 100644
--- a/packages/form-core/test/FocusMixin.test.js
+++ b/packages/form-core/test/FocusMixin.test.js
@@ -1,6 +1,5 @@
 import { LitElement } from '@lion/core';
-import { defineCE, expect, fixture, oneEvent } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
+import { defineCE, expect, fixture, html, oneEvent, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
 import { FocusMixin } from '../src/FocusMixin.js';
 
diff --git a/packages/form-core/test/FormControlMixin.test.js b/packages/form-core/test/FormControlMixin.test.js
index 0fcd835fa..bbc5e373b 100644
--- a/packages/form-core/test/FormControlMixin.test.js
+++ b/packages/form-core/test/FormControlMixin.test.js
@@ -1,12 +1,11 @@
-import { expect, defineCE, fixture } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
 import { LitElement } from '@lion/core';
 import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
-import { FormControlMixin } from '../src/FormControlMixin.js';
-import { FormRegistrarMixin } from '../src/registration/FormRegistrarMixin.js';
 import { FocusMixin } from '../src/FocusMixin.js';
 import { FormGroupMixin } from '../src/form-group/FormGroupMixin.js';
+import { FormControlMixin } from '../src/FormControlMixin.js';
+import { FormRegistrarMixin } from '../src/registration/FormRegistrarMixin.js';
 
 /**
  * @typedef {import('../types/FormControlMixinTypes').FormControlHost} FormControlHost
diff --git a/packages/form-core/test/lion-field.test.js b/packages/form-core/test/lion-field.test.js
index 0e666c5ea..7a5bcba72 100644
--- a/packages/form-core/test/lion-field.test.js
+++ b/packages/form-core/test/lion-field.test.js
@@ -1,12 +1,18 @@
 import { unsafeHTML } from '@lion/core';
+import { Required, Validator } from '@lion/form-core';
+import '@lion/form-core/define-field';
+import { getFormControlMembers } from '@lion/form-core/test-helpers';
 import { localize } from '@lion/localize';
 import { localizeTearDown } from '@lion/localize/test-helpers';
-import { Required, Validator } from '@lion/form-core';
-import { expect, fixture, triggerBlurFor, triggerFocusFor } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import {
+  expect,
+  fixture,
+  html,
+  triggerBlurFor,
+  triggerFocusFor,
+  unsafeStatic,
+} from '@open-wc/testing';
 import sinon from 'sinon';
-import '@lion/form-core/define-field';
 
 /**
  * @typedef {import('../src/LionField.js').LionField} LionField
diff --git a/packages/form-core/test/utils/SyncUpdatableMixin.test.js b/packages/form-core/test/utils/SyncUpdatableMixin.test.js
index 777edc563..d04b58530 100644
--- a/packages/form-core/test/utils/SyncUpdatableMixin.test.js
+++ b/packages/form-core/test/utils/SyncUpdatableMixin.test.js
@@ -1,6 +1,5 @@
 import { LitElement } from '@lion/core';
-import { defineCE, expect, fixture, fixtureSync } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
+import { defineCE, expect, fixture, fixtureSync, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
 import { SyncUpdatableMixin } from '../../src/utils/SyncUpdatableMixin.js';
 
diff --git a/packages/form-core/test/validate/Required.test.js b/packages/form-core/test/validate/Required.test.js
index 24cdf9902..097f6abd8 100644
--- a/packages/form-core/test/validate/Required.test.js
+++ b/packages/form-core/test/validate/Required.test.js
@@ -1,7 +1,6 @@
-import { expect, fixture, defineCE } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
 import { LionField } from '@lion/form-core';
 import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import { Required } from '../../src/validate/validators/Required.js';
 
 /**
diff --git a/packages/form-core/test/validate/Validator.test.js b/packages/form-core/test/validate/Validator.test.js
index 5ef5f6e29..3886ab386 100644
--- a/packages/form-core/test/validate/Validator.test.js
+++ b/packages/form-core/test/validate/Validator.test.js
@@ -1,6 +1,5 @@
 import { LitElement } from '@lion/core';
-import { defineCE, expect, fixture } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
+import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
 import { ValidateMixin } from '../../src/validate/ValidateMixin.js';
 import { Validator } from '../../src/validate/Validator.js';
diff --git a/packages/form-integrations/test/form-validation-integrations.test.js b/packages/form-integrations/test/form-validation-integrations.test.js
index f2701afe6..614523032 100644
--- a/packages/form-integrations/test/form-validation-integrations.test.js
+++ b/packages/form-integrations/test/form-validation-integrations.test.js
@@ -1,11 +1,10 @@
-import { expect, fixture, defineCE } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-import { Required, DefaultSuccess, Validator } from '@lion/form-core';
+import { DefaultSuccess, Required, Validator } from '@lion/form-core';
+import { getFormControlMembers } from '@lion/form-core/test-helpers';
+import { LionInput } from '@lion/input';
 import { localize } from '@lion/localize';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
-import { LionInput } from '@lion/input';
+import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import sinon from 'sinon';
-import { getFormControlMembers } from '@lion/form-core/test-helpers';
 
 describe('Form Validation Integrations', () => {
   const lightDom = '';
diff --git a/packages/form-integrations/test/model-value-consistency.test.js b/packages/form-integrations/test/model-value-consistency.test.js
index 7b11e98f6..1ae2a5a7d 100644
--- a/packages/form-integrations/test/model-value-consistency.test.js
+++ b/packages/form-integrations/test/model-value-consistency.test.js
@@ -1,5 +1,4 @@
-import { expect, fixture } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
+import { expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import sinon from 'sinon';
diff --git a/packages/form/test/lion-form.test.js b/packages/form/test/lion-form.test.js
index e3d3ddd20..9fa3e39a9 100644
--- a/packages/form/test/lion-form.test.js
+++ b/packages/form/test/lion-form.test.js
@@ -1,15 +1,20 @@
-import { expect, fixture as _fixture, oneEvent, aTimeout, defineCE } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-import { spy } from 'sinon';
-import { LionField } from '@lion/form-core';
 import { LionFieldset } from '@lion/fieldset';
-import '@lion/form-core/define';
 import '@lion/fieldset/define';
-
+import { LionField } from '@lion/form-core';
+import '@lion/form-core/define';
 import '@lion/form/define';
+import {
+  aTimeout,
+  defineCE,
+  expect,
+  fixture as _fixture,
+  html,
+  oneEvent,
+  unsafeStatic,
+} from '@open-wc/testing';
+import { spy } from 'sinon';
 
 /**
-
  * @typedef {import('../src/LionForm').LionForm} LionForm
  * @typedef {import('@lion/core').TemplateResult} TemplateResult
  */
diff --git a/packages/input/test/lion-input.test.js b/packages/input/test/lion-input.test.js
index e3740f411..8a58e77a1 100644
--- a/packages/input/test/lion-input.test.js
+++ b/packages/input/test/lion-input.test.js
@@ -1,8 +1,7 @@
 import { Validator } from '@lion/form-core';
-import { expect, fixture, triggerFocusFor, aTimeout } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-import { getInputMembers } from '../test-helpers/index.js';
 import '@lion/input/define';
+import { aTimeout, expect, fixture, html, triggerFocusFor, unsafeStatic } from '@open-wc/testing';
+import { getInputMembers } from '../test-helpers/index.js';
 
 /**
  * @typedef {import('../src/LionInput').LionInput} LionInput
diff --git a/packages/listbox/test-suites/ListboxMixin.suite.js b/packages/listbox/test-suites/ListboxMixin.suite.js
index 653c6b99e..7b484e3f5 100644
--- a/packages/listbox/test-suites/ListboxMixin.suite.js
+++ b/packages/listbox/test-suites/ListboxMixin.suite.js
@@ -1,11 +1,17 @@
+import { LitElement, repeat } from '@lion/core';
 import '@lion/core/differentKeyEventNamesShimIE';
-import { repeat, LitElement } from '@lion/core';
 import { Required } from '@lion/form-core';
 import { LionOptions } from '@lion/listbox';
 import '@lion/listbox/define';
-import { expect, aTimeout, nextFrame, fixture as _fixture, defineCE } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-
+import {
+  aTimeout,
+  defineCE,
+  expect,
+  fixture as _fixture,
+  html,
+  nextFrame,
+  unsafeStatic,
+} from '@open-wc/testing';
 import sinon from 'sinon';
 import { getListboxMembers } from '../test-helpers/index.js';
 
diff --git a/packages/localize/test/LocalizeMixin.test.js b/packages/localize/test/LocalizeMixin.test.js
index 122bc2dbb..7a1753ba0 100644
--- a/packages/localize/test/LocalizeMixin.test.js
+++ b/packages/localize/test/LocalizeMixin.test.js
@@ -1,6 +1,14 @@
 import { isDirectiveResult, LitElement } from '@lion/core';
-import { aTimeout, defineCE, expect, fixture, fixtureSync, nextFrame } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
+import {
+  aTimeout,
+  defineCE,
+  expect,
+  fixture,
+  fixtureSync,
+  html,
+  nextFrame,
+  unsafeStatic,
+} from '@open-wc/testing';
 import sinon from 'sinon';
 import { localize } from '../src/localize.js';
 import { LocalizeMixin } from '../src/LocalizeMixin.js';
diff --git a/packages/overlays/test-suites/OverlayMixin.suite.js b/packages/overlays/test-suites/OverlayMixin.suite.js
index a27e0f9b4..4ae6508c9 100644
--- a/packages/overlays/test-suites/OverlayMixin.suite.js
+++ b/packages/overlays/test-suites/OverlayMixin.suite.js
@@ -1,4 +1,5 @@
 import { expect, fixture, html, nextFrame, aTimeout } from '@open-wc/testing';
+
 import sinon from 'sinon';
 import { overlays } from '../src/overlays.js';
 import { OverlayController } from '../src/OverlayController.js';
diff --git a/packages/overlays/test/OverlayController.test.js b/packages/overlays/test/OverlayController.test.js
index a1edbf22e..51304c27a 100644
--- a/packages/overlays/test/OverlayController.test.js
+++ b/packages/overlays/test/OverlayController.test.js
@@ -1,10 +1,8 @@
 /* eslint-disable no-new */
-import { aTimeout, defineCE, expect, fixture } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
+import '@lion/core/differentKeyEventNamesShimIE';
+import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 import { fixtureSync } from '@open-wc/testing-helpers';
 import sinon from 'sinon';
-
-import '@lion/core/differentKeyEventNamesShimIE';
 import { OverlayController } from '../src/OverlayController.js';
 import { overlays } from '../src/overlays.js';
 import { keyCodes } from '../src/utils/key-codes.js';
diff --git a/packages/overlays/test/OverlayMixin.test.js b/packages/overlays/test/OverlayMixin.test.js
index 34fb94c1f..842b90e72 100644
--- a/packages/overlays/test/OverlayMixin.test.js
+++ b/packages/overlays/test/OverlayMixin.test.js
@@ -1,5 +1,4 @@
-import { defineCE } from '@open-wc/testing';
-import { unsafeStatic } from 'lit/static-html.js';
+import { defineCE, unsafeStatic } from '@open-wc/testing';
 import { LitElement, html } from '@lion/core';
 import { runOverlayMixinSuite } from '../test-suites/OverlayMixin.suite.js';
 import { OverlayMixin } from '../src/OverlayMixin.js';
diff --git a/packages/select-rich/test/lion-select-rich-dialog-integration.test.js b/packages/select-rich/test/lion-select-rich-dialog-integration.test.js
index 3b3d1f178..4dbbb7130 100644
--- a/packages/select-rich/test/lion-select-rich-dialog-integration.test.js
+++ b/packages/select-rich/test/lion-select-rich-dialog-integration.test.js
@@ -1,9 +1,8 @@
-import { OverlayMixin } from '@lion/overlays';
 import { LitElement } from '@lion/core';
-import { defineCE, fixture, expect } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
 import '@lion/listbox/define';
+import { OverlayMixin } from '@lion/overlays';
 import '@lion/select-rich/define';
+import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
 
 /**
  * @typedef {import('../src/LionSelectRich').LionSelectRich} LionSelectRich
diff --git a/packages/select-rich/test/lion-select-rich.test.js b/packages/select-rich/test/lion-select-rich.test.js
index cda11372f..f68f47999 100644
--- a/packages/select-rich/test/lion-select-rich.test.js
+++ b/packages/select-rich/test/lion-select-rich.test.js
@@ -1,15 +1,22 @@
 import { LitElement } from '@lion/core';
-import { renderLitAsNode } from '@lion/helpers';
-import { OverlayController } from '@lion/overlays';
-import { LionOption } from '@lion/listbox';
-import { mimicClick } from '@lion/overlays/test-helpers';
-import { aTimeout, defineCE, expect, nextFrame, fixture as _fixture } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-import { LionSelectInvoker, LionSelectRich } from '@lion/select-rich';
 import '@lion/core/differentKeyEventNamesShimIE';
+import { renderLitAsNode } from '@lion/helpers';
+import { LionOption } from '@lion/listbox';
 import '@lion/listbox/define';
-import '@lion/select-rich/define';
 import { getListboxMembers } from '@lion/listbox/test-helpers';
+import { OverlayController } from '@lion/overlays';
+import { mimicClick } from '@lion/overlays/test-helpers';
+import { LionSelectInvoker, LionSelectRich } from '@lion/select-rich';
+import '@lion/select-rich/define';
+import {
+  aTimeout,
+  defineCE,
+  expect,
+  fixture as _fixture,
+  html,
+  nextFrame,
+  unsafeStatic,
+} from '@open-wc/testing';
 
 /**
  * @typedef {import('@lion/listbox/src/LionOptions').LionOptions} LionOptions
diff --git a/packages/tooltip/test/lion-tooltip.test.js b/packages/tooltip/test/lion-tooltip.test.js
index 1009af4fb..ee070c735 100644
--- a/packages/tooltip/test/lion-tooltip.test.js
+++ b/packages/tooltip/test/lion-tooltip.test.js
@@ -1,7 +1,6 @@
-import { aTimeout, expect, fixture } from '@open-wc/testing';
-import { html, unsafeStatic } from 'lit/static-html.js';
-import { runOverlayMixinSuite } from '../../overlays/test-suites/OverlayMixin.suite.js';
 import '@lion/tooltip/define';
+import { aTimeout, expect, fixture, html, unsafeStatic } from '@open-wc/testing';
+import { runOverlayMixinSuite } from '../../overlays/test-suites/OverlayMixin.suite.js';
 
 /**
  * @typedef {import('../src/LionTooltip.js').LionTooltip} LionTooltip