diff --git a/tests/e2e/app-smoke.e2e.ts b/tests/e2e/app-smoke.e2e.ts
index b2e6d4aa..cf2a4fd0 100644
--- a/tests/e2e/app-smoke.e2e.ts
+++ b/tests/e2e/app-smoke.e2e.ts
@@ -18,6 +18,9 @@ test("app boots and shows the viewport shell", async ({ page }) => {
 
   await expect(page.getByTestId("toolbar-scene-name")).toHaveValue("Untitled Scene");
   await expect(page.getByTestId("viewport-shell")).toBeVisible();
+  await expect(page.getByTestId("viewport-panel-topLeft")).toBeVisible();
+  await expect(page.getByTestId("viewport-layout-single")).toBeVisible();
+  await expect(page.getByTestId("viewport-layout-quad")).toBeVisible();
   await expect(page.getByTestId("enter-run-mode")).toBeVisible();
   await expect(page.getByTestId("material-button-starter-amber-grid")).toBeVisible();
 
diff --git a/tests/e2e/box-brush-authoring.e2e.ts b/tests/e2e/box-brush-authoring.e2e.ts
index 378a2164..b26f5d9c 100644
--- a/tests/e2e/box-brush-authoring.e2e.ts
+++ b/tests/e2e/box-brush-authoring.e2e.ts
@@ -1,5 +1,7 @@
 import { expect, test } from "@playwright/test";
 
+import { clickViewport } from "./viewport-test-helpers";
+
 test("user can create a box brush and keep it through a draft reload", async ({ page }) => {
   const pageErrors: string[] = [];
   const consoleErrors: string[] = [];
@@ -21,12 +23,7 @@ test("user can create a box brush and keep it through a draft reload", async ({
   await page.reload();
 
   await page.getByRole("button", { name: "Box Create" }).click();
-  const viewportCanvas = page.locator('[data-testid="viewport-shell"] canvas');
-  if ((await viewportCanvas.count()) > 0) {
-    await viewportCanvas.click();
-  } else {
-    await page.getByTestId("viewport-fallback-create-box").click();
-  }
+  await clickViewport(page);
   await expect(page.getByRole("button", { name: /Box Brush 1/ })).toBeVisible();
   await expect(page.getByText("1 brush selected (Box Brush 1)")).toBeVisible();
   await expect(page.getByTestId("apply-brush-position")).toHaveCount(0);
@@ -46,7 +43,7 @@ test("user can create a box brush and keep it through a draft reload", async ({
   await page.getByRole("button", { name: /Entry Room/ }).click();
   await expect(page.getByTestId("brush-center-y")).toHaveValue("2");
   await expect(page.getByTestId("brush-size-z")).toHaveValue("4");
-  await expect(page.getByTestId("viewport-overlay")).toBeVisible();
+  await expect(page.getByTestId("viewport-overlay-topLeft")).toBeVisible();
 
   expect(pageErrors).toEqual([]);
   expect(consoleErrors).toEqual([]);
@@ -59,19 +56,10 @@ test("switching selection while a transform input is active does not overwrite t
   }, "webeditor3d.scene-document-draft");
   await page.reload();
 
-  const viewportCanvas = page.locator('[data-testid="viewport-shell"] canvas');
   await page.getByRole("button", { name: "Box Create" }).click();
-  if ((await viewportCanvas.count()) > 0) {
-    await viewportCanvas.click();
-  } else {
-    await page.getByTestId("viewport-fallback-create-box").click();
-  }
+  await clickViewport(page);
   await page.getByRole("button", { name: "Box Create" }).click();
-  if ((await viewportCanvas.count()) > 0) {
-    await viewportCanvas.click();
-  } else {
-    await page.getByTestId("viewport-fallback-create-box").click();
-  }
+  await clickViewport(page);
 
   const outlinerButtons = page.getByTestId("outliner-brush-list").getByRole("button");