diff --git a/e2e/accessibility.spec.ts b/e2e/accessibility.spec.ts
index e1c91b5f..0f1f9995 100644
--- a/e2e/accessibility.spec.ts
+++ b/e2e/accessibility.spec.ts
@@ -1,4 +1,4 @@
-import { test, describe, beforeEach } from "./fixtures";
+import { test, describe, beforeEach } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
 describe("accessibility", () => {
diff --git a/e2e/code-editor.spec.ts b/e2e/code-editor.spec.ts
index 0b7c284c..131e969f 100644
--- a/e2e/code-editor.spec.ts
+++ b/e2e/code-editor.spec.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, test } from "./fixtures";
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
 describe("code editor", () => {
diff --git a/e2e/history.spec.ts b/e2e/history.spec.ts
index 97f1016d..aa36e194 100644
--- a/e2e/history.spec.ts
+++ b/e2e/history.spec.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, test } from "./fixtures";
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
 describe("history", () => {
diff --git a/e2e/i18n.spec.ts b/e2e/i18n.spec.ts
index 96269067..adf02878 100644
--- a/e2e/i18n.spec.ts
+++ b/e2e/i18n.spec.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, test } from "./fixtures";
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
 describe("i18n", () => {
diff --git a/e2e/keyboard.spec.ts b/e2e/keyboard.spec.ts
index d367e396..8b67f12f 100644
--- a/e2e/keyboard.spec.ts
+++ b/e2e/keyboard.spec.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, test } from "./fixtures";
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
 describe("keyboard", () => {
diff --git a/e2e/layer-editor.spec.ts b/e2e/layer-editor.spec.ts
index 22a3f579..6729a254 100644
--- a/e2e/layer-editor.spec.ts
+++ b/e2e/layer-editor.spec.ts
@@ -1,5 +1,5 @@
 import { v1 as uuid } from "uuid";
-import { beforeEach, describe, test } from "./fixtures";
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
 describe("layer editor", () => {
diff --git a/e2e/layers-list.spec.ts b/e2e/layers-list.spec.ts
index 6b6add67..68d80735 100644
--- a/e2e/layers-list.spec.ts
+++ b/e2e/layers-list.spec.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, test } from "./fixtures";
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
 describe("layers list", () => {
diff --git a/e2e/map.spec.ts b/e2e/map.spec.ts
index 9fba4096..b33fdc66 100644
--- a/e2e/map.spec.ts
+++ b/e2e/map.spec.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, test } from "./fixtures";
+import { beforeEach, describe, test } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 
 describe("map", () => {
diff --git a/e2e/maputnik-driver.ts b/e2e/maputnik-driver.ts
index 4359c53b..97732307 100644
--- a/e2e/maputnik-driver.ts
+++ b/e2e/maputnik-driver.ts
@@ -3,7 +3,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { expect, type Locator, type Page, type Request } from "@playwright/test";
 import { readCoverage } from "./coverage";
-import { currentPage, recordCoverageChunk } from "./fixtures";
+import { currentPage, recordCoverageChunk } from "./utils/fixtures";
 import { ModalDriver } from "./modal-driver";
 
 const baseUrl = "http://localhost:8888/";
diff --git a/e2e/modals.spec.ts b/e2e/modals.spec.ts
index 68d4b962..1782b32e 100644
--- a/e2e/modals.spec.ts
+++ b/e2e/modals.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect, describe, beforeEach } from "./fixtures";
+import { test, expect, describe, beforeEach } from "./utils/fixtures";
 import { MaputnikDriver } from "./maputnik-driver";
 import tokens from "../src/config/tokens.json" with { type: "json" };
 
diff --git a/e2e/global-setup.ts b/e2e/utils/e2e-setup.ts
similarity index 100%
rename from e2e/global-setup.ts
rename to e2e/utils/e2e-setup.ts
diff --git a/e2e/global-teardown.ts b/e2e/utils/e2e-teardown.ts
similarity index 100%
rename from e2e/global-teardown.ts
rename to e2e/utils/e2e-teardown.ts
diff --git a/e2e/fixtures.ts b/e2e/utils/fixtures.ts
similarity index 100%
rename from e2e/fixtures.ts
rename to e2e/utils/fixtures.ts
diff --git a/playwright.config.ts b/playwright.config.ts
index 41336501..75fab414 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -9,8 +9,8 @@ const baseURL = process.env.E2E_BASE_URL ?? "http://localhost:8888/";
 export default defineConfig({
   testDir: "./e2e",
   testMatch: "**/*.spec.ts",
-  globalSetup: "./e2e/global-setup.ts",
-  globalTeardown: "./e2e/global-teardown.ts",
+  globalSetup: "./e2e/e2e-setup.ts",
+  globalTeardown: "./e2e/e2e-teardown.ts",
   fullyParallel: true,
   forbidOnly: isCI,
   retries: isCI ? 2 : 0,