diff --git a/tests/e2e/face-material-authoring.e2e.ts b/tests/e2e/face-material-authoring.e2e.ts
index e34647bf..7673cf17 100644
--- a/tests/e2e/face-material-authoring.e2e.ts
+++ b/tests/e2e/face-material-authoring.e2e.ts
@@ -1,6 +1,6 @@
 import { expect, test } from "@playwright/test";
 
-import { clickViewport } from "./viewport-test-helpers";
+import { beginBoxCreation, clickViewport } from "./viewport-test-helpers";
 
 test("user can assign a face material through the UI and keep it through a draft reload", async ({ page }) => {
   const pageErrors: string[] = [];
@@ -22,7 +22,7 @@ test("user can assign a face material through the UI and keep it through a draft
   }, "webeditor3d.scene-document-draft");
   await page.reload();
 
-  await page.getByRole("button", { name: "Box Create" }).click();
+  await beginBoxCreation(page);
   await clickViewport(page);
   await page.getByTestId("face-button-posZ").click();
   await page.getByTestId("material-button-starter-amber-grid").click();
diff --git a/tests/e2e/first-room-workflow.e2e.ts b/tests/e2e/first-room-workflow.e2e.ts
index 218e27a2..e63e2599 100644
--- a/tests/e2e/first-room-workflow.e2e.ts
+++ b/tests/e2e/first-room-workflow.e2e.ts
@@ -1,6 +1,6 @@
 import { expect, test } from "@playwright/test";
 
-import { clickViewport } from "./viewport-test-helpers";
+import { beginBoxCreation, clickViewport } from "./viewport-test-helpers";
 
 test("first-room workflow covers create, texture, save/load, and run", async ({ page }) => {
   const pageErrors: string[] = [];
@@ -22,7 +22,7 @@ test("first-room workflow covers create, texture, save/load, and run", async ({
   }, "webeditor3d.scene-document-draft");
   await page.reload();
 
-  await page.getByRole("button", { name: "Box Create" }).click();
+  await beginBoxCreation(page);
   await clickViewport(page);
   await page.getByTestId("face-button-posZ").click();
   await page.getByTestId("material-button-starter-amber-grid").click();
@@ -44,7 +44,7 @@ test("first-room workflow covers create, texture, save/load, and run", async ({
   await expect(page.getByTestId("status-run-preflight")).toContainText("Ready for First Person");
 
   await page.getByRole("button", { name: "Save Draft" }).click();
-  await page.getByRole("button", { name: "Box Create" }).click();
+  await beginBoxCreation(page);
   await clickViewport(page);
   await expect(page.getByRole("button", { name: /Box Brush 2/ })).toBeVisible();
 
diff --git a/tests/e2e/orthographic-views.e2e.ts b/tests/e2e/orthographic-views.e2e.ts
index 68cfb38c..449e7c10 100644
--- a/tests/e2e/orthographic-views.e2e.ts
+++ b/tests/e2e/orthographic-views.e2e.ts
@@ -1,6 +1,6 @@
 import { expect, test } from "@playwright/test";
 
-import { clickViewport, getViewportOverlay, getViewportPanel } from "./viewport-test-helpers";
+import { beginBoxCreation, clickViewport, getViewportOverlay, getViewportPanel } from "./viewport-test-helpers";
 
 test("orthographic panel controls keep brush authoring and selection behavior intact", async ({ page }) => {
   const pageErrors: string[] = [];
@@ -22,7 +22,7 @@ test("orthographic panel controls keep brush authoring and selection behavior in
   }, "webeditor3d.scene-document-draft");
   await page.reload();
 
-  await page.getByRole("button", { name: "Box Create" }).click();
+  await beginBoxCreation(page);
   await clickViewport(page, "topLeft");
 
   await expect(page.getByRole("button", { name: /Box Brush 1/ })).toBeVisible();