diff --git a/packages/testkit/components/Dialog.ts b/packages/testkit/components/Dialog.ts
index 71d97c4233..ae0aeca735 100644
--- a/packages/testkit/components/Dialog.ts
+++ b/packages/testkit/components/Dialog.ts
@@ -1,5 +1,5 @@
 import { Page, Locator } from "@playwright/test";
-import { Button } from "./buttons";
+import { Button } from "./Button";
 
 /**
  * Class representing a Dialog element.
diff --git a/packages/testkit/components/IconButton.ts b/packages/testkit/components/IconButton.ts
index a246489707..23a6a3d7c6 100644
--- a/packages/testkit/components/IconButton.ts
+++ b/packages/testkit/components/IconButton.ts
@@ -1,6 +1,6 @@
 import { Locator, Page, test } from "@playwright/test";
 import { Button } from "./Button";
-import { Dialog } from "./popover";
+import { Dialog } from "./Dialog";
 import { Menu } from "./Menu";
 
 /**
diff --git a/packages/testkit/components/Modal.ts b/packages/testkit/components/Modal.ts
index 437b0c651d..ec68a32775 100644
--- a/packages/testkit/components/Modal.ts
+++ b/packages/testkit/components/Modal.ts
@@ -1,5 +1,5 @@
 import { Page, Locator } from "@playwright/test";
-import { IconButton } from "./buttons";
+import { IconButton } from "./IconButton";
 
 /**
  * Class representing a Modal
diff --git a/packages/testkit/components/Search.ts b/packages/testkit/components/Search.ts
index 591d44c05f..05b1c46187 100644
--- a/packages/testkit/components/Search.ts
+++ b/packages/testkit/components/Search.ts
@@ -1,7 +1,8 @@
 import { Page, Locator, test } from "@playwright/test";
 import { TextField } from "./TextField";
-import { Button, MenuButton } from "./buttons";
-import { Dialog } from "./popover";
+import { Button } from "./Button";
+import { MenuButton } from "./MenuButton";
+import { Dialog } from "./Dialog";
 import { Menu } from "./Menu";
 
 /**