diff --git a/.github/scripts/upgrade-test/README.md b/.github/scripts/upgrade-test/README.md
index 68fadc73..bb4519c8 100644
--- a/.github/scripts/upgrade-test/README.md
+++ b/.github/scripts/upgrade-test/README.md
@@ -179,7 +179,7 @@ TEST_DATA_FILE=/tmp/test-users.json \
 E2E_BASE_URL=http://localhost:7745 \
 pnpm exec playwright test \
   --project=chromium \
-  test/e2e/upgrade-verification.spec.ts
+  test/upgrade/upgrade-verification.spec.ts
 
 # Cleanup
 docker stop homebox-test
@@ -248,7 +248,7 @@ Potential improvements:
 
 - `.github/workflows/upgrade-test.yaml` - Main workflow definition
 - `.github/scripts/upgrade-test/create-test-data.sh` - Data generation script
-- `frontend/test/e2e/upgrade-verification.spec.ts` - Playwright verification tests
+- `frontend/test/upgrade/upgrade-verification.spec.ts` - Playwright verification tests
 - `.github/workflows/e2e-partial.yaml` - Standard E2E test workflow (for reference)
 
 ## Support
diff --git a/.github/workflows/upgrade-test.yaml b/.github/workflows/upgrade-test.yaml
index c11da481..0c792742 100644
--- a/.github/workflows/upgrade-test.yaml
+++ b/.github/workflows/upgrade-test.yaml
@@ -141,7 +141,7 @@ jobs:
           pnpm exec playwright test \
             -c ./test/playwright.config.ts \
             --project=chromium \
-            test/e2e/upgrade-verification.spec.ts
+            test/upgrade/upgrade-verification.spec.ts
         env:
           HOMEBOX_URL: http://localhost:7745
       
diff --git a/frontend/test/e2e/upgrade-verification.spec.ts b/frontend/test/upgrade/upgrade-verification.spec.ts
similarity index 97%
rename from frontend/test/e2e/upgrade-verification.spec.ts
rename to frontend/test/upgrade/upgrade-verification.spec.ts
index 38af3343..c78c3249 100644
--- a/frontend/test/e2e/upgrade-verification.spec.ts
+++ b/frontend/test/upgrade/upgrade-verification.spec.ts
@@ -1,3 +1,12 @@
+/**
+ * HomeBox Upgrade Verification Tests
+ *
+ * NOTE: These tests are ONLY meant to run in the upgrade-test workflow.
+ * They require test data to be pre-created by the create-test-data.sh script.
+ * These tests are stored in test/upgrade/ (not test/e2e/) to prevent them
+ * from running during normal E2E test runs.
+ */
+
 import { expect, test } from "@playwright/test";
 import * as fs from "fs";