diff --git a/eslint.config.mjs b/eslint.config.mjs
index eb0288a1d0..65e489aa9c 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -217,7 +217,7 @@ export default tsEslint.config(
         'error',
         [
           {
-            pattern: './src/test-utils/dom/index.ts',
+            pattern: './src/test-utils/dom/index.*s',
             message:
               "Do not import from the augmented ElementWrapper barrel '{{ path }}'. Use @cloudscape-design/test-utils-core/dom instead.",
           },
diff --git a/src/test-utils/dom/button-group/index.ts b/src/test-utils/dom/button-group/index.ts
index 064e405580..9f868b2dd8 100644
--- a/src/test-utils/dom/button-group/index.ts
+++ b/src/test-utils/dom/button-group/index.ts
@@ -1,11 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { ComponentWrapper, ElementWrapper } from '@cloudscape-design/test-utils-core/dom';
+import { ComponentWrapper, createWrapper, ElementWrapper } from '@cloudscape-design/test-utils-core/dom';
 
 import ButtonWrapper from '../button/index.js';
 import ButtonDropdownWrapper from '../button-dropdown/index.js';
 import FileInputWrapper from '../file-input/index.js';
-import createWrapper from '../index.js';
 import ToggleButtonWrapper from '../toggle-button/index.js';
 
 import testUtilStyles from '../../../button-group/test-classes/styles.selectors.js';
diff --git a/src/test-utils/dom/popover/index.ts b/src/test-utils/dom/popover/index.ts
index f3bd809669..f7dbb4c795 100644
--- a/src/test-utils/dom/popover/index.ts
+++ b/src/test-utils/dom/popover/index.ts
@@ -1,9 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { ComponentWrapper, ElementWrapper } from '@cloudscape-design/test-utils-core/dom';
+import { ComponentWrapper, createWrapper, ElementWrapper } from '@cloudscape-design/test-utils-core/dom';
 
 import ButtonWrapper from '../button';
-import createWrapper from '../index.js';
 
 import styles from '../../../popover/styles.selectors.js';