diff --git a/.github/agents/pr-reviewer.agent.md b/.github/agents/pr-reviewer.agent.md
index 357fbca5..9def873b 100644
--- a/.github/agents/pr-reviewer.agent.md
+++ b/.github/agents/pr-reviewer.agent.md
@@ -28,7 +28,7 @@ You will pay special attention to the following areas during your review:
 - **Project Architecture**: Does the PR respect the single Node.js server + static frontend architecture? Are changes in the right place?
 
 ### 2. Testing and Validation
-- **No commit without tests**: Is the backend logic change covered by unit tests? Is `test-packet-filter.js` or `test-aging.js` updated if necessary?
+- **No commit without tests**: Is the backend logic change covered by unit tests? Is `tests/unit/test-packet-filter.js` or `tests/unit/test-aging.js` updated if necessary?
 - **Browser Validation**: Has the contributor confirmed the change works in a browser? Is there a screenshot for visual changes?
 - **Cache Busters**: If any `public/` assets (`.js`, `.css`) were modified, has the cache buster in `public/index.html` been bumped in the *same commit*? This is critical.
 
diff --git a/.github/instructions/copilot.instructions.md b/.github/instructions/copilot.instructions.md
index 357fbca5..9def873b 100644
--- a/.github/instructions/copilot.instructions.md
+++ b/.github/instructions/copilot.instructions.md
@@ -28,7 +28,7 @@ You will pay special attention to the following areas during your review:
 - **Project Architecture**: Does the PR respect the single Node.js server + static frontend architecture? Are changes in the right place?
 
 ### 2. Testing and Validation
-- **No commit without tests**: Is the backend logic change covered by unit tests? Is `test-packet-filter.js` or `test-aging.js` updated if necessary?
+- **No commit without tests**: Is the backend logic change covered by unit tests? Is `tests/unit/test-packet-filter.js` or `tests/unit/test-aging.js` updated if necessary?
 - **Browser Validation**: Has the contributor confirmed the change works in a browser? Is there a screenshot for visual changes?
 - **Cache Busters**: If any `public/` assets (`.js`, `.css`) were modified, has the cache buster in `public/index.html` been bumped in the *same commit*? This is critical.
 
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 737fee93..bd522b19 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -472,7 +472,7 @@ jobs:
 
       - name: Run Playwright E2E tests (fail-fast)
         run: |
-          BASE_URL=http://localhost:13581 node test-e2e-playwright.js 2>&1 | tee e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-e2e-playwright.js 2>&1 | tee e2e-output.txt
           # M5+M6 of #1668 — axe-core CI gate.
           # M5: color-contrast on desktop dark+light.
           # M6: expanded ruleset (image-alt, label, aria-required-attr,
@@ -483,100 +483,100 @@ jobs:
           # Allowlist: tests/a11y-allowlist.yaml (0 entries — hard pass policy).
           # Per-viewport summary printed at the end; any net>0 fails the build.
           BASE_URL=http://localhost:13581 AXE_SCREENSHOT_DIR=/tmp/axe-1668 \
-            node test-a11y-axe-1668.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-filter-ux-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-channel-issue-1087-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-channel-issue-1111-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-map-modal-fluid-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-map-nodes-pagination-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-observer-iata-1188-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1639-observers-sort-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1758-ng-filter-rerenders-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-nav-fluid-1055-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-nav-priority-1102-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-nav-priority-1311-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-nav-priority-1391-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1413-nav-overlap-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1400-nav-vertical-clip.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-nav-more-floor-1139-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-bottom-nav-1061-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-gestures-1062-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-gestures-1185-scroll-discriminator-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-gesture-hints-1065-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-touch-gestures-coverage-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-channel-fluid-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-table-fluid-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-charts-fluid-1058-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-slideover-1056-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1692-packets-init-parallel-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-slideover-1168-munger-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-logo-pulse-1173-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1122-packets-filter-ux-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1128-packets-layout-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1128-multi-viewport-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1136-live-region-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-live-multibyte-only-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1150-404-state-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1146-path-link-contrast-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 node test-issue-1705-subpath-contrast-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1147-section-order-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1151-orphan-separators-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1486-collapse-reopens-detail-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-logo-rebrand-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-logo-theme-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-logo-default-sage-teal-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1109-hamburger-dropdown-visible-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-live-layout-1178-1179-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1205-live-controls-anchor-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-live-mql-leak-1180-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1204-live-panel-structure-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1234-live-chrome-pass2-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1206-vcr-overlap-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1244-live-vcr-row-hints-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1510-live-nav-pin-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-live-fullscreen-1572-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1599-replay-freeze-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1648-m1-icons-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1648-m2-icons-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1648-m3-icons-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1648-m4-icons-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1657-analytics-channels-group-sprites-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1224-channels-mobile-ux-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1367-channels-chat-app-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1236-map-mobile-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1329-map-controls-accordion-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1273-qr-overlay-height-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1281-location-row-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1279-legend-p2-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-issue-1799-label-vocab-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-home-coverage-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-path-inspector-coverage-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1206-resize-observer-leak-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-nav-drawer-1064-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-audio-live-1297-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-audio-lab-1297-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-channel-decrypt-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-channel-qr-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-channel-color-picker-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-customize-theme-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-customize-branding-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-customize-display-e2e.js 2>&1 | tee -a e2e-output.txt
-          BASE_URL=http://localhost:13581 node test-customize-export-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-drag-manager-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1567-corner-clears-drag-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1306-collisions-terminology-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1374-route-map-a11y-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-channels-list-render-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-channels-selection-flow-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-channels-add-modal-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-channels-share-color-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-channels-ws-batch-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-channels-ws-race-1498-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1487-byop-modal-layout-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1630-reach-mobile-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-node-reach-coverage-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node test-issue-1640-compare-discovery-e2e.js 2>&1 | tee -a e2e-output.txt
-          CHROMIUM_REQUIRE=1 node test-neighbor-map-btn-clip-e2e.js 2>&1 | tee -a e2e-output.txt
+            node tests/e2e/test-a11y-axe-1668.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-filter-ux-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-channel-issue-1087-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-channel-issue-1111-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-map-modal-fluid-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-map-nodes-pagination-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-observer-iata-1188-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1639-observers-sort-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1758-ng-filter-rerenders-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-nav-fluid-1055-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-nav-priority-1102-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-nav-priority-1311-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-nav-priority-1391-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1413-nav-overlap-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1400-nav-vertical-clip.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-nav-more-floor-1139-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-bottom-nav-1061-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-gestures-1062-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-gestures-1185-scroll-discriminator-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-gesture-hints-1065-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-touch-gestures-coverage-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-channel-fluid-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-table-fluid-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-charts-fluid-1058-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-slideover-1056-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1692-packets-init-parallel-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-slideover-1168-munger-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-logo-pulse-1173-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1122-packets-filter-ux-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1128-packets-layout-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1128-multi-viewport-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1136-live-region-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-live-multibyte-only-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1150-404-state-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1146-path-link-contrast-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 node tests/e2e/test-issue-1705-subpath-contrast-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1147-section-order-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1151-orphan-separators-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1486-collapse-reopens-detail-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-logo-rebrand-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-logo-theme-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-logo-default-sage-teal-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1109-hamburger-dropdown-visible-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-live-layout-1178-1179-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1205-live-controls-anchor-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-live-mql-leak-1180-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1204-live-panel-structure-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1234-live-chrome-pass2-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1206-vcr-overlap-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1244-live-vcr-row-hints-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1510-live-nav-pin-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-live-fullscreen-1572-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1599-replay-freeze-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1648-m1-icons-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1648-m2-icons-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1648-m3-icons-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1648-m4-icons-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1657-analytics-channels-group-sprites-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1224-channels-mobile-ux-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1367-channels-chat-app-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1236-map-mobile-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1329-map-controls-accordion-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1273-qr-overlay-height-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1281-location-row-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1279-legend-p2-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1799-label-vocab-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-home-coverage-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-path-inspector-coverage-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1206-resize-observer-leak-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-nav-drawer-1064-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-audio-live-1297-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-audio-lab-1297-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-channel-decrypt-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-channel-qr-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-channel-color-picker-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-customize-theme-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-customize-branding-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-customize-display-e2e.js 2>&1 | tee -a e2e-output.txt
+          BASE_URL=http://localhost:13581 node tests/e2e/test-customize-export-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-drag-manager-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1567-corner-clears-drag-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1306-collisions-terminology-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1374-route-map-a11y-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-channels-list-render-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-channels-selection-flow-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-channels-add-modal-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-channels-share-color-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-channels-ws-batch-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-channels-ws-race-1498-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1487-byop-modal-layout-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1630-reach-mobile-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-node-reach-coverage-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 BASE_URL=http://localhost:13581 node tests/e2e/test-issue-1640-compare-discovery-e2e.js 2>&1 | tee -a e2e-output.txt
+          CHROMIUM_REQUIRE=1 node tests/e2e/test-neighbor-map-btn-clip-e2e.js 2>&1 | tee -a e2e-output.txt
 
       # #1616: slide-over focus-restore flake-gate. Runs the slide-over
       # E2E 20 consecutive times against the SAME backend instance so
@@ -594,7 +594,7 @@ jobs:
           set -e
           for i in $(seq 1 3); do
             echo "--- slide-over E2E run $i/20 ---"
-            BASE_URL=http://localhost:13581 node test-slideover-1056-e2e.js 2>&1 | tee -a slideover-repeat-output.txt
+            BASE_URL=http://localhost:13581 node tests/e2e/test-slideover-1056-e2e.js 2>&1 | tee -a slideover-repeat-output.txt
           done
           echo "3 passed"
 
diff --git a/.squad/agents/bishop/charter.md b/.squad/agents/bishop/charter.md
index 09b0a5d8..5ce7d6fe 100644
--- a/.squad/agents/bishop/charter.md
+++ b/.squad/agents/bishop/charter.md
@@ -10,16 +10,15 @@ Unit tests, Playwright E2E, coverage gates, and quality assurance for CoreScope.
 
 ## Responsibilities
 
-- Unit tests: test-packet-filter.js, test-aging.js, test-decoder.js, test-decoder-spec.js, test-server-helpers.js, test-server-routes.js, test-packet-store.js, test-db.js, test-frontend-helpers.js, test-regional-filter.js, test-regional-integration.js, test-live-dedup.js
-- Playwright E2E: test-e2e-playwright.js (8 browser tests, default localhost:3000)
-- E2E tools: tools/e2e-test.js, tools/frontend-test.js
+- Unit tests: `tests/unit/`, all listed in `test-all.sh` (e.g. test-packet-filter.js, test-aging.js, test-frontend-helpers.js); Go tests under `cmd/`
+- Playwright E2E: `tests/e2e/`, classified in `scripts/non-unit-tests.json` (e.g. test-e2e-playwright.js, default localhost:3000)
 - Coverage: Backend 85%+ (c8), Frontend 42%+ (Istanbul + nyc). Both only go up.
 - Review authority: May approve or reject work from Hicks and Newt based on test results
 
 ## Boundaries
 
 - Test the REAL code — import actual modules, don't copy-paste functions into test files
-- Use vm.createContext for frontend helpers (see test-frontend-helpers.js pattern)
+- Use vm.createContext for frontend helpers (see tests/unit/test-frontend-helpers.js pattern)
 - Playwright tests default to localhost:3000 — NEVER run against prod
 - Every bug fix gets a regression test
 - Every new feature must add tests — test count only goes up
@@ -37,10 +36,9 @@ Unit tests, Playwright E2E, coverage gates, and quality assurance for CoreScope.
 npm test                    # all backend tests + coverage summary
 npm run test:unit           # fast: unit tests only
 npm run test:coverage       # all tests + HTML coverage report
-node test-packet-filter.js  # filter engine
-node test-decoder.js        # packet decoder
-node test-server-routes.js  # API routes via supertest
-node test-e2e-playwright.js # 8 Playwright browser tests
+sh test-all.sh                          # every suite in tests/unit
+node tests/unit/test-packet-filter.js   # filter engine
+node tests/e2e/test-e2e-playwright.js   # Playwright browser tests
 ```
 
 ## Model
diff --git a/.squad/agents/newt/charter.md b/.squad/agents/newt/charter.md
index 223f424b..fc87a6f5 100644
--- a/.squad/agents/newt/charter.md
+++ b/.squad/agents/newt/charter.md
@@ -24,7 +24,7 @@ Vanilla JS UI, Leaflet maps, live visualization, theming, and all public/ module
 - Use shared helpers from roles.js (ROLE_COLORS, TYPE_COLORS, getNodeStatus, getHealthThresholds)
 - Prefer `n.last_heard || n.last_seen` for display and status
 - No per-packet API calls from frontend — fetch bulk, filter client-side
-- Run `node test-packet-filter.js` and `node test-frontend-helpers.js` after filter/helper changes
+- Run `node tests/unit/test-packet-filter.js` and `node tests/unit/test-frontend-helpers.js` after filter/helper changes
 - Always bump cache busters in the SAME commit as code changes
 
 ## Key Files
diff --git a/AGENTS.md b/AGENTS.md
index fb25c6d5..badc8208 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -90,7 +90,7 @@ Every change must consider performance impact BEFORE implementation. This codeba
 No proof = no merge.
 
 ### 1. No commit without tests
-Every change that touches logic MUST have tests. For Go backend: `cd cmd/server && go test ./...` and `cd cmd/ingestor && go test ./...`, or `make test` for all 14 modules. For frontend: `node test-packet-filter.js && node test-aging.js && node test-frontend-helpers.js`. If you add new logic, add tests. No exceptions.
+Every change that touches logic MUST have tests. For Go backend: `cd cmd/server && go test ./...` and `cd cmd/ingestor && go test ./...`, or `make test` for all 14 modules. For frontend: `node tests/unit/test-packet-filter.js && node tests/unit/test-aging.js && node tests/unit/test-frontend-helpers.js`. If you add new logic, add tests. No exceptions.
 
 The SQLite driver (`github.com/mattn/go-sqlite3`) is cgo. **`CGO_ENABLED=0` still *builds*** — that is the trap. It links a stub, and the binary dies on the first query with `go-sqlite3 requires cgo to work. This is a stub`, so a green build proves nothing. A plain `GOOS=linux go build` likewise cannot cross-compile it. Use `make build` / `make crossbuild` — the latter needs [`zig`](https://ziglang.org/download/) as the cross C compiler and produces static musl binaries. Never re-add `CGO_ENABLED=0`.
 
@@ -202,7 +202,7 @@ All colors MUST use CSS variables. Never hardcode `#hex` values outside of `:roo
 ### Packet Filter (packet-filter.js)
 Standalone module. No dependencies on app globals (copies what it needs). Testable in Node.js:
 ```bash
-node test-packet-filter.js
+node tests/unit/test-packet-filter.js
 ```
 Uses firmware-standard type names (GRP_TXT, TXT_MSG, REQ) with aliases for convenience.
 
@@ -219,21 +219,13 @@ npm run test:full-coverage  # backend + instrumented frontend coverage via Playw
 ### Test Files
 ```bash
 # Backend (deterministic, run before every push)
-node test-packet-filter.js        # filter engine
-node test-aging.js                # node aging system
-node test-regional-filter.js      # regional observer filtering
-node test-decoder.js              # packet decoder
-node test-decoder-spec.js         # spec-driven + golden fixture tests
-node test-server-helpers.js       # extracted server functions
-node test-server-routes.js        # API route tests via supertest
-node test-packet-store.js         # in-memory packet store
-node test-db.js                   # SQLite operations
-node test-frontend-helpers.js     # frontend logic (via vm.createContext)
-node tools/e2e-test.js            # E2E: temp server + synthetic packets
-node tools/frontend-test.js       # frontend smoke: HTML, JS refs, API shapes
+sh test-all.sh                               # every suite in tests/unit
+node tests/unit/test-packet-filter.js        # filter engine
+node tests/unit/test-aging.js                # node aging system
+node tests/unit/test-frontend-helpers.js     # frontend logic (via vm.createContext)
 
 # Frontend E2E (requires running server or Playwright)
-node test-e2e-playwright.js       # 8 Playwright browser tests (default: localhost:3000)
+node tests/e2e/test-e2e-playwright.js       # Playwright browser tests (default: localhost:3000)
 ```
 
 ### Rules
@@ -248,14 +240,14 @@ node test-e2e-playwright.js       # 8 Playwright browser tests (default: localho
 2. Write unit tests for the logic
 3. Write/update Playwright tests if it's a UI change
 4. Run `npm test` — all tests must pass
-5. Run `node test-e2e-playwright.js` against a local server — E2E must pass
+5. Run `node tests/e2e/test-e2e-playwright.js` against a local server — E2E must pass
 6. THEN push to master
 
 ### Testing infrastructure
 - **Backend coverage**: c8 tracks server-side code in-process
 - **Frontend coverage**: Istanbul instruments `public/*.js` → Playwright exercises them → `window.__coverage__` extracted → nyc reports. Instrumented files are generated fresh each CI run, never checked in.
 - **CI pipeline**: backend tests + coverage → instrument frontend → start local server → Playwright E2E + coverage collection → badges update → deploy (only if all pass)
-- **Playwright tests default to localhost:3000** — NEVER run against prod. CI sets `BASE_URL=http://localhost:13581`. Running locally: start your server, then `node test-e2e-playwright.js`
+- **Playwright tests default to localhost:3000** — NEVER run against prod. CI sets `BASE_URL=http://localhost:13581`. Running locally: start your server, then `node tests/e2e/test-e2e-playwright.js`
 - **ARM machines**: Basic Playwright tests work with system chromium (`CHROMIUM_PATH=/usr/bin/chromium-browser`). Heavy coverage collection scripts may crash — use CI for those.
 
 Tests that need live mesh data can use `https://analyzer.00id.net` — all API endpoints are public, no auth required.
@@ -290,7 +282,7 @@ If the same logic exists in two places, it MUST be extracted into a shared funct
 ### Testability
 - **Write functions that are easy to test.** Pure functions (input → output, no side effects) are ideal. If a function reads from the DOM, the DB, and localStorage, it's untestable without mocking everything.
 - **Dependency injection enables testing.** Pass the node list, the map reference, the API function as parameters. Tests can substitute fakes.
-- **Test the real code, not copies.** Don't paste a function into a test file and test the copy. Import/require the actual module. If the module isn't importable (IIFE, browser-only), refactor it so it is — or use `vm.createContext` like `test-frontend-helpers.js` does.
+- **Test the real code, not copies.** Don't paste a function into a test file and test the copy. Import/require the actual module. If the module isn't importable (IIFE, browser-only), refactor it so it is — or use `vm.createContext` like `tests/unit/test-frontend-helpers.js` does.
 - **Every bug fix gets a regression test.** If it broke once, it'll break again. The test proves it stays fixed.
 
 ### Type Safety (without TypeScript)
@@ -372,7 +364,7 @@ One logical change per commit. Each commit is deployable. Each commit has its te
 | Subagent timed out mid-work | 4 | Give clear scope, don't try to run slow pipelines locally |
 
 ## File Naming
-- Tests: `test-{feature}.js` in repo root
+- Tests: `test-{feature}.js` in `tests/unit/` (standalone, listed in `test-all.sh`) or `tests/e2e/` (browser, listed in `scripts/non-unit-tests.json`) — never in repo root
 - No build step, no transpilation — write ES2020 for server, ES5/6 for frontend (broad browser support)
 
 ### Deep Linking
diff --git a/README.md b/README.md
index b06d54a4..7345d3d0 100644
--- a/README.md
+++ b/README.md
@@ -228,7 +228,8 @@ corescope/
 │   └── entrypoint-go.sh     # Container entrypoint
 ├── Dockerfile               # Multi-stage Go build + Alpine runtime
 ├── config.example.json      # Example configuration
-├── test-*.js                # Node.js test suite (frontend + legacy)
+├── tests/                   # Node.js test suite: unit/ (test-all.sh) and e2e/ (Playwright)
+├── test-all.sh              # Runs every suite in tests/unit
 └── tools/                   # Generators, E2E tests, utilities
 ```
 
@@ -266,7 +267,7 @@ make test
 npm test
 
 # Playwright E2E (requires running server on localhost:3000)
-node test-e2e-playwright.js
+node tests/e2e/test-e2e-playwright.js
 ```
 
 ### Generate Test Data
diff --git a/docs/agents/skills/fix-issue.md b/docs/agents/skills/fix-issue.md
index dc2397a2..6fe5109b 100644
--- a/docs/agents/skills/fix-issue.md
+++ b/docs/agents/skills/fix-issue.md
@@ -55,7 +55,7 @@ If the fix touches ANY frontend file (`public/*.js`, `public/*.css`, or HTML) AN
 as a user-visible UX behavior (click/hover/navigation/rendering), the PR MUST include a
 browser-level assertion that would have caught the original bug — NOT only unit tests.
 
-- Look for an existing E2E harness first (e.g. `test-e2e-playwright.js`, `e2e/`, `tests/e2e/`,
+- Look for an existing E2E harness first (e.g. `tests/e2e/test-e2e-playwright.js`, `e2e/`, `tests/e2e/`,
   `playwright.config.*`, or whatever the repo uses). Add the assertion there.
 - If no E2E harness exists, ADD a small one rather than skip. A 30-line Playwright fixture
   hitting a public staging URL is acceptable.
diff --git a/docs/frontend-testing.md b/docs/frontend-testing.md
index ec2803bf..a13eaa3c 100644
--- a/docs/frontend-testing.md
+++ b/docs/frontend-testing.md
@@ -13,13 +13,17 @@ Windows, use Git Bash and ensure `python3` resolves to Python 3 rather than a
 Microsoft Store alias; set `PYTHONUTF8=1` for the gate's Unicode output.
 No server or browser is started by this runner.
 
-When adding a root `test-*.js` file:
+Tests live in `tests/unit/` (standalone Node, run by `test-all.sh`) and
+`tests/e2e/` (needs a browser, a server or extra tooling). They run from the
+repo root, and refer to it as `REPO_ROOT`. When adding a `test-*.js` file:
 
-1. Add its `node test-name.js` command to `test-all.sh` if it runs standalone.
-2. Otherwise add it to `scripts/non-unit-tests.json`, with a prerequisite or
+1. If it runs standalone, put it in `tests/unit/` and add its
+   `node tests/unit/test-name.js` command to `test-all.sh`.
+2. Otherwise put it in `tests/e2e/` and add it to `scripts/non-unit-tests.json`, with a prerequisite or
    reason explaining why it belongs outside the unit runner. Browser suites
    still need explicit selection in the E2E workflow to become CI gates.
-3. Run `node test-test-inventory.js`. The guard rejects unclassified files,
+3. Run `node tests/unit/test-test-inventory.js`. The guard rejects `test-*.js`
+   files in the repo root, unclassified files,
    duplicate assignments, removed files left in a list, undocumented groups,
    and local/CI entry points that bypass the unit runner.
 
diff --git a/scripts/non-unit-tests.json b/scripts/non-unit-tests.json
index 85770ed6..3d7c59fc 100644
--- a/scripts/non-unit-tests.json
+++ b/scripts/non-unit-tests.json
@@ -2,129 +2,129 @@
   "browser": {
     "reason": "Requires Playwright and Chromium; most suites also require a running local fixture server via BASE_URL. Existing E2E workflow steps retain their separate setup and selection. Never point these tests at production.",
     "files": [
-      "test-1110-live-filter.js",
-      "test-a11y-axe-1668.js",
-      "test-analytics-fluid-charts.js",
-      "test-audio-lab-1297-e2e.js",
-      "test-audio-live-1297-e2e.js",
-      "test-bottom-nav-1061-e2e.js",
-      "test-channel-color-picker-e2e.js",
-      "test-channel-decrypt-e2e.js",
-      "test-channel-fluid-e2e.js",
-      "test-channel-issue-1087-e2e.js",
-      "test-channel-issue-1111-e2e.js",
-      "test-channel-modal-e2e.js",
-      "test-channel-qr-e2e.js",
-      "test-channels-add-modal-e2e.js",
-      "test-channels-list-render-e2e.js",
-      "test-channels-selection-flow-e2e.js",
-      "test-channels-share-color-e2e.js",
-      "test-channels-ws-batch-e2e.js",
-      "test-channels-ws-race-1498-e2e.js",
-      "test-charts-fluid-1058-e2e.js",
-      "test-customize-branding-e2e.js",
-      "test-customize-display-e2e.js",
-      "test-customize-export-e2e.js",
-      "test-customize-theme-e2e.js",
-      "test-drag-manager-e2e.js",
-      "test-e2e-1267-mobile-vcr.js",
-      "test-e2e-playwright.js",
-      "test-filter-ux-e2e.js",
-      "test-gesture-hints-1065-e2e.js",
-      "test-gestures-1062-e2e.js",
-      "test-gestures-1185-scroll-discriminator-e2e.js",
-      "test-home-coverage-e2e.js",
-      "test-issue-1109-hamburger-dropdown-visible-e2e.js",
-      "test-issue-1122-packets-filter-ux-e2e.js",
-      "test-issue-1128-multi-viewport-e2e.js",
-      "test-issue-1128-packets-layout-e2e.js",
-      "test-issue-1136-live-region-e2e.js",
-      "test-issue-1146-path-link-contrast-e2e.js",
-      "test-issue-1147-section-order-e2e.js",
-      "test-issue-1150-404-state-e2e.js",
-      "test-issue-1151-orphan-separators-e2e.js",
-      "test-issue-1204-live-panel-structure-e2e.js",
-      "test-issue-1205-live-controls-anchor-e2e.js",
-      "test-issue-1206-resize-observer-leak-e2e.js",
-      "test-issue-1206-vcr-overlap-e2e.js",
-      "test-issue-1224-channels-mobile-ux-e2e.js",
-      "test-issue-1234-live-chrome-pass2-e2e.js",
-      "test-issue-1236-map-mobile-e2e.js",
-      "test-issue-1244-live-vcr-row-hints-e2e.js",
-      "test-issue-1273-qr-overlay-height-e2e.js",
-      "test-issue-1274-legend-coverage-e2e.js",
-      "test-issue-1279-legend-p2-e2e.js",
-      "test-issue-1281-location-row-e2e.js",
-      "test-issue-1306-collisions-terminology-e2e.js",
-      "test-issue-1329-map-controls-accordion-e2e.js",
-      "test-issue-1367-channels-chat-app-e2e.js",
-      "test-issue-1374-route-map-a11y-e2e.js",
-      "test-issue-1400-nav-vertical-clip.js",
-      "test-issue-1413-nav-overlap-e2e.js",
-      "test-issue-1486-collapse-reopens-detail-e2e.js",
-      "test-issue-1487-byop-modal-layout-e2e.js",
-      "test-issue-1510-live-nav-pin-e2e.js",
-      "test-issue-1567-corner-clears-drag-e2e.js",
-      "test-issue-1599-replay-freeze-e2e.js",
-      "test-issue-1630-reach-mobile-e2e.js",
-      "test-issue-1639-observers-sort-e2e.js",
-      "test-issue-1640-compare-discovery-e2e.js",
-      "test-issue-1648-m1-icons-e2e.js",
-      "test-issue-1648-m2-icons-e2e.js",
-      "test-issue-1648-m3-icons-e2e.js",
-      "test-issue-1648-m4-icons-e2e.js",
-      "test-issue-1648-m5-icons-e2e.js",
-      "test-issue-1657-analytics-channels-group-sprites-e2e.js",
-      "test-issue-1692-packets-init-parallel-e2e.js",
-      "test-issue-1705-subpath-contrast-e2e.js",
-      "test-issue-1758-ng-filter-rerenders-e2e.js",
-      "test-issue-1799-label-vocab-e2e.js",
-      "test-live-dedup.js",
-      "test-live-fullscreen-1572-e2e.js",
-      "test-live-layout-1178-1179-e2e.js",
-      "test-live-mql-leak-1180-e2e.js",
-      "test-live-multibyte-only-e2e.js",
-      "test-logo-default-sage-teal-e2e.js",
-      "test-logo-pulse-1173-e2e.js",
-      "test-logo-rebrand-e2e.js",
-      "test-logo-theme-e2e.js",
-      "test-map-modal-fluid-e2e.js",
-      "test-map-nodes-pagination-e2e.js",
-      "test-nav-drawer-1064-e2e.js",
-      "test-nav-fluid-1055-e2e.js",
-      "test-nav-more-floor-1139-e2e.js",
-      "test-nav-priority-1102-e2e.js",
-      "test-nav-priority-1311-e2e.js",
-      "test-nav-priority-1391-e2e.js",
-      "test-neighbor-map-btn-clip-e2e.js",
-      "test-node-reach-coverage-e2e.js",
-      "test-node-reach-e2e.js",
-      "test-nodes-export-e2e.js",
-      "test-observer-iata-1188-e2e.js",
-      "test-packets-scope-column.js",
-      "test-path-inspector-coverage-e2e.js",
-      "test-rx-coverage-mobile-nav-e2e.js",
-      "test-show-neighbors.js",
-      "test-slideover-1056-e2e.js",
-      "test-slideover-1168-munger-e2e.js",
-      "test-table-fluid-e2e.js",
-      "test-touch-gestures-coverage-e2e.js",
-      "test-touch-targets.js"
+      "tests/e2e/test-1110-live-filter.js",
+      "tests/e2e/test-a11y-axe-1668.js",
+      "tests/e2e/test-analytics-fluid-charts.js",
+      "tests/e2e/test-audio-lab-1297-e2e.js",
+      "tests/e2e/test-audio-live-1297-e2e.js",
+      "tests/e2e/test-bottom-nav-1061-e2e.js",
+      "tests/e2e/test-channel-color-picker-e2e.js",
+      "tests/e2e/test-channel-decrypt-e2e.js",
+      "tests/e2e/test-channel-fluid-e2e.js",
+      "tests/e2e/test-channel-issue-1087-e2e.js",
+      "tests/e2e/test-channel-issue-1111-e2e.js",
+      "tests/e2e/test-channel-modal-e2e.js",
+      "tests/e2e/test-channel-qr-e2e.js",
+      "tests/e2e/test-channels-add-modal-e2e.js",
+      "tests/e2e/test-channels-list-render-e2e.js",
+      "tests/e2e/test-channels-selection-flow-e2e.js",
+      "tests/e2e/test-channels-share-color-e2e.js",
+      "tests/e2e/test-channels-ws-batch-e2e.js",
+      "tests/e2e/test-channels-ws-race-1498-e2e.js",
+      "tests/e2e/test-charts-fluid-1058-e2e.js",
+      "tests/e2e/test-customize-branding-e2e.js",
+      "tests/e2e/test-customize-display-e2e.js",
+      "tests/e2e/test-customize-export-e2e.js",
+      "tests/e2e/test-customize-theme-e2e.js",
+      "tests/e2e/test-drag-manager-e2e.js",
+      "tests/e2e/test-e2e-1267-mobile-vcr.js",
+      "tests/e2e/test-e2e-playwright.js",
+      "tests/e2e/test-filter-ux-e2e.js",
+      "tests/e2e/test-gesture-hints-1065-e2e.js",
+      "tests/e2e/test-gestures-1062-e2e.js",
+      "tests/e2e/test-gestures-1185-scroll-discriminator-e2e.js",
+      "tests/e2e/test-home-coverage-e2e.js",
+      "tests/e2e/test-issue-1109-hamburger-dropdown-visible-e2e.js",
+      "tests/e2e/test-issue-1122-packets-filter-ux-e2e.js",
+      "tests/e2e/test-issue-1128-multi-viewport-e2e.js",
+      "tests/e2e/test-issue-1128-packets-layout-e2e.js",
+      "tests/e2e/test-issue-1136-live-region-e2e.js",
+      "tests/e2e/test-issue-1146-path-link-contrast-e2e.js",
+      "tests/e2e/test-issue-1147-section-order-e2e.js",
+      "tests/e2e/test-issue-1150-404-state-e2e.js",
+      "tests/e2e/test-issue-1151-orphan-separators-e2e.js",
+      "tests/e2e/test-issue-1204-live-panel-structure-e2e.js",
+      "tests/e2e/test-issue-1205-live-controls-anchor-e2e.js",
+      "tests/e2e/test-issue-1206-resize-observer-leak-e2e.js",
+      "tests/e2e/test-issue-1206-vcr-overlap-e2e.js",
+      "tests/e2e/test-issue-1224-channels-mobile-ux-e2e.js",
+      "tests/e2e/test-issue-1234-live-chrome-pass2-e2e.js",
+      "tests/e2e/test-issue-1236-map-mobile-e2e.js",
+      "tests/e2e/test-issue-1244-live-vcr-row-hints-e2e.js",
+      "tests/e2e/test-issue-1273-qr-overlay-height-e2e.js",
+      "tests/e2e/test-issue-1274-legend-coverage-e2e.js",
+      "tests/e2e/test-issue-1279-legend-p2-e2e.js",
+      "tests/e2e/test-issue-1281-location-row-e2e.js",
+      "tests/e2e/test-issue-1306-collisions-terminology-e2e.js",
+      "tests/e2e/test-issue-1329-map-controls-accordion-e2e.js",
+      "tests/e2e/test-issue-1367-channels-chat-app-e2e.js",
+      "tests/e2e/test-issue-1374-route-map-a11y-e2e.js",
+      "tests/e2e/test-issue-1400-nav-vertical-clip.js",
+      "tests/e2e/test-issue-1413-nav-overlap-e2e.js",
+      "tests/e2e/test-issue-1486-collapse-reopens-detail-e2e.js",
+      "tests/e2e/test-issue-1487-byop-modal-layout-e2e.js",
+      "tests/e2e/test-issue-1510-live-nav-pin-e2e.js",
+      "tests/e2e/test-issue-1567-corner-clears-drag-e2e.js",
+      "tests/e2e/test-issue-1599-replay-freeze-e2e.js",
+      "tests/e2e/test-issue-1630-reach-mobile-e2e.js",
+      "tests/e2e/test-issue-1639-observers-sort-e2e.js",
+      "tests/e2e/test-issue-1640-compare-discovery-e2e.js",
+      "tests/e2e/test-issue-1648-m1-icons-e2e.js",
+      "tests/e2e/test-issue-1648-m2-icons-e2e.js",
+      "tests/e2e/test-issue-1648-m3-icons-e2e.js",
+      "tests/e2e/test-issue-1648-m4-icons-e2e.js",
+      "tests/e2e/test-issue-1648-m5-icons-e2e.js",
+      "tests/e2e/test-issue-1657-analytics-channels-group-sprites-e2e.js",
+      "tests/e2e/test-issue-1692-packets-init-parallel-e2e.js",
+      "tests/e2e/test-issue-1705-subpath-contrast-e2e.js",
+      "tests/e2e/test-issue-1758-ng-filter-rerenders-e2e.js",
+      "tests/e2e/test-issue-1799-label-vocab-e2e.js",
+      "tests/e2e/test-live-dedup.js",
+      "tests/e2e/test-live-fullscreen-1572-e2e.js",
+      "tests/e2e/test-live-layout-1178-1179-e2e.js",
+      "tests/e2e/test-live-mql-leak-1180-e2e.js",
+      "tests/e2e/test-live-multibyte-only-e2e.js",
+      "tests/e2e/test-logo-default-sage-teal-e2e.js",
+      "tests/e2e/test-logo-pulse-1173-e2e.js",
+      "tests/e2e/test-logo-rebrand-e2e.js",
+      "tests/e2e/test-logo-theme-e2e.js",
+      "tests/e2e/test-map-modal-fluid-e2e.js",
+      "tests/e2e/test-map-nodes-pagination-e2e.js",
+      "tests/e2e/test-nav-drawer-1064-e2e.js",
+      "tests/e2e/test-nav-fluid-1055-e2e.js",
+      "tests/e2e/test-nav-more-floor-1139-e2e.js",
+      "tests/e2e/test-nav-priority-1102-e2e.js",
+      "tests/e2e/test-nav-priority-1311-e2e.js",
+      "tests/e2e/test-nav-priority-1391-e2e.js",
+      "tests/e2e/test-neighbor-map-btn-clip-e2e.js",
+      "tests/e2e/test-node-reach-coverage-e2e.js",
+      "tests/e2e/test-node-reach-e2e.js",
+      "tests/e2e/test-nodes-export-e2e.js",
+      "tests/e2e/test-observer-iata-1188-e2e.js",
+      "tests/e2e/test-packets-scope-column.js",
+      "tests/e2e/test-path-inspector-coverage-e2e.js",
+      "tests/e2e/test-rx-coverage-mobile-nav-e2e.js",
+      "tests/e2e/test-show-neighbors.js",
+      "tests/e2e/test-slideover-1056-e2e.js",
+      "tests/e2e/test-slideover-1168-munger-e2e.js",
+      "tests/e2e/test-table-fluid-e2e.js",
+      "tests/e2e/test-touch-gestures-coverage-e2e.js",
+      "tests/e2e/test-touch-targets.js"
     ]
   },
   "playwrightRunner": {
     "reason": "Requires the @playwright/test runner (not plain node), its configuration, Chromium, and a local server. @playwright/test is not currently declared in package.json; these suites are inventoried but not part of the standalone unit gate.",
     "files": [
-      "test-issue-1522-trace-url-sync-e2e.js",
-      "test-marker-outline-weight.js",
-      "test-path-inspector-e2e.js",
-      "test-pr-1490-live-map-gpu-animations-e2e.js"
+      "tests/e2e/test-issue-1522-trace-url-sync-e2e.js",
+      "tests/e2e/test-marker-outline-weight.js",
+      "tests/e2e/test-path-inspector-e2e.js",
+      "tests/e2e/test-pr-1490-live-map-gpu-animations-e2e.js"
     ]
   },
   "domIntegration": {
     "reason": "Requires jsdom, which is not currently declared in package.json. This DOM integration suite is inventoried separately; no new dependency is installed by the unit gate.",
     "files": [
-      "test-table-sort.js"
+      "tests/e2e/test-table-sort.js"
     ]
   }
 }
diff --git a/test-all.sh b/test-all.sh
index 58c8b4f6..3d6d5245 100755
--- a/test-all.sh
+++ b/test-all.sh
@@ -1,185 +1,186 @@
 #!/bin/sh
 # Authoritative standalone frontend test list for local runs and CI.
-# Every root test is listed here or classified in scripts/non-unit-tests.json.
+# Every suite in tests/unit is listed here; every suite in tests/e2e is classified
+# in scripts/non-unit-tests.json.
 set -e
 cd "$(dirname "$0")"
 
-node test-test-inventory.js
-node test-1108-region-hide-nodes.js
-node test-1659-analytics-warmup.js
-node test-a11y-1705-subpath-hop-prefix-e2e.js
-node test-a11y-1715-dark-role-swatches.js
-node test-a11y-1716-rf-range-btn-active.js
-node test-a11y-1719-contrast-root-causes-e2e.js
-node test-a11y-axe-1668-selftest.js
-node test-a11y-axe-routes-coverage.js
-node test-aging.js
-node test-analytics-channels-integration.js
-node test-anl1-tooltip-render.js
-node test-area-filter.js
-node test-channel-color-picker.js
-node test-channel-colors.js
-node test-channel-decrypt-ecb.js
-node test-channel-decrypt-insecure-context.js
-node test-channel-decrypt-m345.js
-node test-channel-fluid-layout.js
-node test-channel-issue-1087.js
-node test-channel-issue-1101.js
-node test-channel-live-decrypt-userprefix.js
-node test-channel-live-decrypt.js
-node test-channel-modal-ux.js
-node test-channel-psk-ux.js
-node test-channel-qr-wiring.js
-node test-channel-qr.js
-node test-channel-sidebar-layout.js
-node test-channel-ux-followup.js
-node test-channel-ux-round2.js
-node test-channels-merge-1498-unit.js
-node test-clear-filters.js
-node test-color-picker-ux.js
-node test-compare-flood-filter.js
-node test-compare-overlap.js
-node test-confidence-indicator.js
-node test-coverage-gate.js
-node test-customizer-v2.js
-node test-drag-manager.js
-node test-embed-mode-1369.js
-node test-fetch-all-nodes-pagination.js
-node test-fluid-scaffolding.js
-node test-frontend-helpers.js
-node test-geofilter-draft.js
-node test-hash-color.js
-node test-hop-resolver-affinity.js
-node test-issue-1065-gesture-hints-gates.js
-node test-issue-1107-live-layout.js
-node test-issue-1136-observer-iata-map.js
-node test-issue-1166-first-seen-column.js
-node test-issue-1189-composed-cell.js
-node test-issue-1189-live-iata-badge.js
-node test-issue-1279-p2-code-filter.js
-node test-issue-1293-marker-shapes.js
-node test-issue-1356-map-a11y.js
-node test-issue-1360-pill-letter-count.js
-node test-issue-1361-cb-presets.js
-node test-issue-1364-pill-no-clamp.js
-node test-issue-1375-scope-stats-fetch.js
-node test-issue-1380-cb-reset-button.js
-node test-issue-1380-cb-sim-overlay.js
-node test-issue-1407-cb-preset-propagation.js
-node test-issue-1409-no-encrypted-flood.js
-node test-issue-1412-customizer-no-override.js
-node test-issue-1415-packets-layout.js
-node test-issue-1418-cb-preset-ramp.js
-node test-issue-1418-deeplink-hops-channels.js
-node test-issue-1418-edge-weights.js
-node test-issue-1418-polish-review.js
-node test-issue-1418-raw-hex-extraction.js
-node test-issue-1418-spider-fan.js
-node test-issue-1420-tile-providers.js
-node test-issue-1438-customizer-mcrole.js
-node test-issue-1438-marker-css-vars.js
-node test-issue-1446-cb-preset-cascade.js
-node test-issue-1450-logo-aspect.js
-node test-issue-1454-channels-toggle.js
-node test-issue-1456-score-labels.js
-node test-issue-1461-mobile-page-actions.js
-node test-issue-1470-card-bg-contrast.js
-node test-issue-1470-node-tile-helper.js
-node test-issue-1473-prefix-generator.js
-node test-issue-1473-reserved-prefixes.js
-node test-issue-1485-live-anim-z.js
-node test-issue-1488-marker-stroke-vars.js
-node test-issue-1496-reset-all-complete.js
-node test-issue-1509-detect-preset.js
-node test-issue-1509-nav-active-bg.js
-node test-issue-1518-home-url.js
-node test-issue-1532-live-fullscreen.js
-node test-issue-1562-observers-summary.js
-node test-issue-1563-aggregate-and-inflight.js
-node test-issue-1574-live-map-max-nodes.js
-node test-issue-1606-pagination.js
-node test-issue-1614-tile-url-function.js
-node test-issue-1619-feed-detail-card-draggable.js
-node test-issue-1633-hide-1byte-hops.js
-node test-issue-1644-redesign.js
-node test-issue-1646-compare-polish.js
-node test-issue-1648-followup-phosphor-leaks.js
-node test-issue-1648-m1-emoji-scan.js
-node test-issue-1648-m2-emoji-scan.js
-node test-issue-1648-m3-emoji-scan.js
-node test-issue-1648-m4-emoji-scan.js
-node test-issue-1648-m5-emoji-scan.js
-node test-issue-1648-m6-final-sweep.js
-node test-issue-1648-m6-lint-self.js
-node test-issue-1668-m2-contrast.js
-node test-issue-1668-m3-typography.js
-node test-issue-1668-m4-per-route.js
-node test-issue-1697-mqtt-mobile-e2e.js
-node test-issue-1699-retransmission-chart.js
-node test-issue-1705-subpath-contrast.js
-node test-issue-1753-copy-url-slash.js
-node test-issue-1770-mobile-row-clamp.js
-node test-issue-1789-observer-firmware-cols.js
-node test-issue-1825-observer-node-cross-links.js
-node test-issue-1833-legend-toggle-vcr-offset.js
-node test-issue-1836-crossnav-case-normalization.js
-node test-issue-1843-node-qr-quiet-zone.js
-node test-issue-1846-observers-width.js
-node test-issue-1849-trace-hashbytes.js
-node test-issue-1851-channel-message-scope.js
-node test-issue-1862-map-region-filter.js
-node test-issue-1868-control-decode.js
-node test-issue-1890-og-url.js
-node test-issue-1956-release-routing.js
-node test-issue-1979-scope-adverts-by-role.js
-node test-issue-2001-map-scope-state.js
-node test-issue-2012-clear-filters-selection.js
-node test-live-anims.js
-node test-live-dt-cap-1524.js
-node test-live-legend-helper.js
-node test-live-multibyte-filter.js
-node test-live-region-filter.js
-node test-live.js
-node test-map-clustering.js
-node test-mqtt-status-panel.js
-node test-my-repeaters-dashboard.js
-node test-naive-banner-tone.js
-node test-node-hop-analytics.js
-node test-node-reach-coverage-debounce.js
-node test-node-reach-coverage.js
-node test-nodes-export-wiring.js
-node test-nodes-export.js
-node test-observer-iata-1188.js
-node test-observer-menu-interactions.js
-node test-observer-naive-clock-1478.js
-node test-observer-search-filter.js
-node test-observers-headings.js
-node test-packet-filter-time.js
-node test-packet-filter-ux.js
-node test-packet-filter.js
-node test-packets-local-channels.js
-node test-packets.js
-node test-panel-corner.js
-node test-path-inspector.js
-node test-payload-labels-content.js
-node test-payload-labels-namespace.js
-node test-perf-anomaly.js
-node test-perf-disk-io-1120.js
-node test-perf-go-runtime.js
-node test-perf-render-1258.js
-node test-preflight-xss-gate.js
-node test-pull-to-reconnect-1091.js
-node test-pull-to-reconnect.js
-node test-repeater-metric-scatter.js
-node test-rx-coverage-config-race.js
-node test-rx-coverage-escape.js
-node test-scope-audit-styles-linked.js
-node test-slideover-1056-rowsel-strict.js
-node test-top-routes-overlay.js
-node test-traces.js
-node test-url-state.js
-node test-warmup-banner.js
-node test-ws-stale-watchdog-1074.js
-node test-xss-escape-sinks.js
+node tests/unit/test-test-inventory.js
+node tests/unit/test-1108-region-hide-nodes.js
+node tests/unit/test-1659-analytics-warmup.js
+node tests/unit/test-a11y-1705-subpath-hop-prefix-e2e.js
+node tests/unit/test-a11y-1715-dark-role-swatches.js
+node tests/unit/test-a11y-1716-rf-range-btn-active.js
+node tests/unit/test-a11y-1719-contrast-root-causes-e2e.js
+node tests/unit/test-a11y-axe-1668-selftest.js
+node tests/unit/test-a11y-axe-routes-coverage.js
+node tests/unit/test-aging.js
+node tests/unit/test-analytics-channels-integration.js
+node tests/unit/test-anl1-tooltip-render.js
+node tests/unit/test-area-filter.js
+node tests/unit/test-channel-color-picker.js
+node tests/unit/test-channel-colors.js
+node tests/unit/test-channel-decrypt-ecb.js
+node tests/unit/test-channel-decrypt-insecure-context.js
+node tests/unit/test-channel-decrypt-m345.js
+node tests/unit/test-channel-fluid-layout.js
+node tests/unit/test-channel-issue-1087.js
+node tests/unit/test-channel-issue-1101.js
+node tests/unit/test-channel-live-decrypt-userprefix.js
+node tests/unit/test-channel-live-decrypt.js
+node tests/unit/test-channel-modal-ux.js
+node tests/unit/test-channel-psk-ux.js
+node tests/unit/test-channel-qr-wiring.js
+node tests/unit/test-channel-qr.js
+node tests/unit/test-channel-sidebar-layout.js
+node tests/unit/test-channel-ux-followup.js
+node tests/unit/test-channel-ux-round2.js
+node tests/unit/test-channels-merge-1498-unit.js
+node tests/unit/test-clear-filters.js
+node tests/unit/test-color-picker-ux.js
+node tests/unit/test-compare-flood-filter.js
+node tests/unit/test-compare-overlap.js
+node tests/unit/test-confidence-indicator.js
+node tests/unit/test-coverage-gate.js
+node tests/unit/test-customizer-v2.js
+node tests/unit/test-drag-manager.js
+node tests/unit/test-embed-mode-1369.js
+node tests/unit/test-fetch-all-nodes-pagination.js
+node tests/unit/test-fluid-scaffolding.js
+node tests/unit/test-frontend-helpers.js
+node tests/unit/test-geofilter-draft.js
+node tests/unit/test-hash-color.js
+node tests/unit/test-hop-resolver-affinity.js
+node tests/unit/test-issue-1065-gesture-hints-gates.js
+node tests/unit/test-issue-1107-live-layout.js
+node tests/unit/test-issue-1136-observer-iata-map.js
+node tests/unit/test-issue-1166-first-seen-column.js
+node tests/unit/test-issue-1189-composed-cell.js
+node tests/unit/test-issue-1189-live-iata-badge.js
+node tests/unit/test-issue-1279-p2-code-filter.js
+node tests/unit/test-issue-1293-marker-shapes.js
+node tests/unit/test-issue-1356-map-a11y.js
+node tests/unit/test-issue-1360-pill-letter-count.js
+node tests/unit/test-issue-1361-cb-presets.js
+node tests/unit/test-issue-1364-pill-no-clamp.js
+node tests/unit/test-issue-1375-scope-stats-fetch.js
+node tests/unit/test-issue-1380-cb-reset-button.js
+node tests/unit/test-issue-1380-cb-sim-overlay.js
+node tests/unit/test-issue-1407-cb-preset-propagation.js
+node tests/unit/test-issue-1409-no-encrypted-flood.js
+node tests/unit/test-issue-1412-customizer-no-override.js
+node tests/unit/test-issue-1415-packets-layout.js
+node tests/unit/test-issue-1418-cb-preset-ramp.js
+node tests/unit/test-issue-1418-deeplink-hops-channels.js
+node tests/unit/test-issue-1418-edge-weights.js
+node tests/unit/test-issue-1418-polish-review.js
+node tests/unit/test-issue-1418-raw-hex-extraction.js
+node tests/unit/test-issue-1418-spider-fan.js
+node tests/unit/test-issue-1420-tile-providers.js
+node tests/unit/test-issue-1438-customizer-mcrole.js
+node tests/unit/test-issue-1438-marker-css-vars.js
+node tests/unit/test-issue-1446-cb-preset-cascade.js
+node tests/unit/test-issue-1450-logo-aspect.js
+node tests/unit/test-issue-1454-channels-toggle.js
+node tests/unit/test-issue-1456-score-labels.js
+node tests/unit/test-issue-1461-mobile-page-actions.js
+node tests/unit/test-issue-1470-card-bg-contrast.js
+node tests/unit/test-issue-1470-node-tile-helper.js
+node tests/unit/test-issue-1473-prefix-generator.js
+node tests/unit/test-issue-1473-reserved-prefixes.js
+node tests/unit/test-issue-1485-live-anim-z.js
+node tests/unit/test-issue-1488-marker-stroke-vars.js
+node tests/unit/test-issue-1496-reset-all-complete.js
+node tests/unit/test-issue-1509-detect-preset.js
+node tests/unit/test-issue-1509-nav-active-bg.js
+node tests/unit/test-issue-1518-home-url.js
+node tests/unit/test-issue-1532-live-fullscreen.js
+node tests/unit/test-issue-1562-observers-summary.js
+node tests/unit/test-issue-1563-aggregate-and-inflight.js
+node tests/unit/test-issue-1574-live-map-max-nodes.js
+node tests/unit/test-issue-1606-pagination.js
+node tests/unit/test-issue-1614-tile-url-function.js
+node tests/unit/test-issue-1619-feed-detail-card-draggable.js
+node tests/unit/test-issue-1633-hide-1byte-hops.js
+node tests/unit/test-issue-1644-redesign.js
+node tests/unit/test-issue-1646-compare-polish.js
+node tests/unit/test-issue-1648-followup-phosphor-leaks.js
+node tests/unit/test-issue-1648-m1-emoji-scan.js
+node tests/unit/test-issue-1648-m2-emoji-scan.js
+node tests/unit/test-issue-1648-m3-emoji-scan.js
+node tests/unit/test-issue-1648-m4-emoji-scan.js
+node tests/unit/test-issue-1648-m5-emoji-scan.js
+node tests/unit/test-issue-1648-m6-final-sweep.js
+node tests/unit/test-issue-1648-m6-lint-self.js
+node tests/unit/test-issue-1668-m2-contrast.js
+node tests/unit/test-issue-1668-m3-typography.js
+node tests/unit/test-issue-1668-m4-per-route.js
+node tests/unit/test-issue-1697-mqtt-mobile-e2e.js
+node tests/unit/test-issue-1699-retransmission-chart.js
+node tests/unit/test-issue-1705-subpath-contrast.js
+node tests/unit/test-issue-1753-copy-url-slash.js
+node tests/unit/test-issue-1770-mobile-row-clamp.js
+node tests/unit/test-issue-1789-observer-firmware-cols.js
+node tests/unit/test-issue-1825-observer-node-cross-links.js
+node tests/unit/test-issue-1833-legend-toggle-vcr-offset.js
+node tests/unit/test-issue-1836-crossnav-case-normalization.js
+node tests/unit/test-issue-1843-node-qr-quiet-zone.js
+node tests/unit/test-issue-1846-observers-width.js
+node tests/unit/test-issue-1849-trace-hashbytes.js
+node tests/unit/test-issue-1851-channel-message-scope.js
+node tests/unit/test-issue-1862-map-region-filter.js
+node tests/unit/test-issue-1868-control-decode.js
+node tests/unit/test-issue-1890-og-url.js
+node tests/unit/test-issue-1956-release-routing.js
+node tests/unit/test-issue-1979-scope-adverts-by-role.js
+node tests/unit/test-issue-2001-map-scope-state.js
+node tests/unit/test-issue-2012-clear-filters-selection.js
+node tests/unit/test-live-anims.js
+node tests/unit/test-live-dt-cap-1524.js
+node tests/unit/test-live-legend-helper.js
+node tests/unit/test-live-multibyte-filter.js
+node tests/unit/test-live-region-filter.js
+node tests/unit/test-live.js
+node tests/unit/test-map-clustering.js
+node tests/unit/test-mqtt-status-panel.js
+node tests/unit/test-my-repeaters-dashboard.js
+node tests/unit/test-naive-banner-tone.js
+node tests/unit/test-node-hop-analytics.js
+node tests/unit/test-node-reach-coverage-debounce.js
+node tests/unit/test-node-reach-coverage.js
+node tests/unit/test-nodes-export-wiring.js
+node tests/unit/test-nodes-export.js
+node tests/unit/test-observer-iata-1188.js
+node tests/unit/test-observer-menu-interactions.js
+node tests/unit/test-observer-naive-clock-1478.js
+node tests/unit/test-observer-search-filter.js
+node tests/unit/test-observers-headings.js
+node tests/unit/test-packet-filter-time.js
+node tests/unit/test-packet-filter-ux.js
+node tests/unit/test-packet-filter.js
+node tests/unit/test-packets-local-channels.js
+node tests/unit/test-packets.js
+node tests/unit/test-panel-corner.js
+node tests/unit/test-path-inspector.js
+node tests/unit/test-payload-labels-content.js
+node tests/unit/test-payload-labels-namespace.js
+node tests/unit/test-perf-anomaly.js
+node tests/unit/test-perf-disk-io-1120.js
+node tests/unit/test-perf-go-runtime.js
+node tests/unit/test-perf-render-1258.js
+node tests/unit/test-preflight-xss-gate.js
+node tests/unit/test-pull-to-reconnect-1091.js
+node tests/unit/test-pull-to-reconnect.js
+node tests/unit/test-repeater-metric-scatter.js
+node tests/unit/test-rx-coverage-config-race.js
+node tests/unit/test-rx-coverage-escape.js
+node tests/unit/test-scope-audit-styles-linked.js
+node tests/unit/test-slideover-1056-rowsel-strict.js
+node tests/unit/test-top-routes-overlay.js
+node tests/unit/test-traces.js
+node tests/unit/test-url-state.js
+node tests/unit/test-warmup-banner.js
+node tests/unit/test-ws-stale-watchdog-1074.js
+node tests/unit/test-xss-escape-sinks.js
 
 echo "All standalone frontend suites passed"
diff --git a/test-1110-live-filter.js b/tests/e2e/test-1110-live-filter.js
similarity index 100%
rename from test-1110-live-filter.js
rename to tests/e2e/test-1110-live-filter.js
diff --git a/test-a11y-axe-1668.js b/tests/e2e/test-a11y-axe-1668.js
similarity index 99%
rename from test-a11y-axe-1668.js
rename to tests/e2e/test-a11y-axe-1668.js
index f260ff5f..5c38dab6 100644
--- a/test-a11y-axe-1668.js
+++ b/tests/e2e/test-a11y-axe-1668.js
@@ -31,6 +31,7 @@
  */
 
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -41,7 +42,7 @@ const path = require('path');
 const BASE = process.env.BASE_URL || 'http://localhost:13581';
 const ROUTES_FILTER = (process.env.AXE_ROUTES_ONLY || '').split(',').filter(Boolean);
 const SHOT_DIR = process.env.AXE_SCREENSHOT_DIR || '/tmp/axe-1668';
-const ALLOWLIST_PATH = path.join(__dirname, 'tests', 'a11y-allowlist.yaml');
+const ALLOWLIST_PATH = path.join(REPO_ROOT, 'tests', 'a11y-allowlist.yaml');
 
 // Routes: M1 audit baseline (already proven coverage).
 // Hash routes — CoreScope is a SPA, server returns the same shell for any path.
diff --git a/test-analytics-fluid-charts.js b/tests/e2e/test-analytics-fluid-charts.js
similarity index 98%
rename from test-analytics-fluid-charts.js
rename to tests/e2e/test-analytics-fluid-charts.js
index b160700b..ba56f252 100644
--- a/test-analytics-fluid-charts.js
+++ b/tests/e2e/test-analytics-fluid-charts.js
@@ -19,12 +19,13 @@
  * Usage: node test-analytics-fluid-charts.js
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const { chromium } = require('playwright');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
-const CSS_PATH = path.join(__dirname, 'public', 'style.css');
+const CSS_PATH = path.join(REPO_ROOT, 'public', 'style.css');
 const cssHref = 'file://' + CSS_PATH;
 
 // Minimal harness: a sized wrapper that defines the available width
diff --git a/test-audio-lab-1297-e2e.js b/tests/e2e/test-audio-lab-1297-e2e.js
similarity index 100%
rename from test-audio-lab-1297-e2e.js
rename to tests/e2e/test-audio-lab-1297-e2e.js
diff --git a/test-audio-live-1297-e2e.js b/tests/e2e/test-audio-live-1297-e2e.js
similarity index 100%
rename from test-audio-live-1297-e2e.js
rename to tests/e2e/test-audio-live-1297-e2e.js
diff --git a/test-bottom-nav-1061-e2e.js b/tests/e2e/test-bottom-nav-1061-e2e.js
similarity index 100%
rename from test-bottom-nav-1061-e2e.js
rename to tests/e2e/test-bottom-nav-1061-e2e.js
diff --git a/test-channel-color-picker-e2e.js b/tests/e2e/test-channel-color-picker-e2e.js
similarity index 100%
rename from test-channel-color-picker-e2e.js
rename to tests/e2e/test-channel-color-picker-e2e.js
diff --git a/test-channel-decrypt-e2e.js b/tests/e2e/test-channel-decrypt-e2e.js
similarity index 100%
rename from test-channel-decrypt-e2e.js
rename to tests/e2e/test-channel-decrypt-e2e.js
diff --git a/test-channel-fluid-e2e.js b/tests/e2e/test-channel-fluid-e2e.js
similarity index 100%
rename from test-channel-fluid-e2e.js
rename to tests/e2e/test-channel-fluid-e2e.js
diff --git a/test-channel-issue-1087-e2e.js b/tests/e2e/test-channel-issue-1087-e2e.js
similarity index 100%
rename from test-channel-issue-1087-e2e.js
rename to tests/e2e/test-channel-issue-1087-e2e.js
diff --git a/test-channel-issue-1111-e2e.js b/tests/e2e/test-channel-issue-1111-e2e.js
similarity index 100%
rename from test-channel-issue-1111-e2e.js
rename to tests/e2e/test-channel-issue-1111-e2e.js
diff --git a/test-channel-modal-e2e.js b/tests/e2e/test-channel-modal-e2e.js
similarity index 100%
rename from test-channel-modal-e2e.js
rename to tests/e2e/test-channel-modal-e2e.js
diff --git a/test-channel-qr-e2e.js b/tests/e2e/test-channel-qr-e2e.js
similarity index 100%
rename from test-channel-qr-e2e.js
rename to tests/e2e/test-channel-qr-e2e.js
diff --git a/test-channels-add-modal-e2e.js b/tests/e2e/test-channels-add-modal-e2e.js
similarity index 100%
rename from test-channels-add-modal-e2e.js
rename to tests/e2e/test-channels-add-modal-e2e.js
diff --git a/test-channels-list-render-e2e.js b/tests/e2e/test-channels-list-render-e2e.js
similarity index 100%
rename from test-channels-list-render-e2e.js
rename to tests/e2e/test-channels-list-render-e2e.js
diff --git a/test-channels-selection-flow-e2e.js b/tests/e2e/test-channels-selection-flow-e2e.js
similarity index 100%
rename from test-channels-selection-flow-e2e.js
rename to tests/e2e/test-channels-selection-flow-e2e.js
diff --git a/test-channels-share-color-e2e.js b/tests/e2e/test-channels-share-color-e2e.js
similarity index 100%
rename from test-channels-share-color-e2e.js
rename to tests/e2e/test-channels-share-color-e2e.js
diff --git a/test-channels-ws-batch-e2e.js b/tests/e2e/test-channels-ws-batch-e2e.js
similarity index 100%
rename from test-channels-ws-batch-e2e.js
rename to tests/e2e/test-channels-ws-batch-e2e.js
diff --git a/test-channels-ws-race-1498-e2e.js b/tests/e2e/test-channels-ws-race-1498-e2e.js
similarity index 100%
rename from test-channels-ws-race-1498-e2e.js
rename to tests/e2e/test-channels-ws-race-1498-e2e.js
diff --git a/test-charts-fluid-1058-e2e.js b/tests/e2e/test-charts-fluid-1058-e2e.js
similarity index 100%
rename from test-charts-fluid-1058-e2e.js
rename to tests/e2e/test-charts-fluid-1058-e2e.js
diff --git a/test-customize-branding-e2e.js b/tests/e2e/test-customize-branding-e2e.js
similarity index 100%
rename from test-customize-branding-e2e.js
rename to tests/e2e/test-customize-branding-e2e.js
diff --git a/test-customize-display-e2e.js b/tests/e2e/test-customize-display-e2e.js
similarity index 100%
rename from test-customize-display-e2e.js
rename to tests/e2e/test-customize-display-e2e.js
diff --git a/test-customize-export-e2e.js b/tests/e2e/test-customize-export-e2e.js
similarity index 100%
rename from test-customize-export-e2e.js
rename to tests/e2e/test-customize-export-e2e.js
diff --git a/test-customize-theme-e2e.js b/tests/e2e/test-customize-theme-e2e.js
similarity index 100%
rename from test-customize-theme-e2e.js
rename to tests/e2e/test-customize-theme-e2e.js
diff --git a/test-drag-manager-e2e.js b/tests/e2e/test-drag-manager-e2e.js
similarity index 100%
rename from test-drag-manager-e2e.js
rename to tests/e2e/test-drag-manager-e2e.js
diff --git a/test-e2e-1267-mobile-vcr.js b/tests/e2e/test-e2e-1267-mobile-vcr.js
similarity index 100%
rename from test-e2e-1267-mobile-vcr.js
rename to tests/e2e/test-e2e-1267-mobile-vcr.js
diff --git a/test-e2e-playwright.js b/tests/e2e/test-e2e-playwright.js
similarity index 99%
rename from test-e2e-playwright.js
rename to tests/e2e/test-e2e-playwright.js
index a307959a..1c53d079 100644
--- a/test-e2e-playwright.js
+++ b/tests/e2e/test-e2e-playwright.js
@@ -1,3 +1,4 @@
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 /**
  * Playwright E2E tests — proof of concept
  * Runs against prod (analyzer.00id.net), read-only.
@@ -2313,7 +2314,7 @@ async function run() {
     if (coverage) {
       const fs = require('fs');
       const path = require('path');
-      const outDir = path.join(__dirname, '.nyc_output');
+      const outDir = path.join(REPO_ROOT, '.nyc_output');
       if (!fs.existsSync(outDir)) fs.mkdirSync(outDir, { recursive: true });
       fs.writeFileSync(path.join(outDir, 'e2e-coverage.json'), JSON.stringify(coverage));
       console.log(`Frontend coverage from E2E: ${Object.keys(coverage).length} files`);
diff --git a/test-filter-ux-e2e.js b/tests/e2e/test-filter-ux-e2e.js
similarity index 100%
rename from test-filter-ux-e2e.js
rename to tests/e2e/test-filter-ux-e2e.js
diff --git a/test-gesture-hints-1065-e2e.js b/tests/e2e/test-gesture-hints-1065-e2e.js
similarity index 100%
rename from test-gesture-hints-1065-e2e.js
rename to tests/e2e/test-gesture-hints-1065-e2e.js
diff --git a/test-gestures-1062-e2e.js b/tests/e2e/test-gestures-1062-e2e.js
similarity index 100%
rename from test-gestures-1062-e2e.js
rename to tests/e2e/test-gestures-1062-e2e.js
diff --git a/test-gestures-1185-scroll-discriminator-e2e.js b/tests/e2e/test-gestures-1185-scroll-discriminator-e2e.js
similarity index 100%
rename from test-gestures-1185-scroll-discriminator-e2e.js
rename to tests/e2e/test-gestures-1185-scroll-discriminator-e2e.js
diff --git a/test-home-coverage-e2e.js b/tests/e2e/test-home-coverage-e2e.js
similarity index 100%
rename from test-home-coverage-e2e.js
rename to tests/e2e/test-home-coverage-e2e.js
diff --git a/test-issue-1109-hamburger-dropdown-visible-e2e.js b/tests/e2e/test-issue-1109-hamburger-dropdown-visible-e2e.js
similarity index 100%
rename from test-issue-1109-hamburger-dropdown-visible-e2e.js
rename to tests/e2e/test-issue-1109-hamburger-dropdown-visible-e2e.js
diff --git a/test-issue-1122-packets-filter-ux-e2e.js b/tests/e2e/test-issue-1122-packets-filter-ux-e2e.js
similarity index 100%
rename from test-issue-1122-packets-filter-ux-e2e.js
rename to tests/e2e/test-issue-1122-packets-filter-ux-e2e.js
diff --git a/test-issue-1128-multi-viewport-e2e.js b/tests/e2e/test-issue-1128-multi-viewport-e2e.js
similarity index 100%
rename from test-issue-1128-multi-viewport-e2e.js
rename to tests/e2e/test-issue-1128-multi-viewport-e2e.js
diff --git a/test-issue-1128-packets-layout-e2e.js b/tests/e2e/test-issue-1128-packets-layout-e2e.js
similarity index 100%
rename from test-issue-1128-packets-layout-e2e.js
rename to tests/e2e/test-issue-1128-packets-layout-e2e.js
diff --git a/test-issue-1136-live-region-e2e.js b/tests/e2e/test-issue-1136-live-region-e2e.js
similarity index 100%
rename from test-issue-1136-live-region-e2e.js
rename to tests/e2e/test-issue-1136-live-region-e2e.js
diff --git a/test-issue-1146-path-link-contrast-e2e.js b/tests/e2e/test-issue-1146-path-link-contrast-e2e.js
similarity index 100%
rename from test-issue-1146-path-link-contrast-e2e.js
rename to tests/e2e/test-issue-1146-path-link-contrast-e2e.js
diff --git a/test-issue-1147-section-order-e2e.js b/tests/e2e/test-issue-1147-section-order-e2e.js
similarity index 100%
rename from test-issue-1147-section-order-e2e.js
rename to tests/e2e/test-issue-1147-section-order-e2e.js
diff --git a/test-issue-1150-404-state-e2e.js b/tests/e2e/test-issue-1150-404-state-e2e.js
similarity index 100%
rename from test-issue-1150-404-state-e2e.js
rename to tests/e2e/test-issue-1150-404-state-e2e.js
diff --git a/test-issue-1151-orphan-separators-e2e.js b/tests/e2e/test-issue-1151-orphan-separators-e2e.js
similarity index 100%
rename from test-issue-1151-orphan-separators-e2e.js
rename to tests/e2e/test-issue-1151-orphan-separators-e2e.js
diff --git a/test-issue-1204-live-panel-structure-e2e.js b/tests/e2e/test-issue-1204-live-panel-structure-e2e.js
similarity index 100%
rename from test-issue-1204-live-panel-structure-e2e.js
rename to tests/e2e/test-issue-1204-live-panel-structure-e2e.js
diff --git a/test-issue-1205-live-controls-anchor-e2e.js b/tests/e2e/test-issue-1205-live-controls-anchor-e2e.js
similarity index 100%
rename from test-issue-1205-live-controls-anchor-e2e.js
rename to tests/e2e/test-issue-1205-live-controls-anchor-e2e.js
diff --git a/test-issue-1206-resize-observer-leak-e2e.js b/tests/e2e/test-issue-1206-resize-observer-leak-e2e.js
similarity index 100%
rename from test-issue-1206-resize-observer-leak-e2e.js
rename to tests/e2e/test-issue-1206-resize-observer-leak-e2e.js
diff --git a/test-issue-1206-vcr-overlap-e2e.js b/tests/e2e/test-issue-1206-vcr-overlap-e2e.js
similarity index 100%
rename from test-issue-1206-vcr-overlap-e2e.js
rename to tests/e2e/test-issue-1206-vcr-overlap-e2e.js
diff --git a/test-issue-1224-channels-mobile-ux-e2e.js b/tests/e2e/test-issue-1224-channels-mobile-ux-e2e.js
similarity index 100%
rename from test-issue-1224-channels-mobile-ux-e2e.js
rename to tests/e2e/test-issue-1224-channels-mobile-ux-e2e.js
diff --git a/test-issue-1234-live-chrome-pass2-e2e.js b/tests/e2e/test-issue-1234-live-chrome-pass2-e2e.js
similarity index 100%
rename from test-issue-1234-live-chrome-pass2-e2e.js
rename to tests/e2e/test-issue-1234-live-chrome-pass2-e2e.js
diff --git a/test-issue-1236-map-mobile-e2e.js b/tests/e2e/test-issue-1236-map-mobile-e2e.js
similarity index 100%
rename from test-issue-1236-map-mobile-e2e.js
rename to tests/e2e/test-issue-1236-map-mobile-e2e.js
diff --git a/test-issue-1244-live-vcr-row-hints-e2e.js b/tests/e2e/test-issue-1244-live-vcr-row-hints-e2e.js
similarity index 100%
rename from test-issue-1244-live-vcr-row-hints-e2e.js
rename to tests/e2e/test-issue-1244-live-vcr-row-hints-e2e.js
diff --git a/test-issue-1273-qr-overlay-height-e2e.js b/tests/e2e/test-issue-1273-qr-overlay-height-e2e.js
similarity index 100%
rename from test-issue-1273-qr-overlay-height-e2e.js
rename to tests/e2e/test-issue-1273-qr-overlay-height-e2e.js
diff --git a/test-issue-1274-legend-coverage-e2e.js b/tests/e2e/test-issue-1274-legend-coverage-e2e.js
similarity index 100%
rename from test-issue-1274-legend-coverage-e2e.js
rename to tests/e2e/test-issue-1274-legend-coverage-e2e.js
diff --git a/test-issue-1279-legend-p2-e2e.js b/tests/e2e/test-issue-1279-legend-p2-e2e.js
similarity index 100%
rename from test-issue-1279-legend-p2-e2e.js
rename to tests/e2e/test-issue-1279-legend-p2-e2e.js
diff --git a/test-issue-1281-location-row-e2e.js b/tests/e2e/test-issue-1281-location-row-e2e.js
similarity index 100%
rename from test-issue-1281-location-row-e2e.js
rename to tests/e2e/test-issue-1281-location-row-e2e.js
diff --git a/test-issue-1306-collisions-terminology-e2e.js b/tests/e2e/test-issue-1306-collisions-terminology-e2e.js
similarity index 100%
rename from test-issue-1306-collisions-terminology-e2e.js
rename to tests/e2e/test-issue-1306-collisions-terminology-e2e.js
diff --git a/test-issue-1329-map-controls-accordion-e2e.js b/tests/e2e/test-issue-1329-map-controls-accordion-e2e.js
similarity index 100%
rename from test-issue-1329-map-controls-accordion-e2e.js
rename to tests/e2e/test-issue-1329-map-controls-accordion-e2e.js
diff --git a/test-issue-1367-channels-chat-app-e2e.js b/tests/e2e/test-issue-1367-channels-chat-app-e2e.js
similarity index 100%
rename from test-issue-1367-channels-chat-app-e2e.js
rename to tests/e2e/test-issue-1367-channels-chat-app-e2e.js
diff --git a/test-issue-1374-route-map-a11y-e2e.js b/tests/e2e/test-issue-1374-route-map-a11y-e2e.js
similarity index 100%
rename from test-issue-1374-route-map-a11y-e2e.js
rename to tests/e2e/test-issue-1374-route-map-a11y-e2e.js
diff --git a/test-issue-1400-nav-vertical-clip.js b/tests/e2e/test-issue-1400-nav-vertical-clip.js
similarity index 100%
rename from test-issue-1400-nav-vertical-clip.js
rename to tests/e2e/test-issue-1400-nav-vertical-clip.js
diff --git a/test-issue-1413-nav-overlap-e2e.js b/tests/e2e/test-issue-1413-nav-overlap-e2e.js
similarity index 100%
rename from test-issue-1413-nav-overlap-e2e.js
rename to tests/e2e/test-issue-1413-nav-overlap-e2e.js
diff --git a/test-issue-1486-collapse-reopens-detail-e2e.js b/tests/e2e/test-issue-1486-collapse-reopens-detail-e2e.js
similarity index 100%
rename from test-issue-1486-collapse-reopens-detail-e2e.js
rename to tests/e2e/test-issue-1486-collapse-reopens-detail-e2e.js
diff --git a/test-issue-1487-byop-modal-layout-e2e.js b/tests/e2e/test-issue-1487-byop-modal-layout-e2e.js
similarity index 100%
rename from test-issue-1487-byop-modal-layout-e2e.js
rename to tests/e2e/test-issue-1487-byop-modal-layout-e2e.js
diff --git a/test-issue-1510-live-nav-pin-e2e.js b/tests/e2e/test-issue-1510-live-nav-pin-e2e.js
similarity index 100%
rename from test-issue-1510-live-nav-pin-e2e.js
rename to tests/e2e/test-issue-1510-live-nav-pin-e2e.js
diff --git a/test-issue-1522-trace-url-sync-e2e.js b/tests/e2e/test-issue-1522-trace-url-sync-e2e.js
similarity index 100%
rename from test-issue-1522-trace-url-sync-e2e.js
rename to tests/e2e/test-issue-1522-trace-url-sync-e2e.js
diff --git a/test-issue-1567-corner-clears-drag-e2e.js b/tests/e2e/test-issue-1567-corner-clears-drag-e2e.js
similarity index 100%
rename from test-issue-1567-corner-clears-drag-e2e.js
rename to tests/e2e/test-issue-1567-corner-clears-drag-e2e.js
diff --git a/test-issue-1599-replay-freeze-e2e.js b/tests/e2e/test-issue-1599-replay-freeze-e2e.js
similarity index 100%
rename from test-issue-1599-replay-freeze-e2e.js
rename to tests/e2e/test-issue-1599-replay-freeze-e2e.js
diff --git a/test-issue-1630-reach-mobile-e2e.js b/tests/e2e/test-issue-1630-reach-mobile-e2e.js
similarity index 100%
rename from test-issue-1630-reach-mobile-e2e.js
rename to tests/e2e/test-issue-1630-reach-mobile-e2e.js
diff --git a/test-issue-1639-observers-sort-e2e.js b/tests/e2e/test-issue-1639-observers-sort-e2e.js
similarity index 100%
rename from test-issue-1639-observers-sort-e2e.js
rename to tests/e2e/test-issue-1639-observers-sort-e2e.js
diff --git a/test-issue-1640-compare-discovery-e2e.js b/tests/e2e/test-issue-1640-compare-discovery-e2e.js
similarity index 100%
rename from test-issue-1640-compare-discovery-e2e.js
rename to tests/e2e/test-issue-1640-compare-discovery-e2e.js
diff --git a/test-issue-1648-m1-icons-e2e.js b/tests/e2e/test-issue-1648-m1-icons-e2e.js
similarity index 100%
rename from test-issue-1648-m1-icons-e2e.js
rename to tests/e2e/test-issue-1648-m1-icons-e2e.js
diff --git a/test-issue-1648-m2-icons-e2e.js b/tests/e2e/test-issue-1648-m2-icons-e2e.js
similarity index 100%
rename from test-issue-1648-m2-icons-e2e.js
rename to tests/e2e/test-issue-1648-m2-icons-e2e.js
diff --git a/test-issue-1648-m3-icons-e2e.js b/tests/e2e/test-issue-1648-m3-icons-e2e.js
similarity index 100%
rename from test-issue-1648-m3-icons-e2e.js
rename to tests/e2e/test-issue-1648-m3-icons-e2e.js
diff --git a/test-issue-1648-m4-icons-e2e.js b/tests/e2e/test-issue-1648-m4-icons-e2e.js
similarity index 100%
rename from test-issue-1648-m4-icons-e2e.js
rename to tests/e2e/test-issue-1648-m4-icons-e2e.js
diff --git a/test-issue-1648-m5-icons-e2e.js b/tests/e2e/test-issue-1648-m5-icons-e2e.js
similarity index 100%
rename from test-issue-1648-m5-icons-e2e.js
rename to tests/e2e/test-issue-1648-m5-icons-e2e.js
diff --git a/test-issue-1657-analytics-channels-group-sprites-e2e.js b/tests/e2e/test-issue-1657-analytics-channels-group-sprites-e2e.js
similarity index 100%
rename from test-issue-1657-analytics-channels-group-sprites-e2e.js
rename to tests/e2e/test-issue-1657-analytics-channels-group-sprites-e2e.js
diff --git a/test-issue-1692-packets-init-parallel-e2e.js b/tests/e2e/test-issue-1692-packets-init-parallel-e2e.js
similarity index 100%
rename from test-issue-1692-packets-init-parallel-e2e.js
rename to tests/e2e/test-issue-1692-packets-init-parallel-e2e.js
diff --git a/test-issue-1705-subpath-contrast-e2e.js b/tests/e2e/test-issue-1705-subpath-contrast-e2e.js
similarity index 98%
rename from test-issue-1705-subpath-contrast-e2e.js
rename to tests/e2e/test-issue-1705-subpath-contrast-e2e.js
index 34cf6844..fdf417b9 100644
--- a/test-issue-1705-subpath-contrast-e2e.js
+++ b/tests/e2e/test-issue-1705-subpath-contrast-e2e.js
@@ -30,12 +30,13 @@
  * to convert SKIP -> FAIL.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const { chromium } = require('playwright');
 
-const CSS_PATH = path.resolve(__dirname, 'public', 'style.css');
+const CSS_PATH = path.resolve(REPO_ROOT, 'public', 'style.css');
 
 function fail(msg) {
   console.error(`test-issue-1705-subpath-contrast-e2e.js: FAIL — ${msg}`);
diff --git a/test-issue-1758-ng-filter-rerenders-e2e.js b/tests/e2e/test-issue-1758-ng-filter-rerenders-e2e.js
similarity index 100%
rename from test-issue-1758-ng-filter-rerenders-e2e.js
rename to tests/e2e/test-issue-1758-ng-filter-rerenders-e2e.js
diff --git a/test-issue-1799-label-vocab-e2e.js b/tests/e2e/test-issue-1799-label-vocab-e2e.js
similarity index 100%
rename from test-issue-1799-label-vocab-e2e.js
rename to tests/e2e/test-issue-1799-label-vocab-e2e.js
diff --git a/test-live-dedup.js b/tests/e2e/test-live-dedup.js
similarity index 100%
rename from test-live-dedup.js
rename to tests/e2e/test-live-dedup.js
diff --git a/test-live-fullscreen-1572-e2e.js b/tests/e2e/test-live-fullscreen-1572-e2e.js
similarity index 100%
rename from test-live-fullscreen-1572-e2e.js
rename to tests/e2e/test-live-fullscreen-1572-e2e.js
diff --git a/test-live-layout-1178-1179-e2e.js b/tests/e2e/test-live-layout-1178-1179-e2e.js
similarity index 100%
rename from test-live-layout-1178-1179-e2e.js
rename to tests/e2e/test-live-layout-1178-1179-e2e.js
diff --git a/test-live-mql-leak-1180-e2e.js b/tests/e2e/test-live-mql-leak-1180-e2e.js
similarity index 100%
rename from test-live-mql-leak-1180-e2e.js
rename to tests/e2e/test-live-mql-leak-1180-e2e.js
diff --git a/test-live-multibyte-only-e2e.js b/tests/e2e/test-live-multibyte-only-e2e.js
similarity index 100%
rename from test-live-multibyte-only-e2e.js
rename to tests/e2e/test-live-multibyte-only-e2e.js
diff --git a/test-logo-default-sage-teal-e2e.js b/tests/e2e/test-logo-default-sage-teal-e2e.js
similarity index 100%
rename from test-logo-default-sage-teal-e2e.js
rename to tests/e2e/test-logo-default-sage-teal-e2e.js
diff --git a/test-logo-pulse-1173-e2e.js b/tests/e2e/test-logo-pulse-1173-e2e.js
similarity index 100%
rename from test-logo-pulse-1173-e2e.js
rename to tests/e2e/test-logo-pulse-1173-e2e.js
diff --git a/test-logo-rebrand-e2e.js b/tests/e2e/test-logo-rebrand-e2e.js
similarity index 100%
rename from test-logo-rebrand-e2e.js
rename to tests/e2e/test-logo-rebrand-e2e.js
diff --git a/test-logo-theme-e2e.js b/tests/e2e/test-logo-theme-e2e.js
similarity index 100%
rename from test-logo-theme-e2e.js
rename to tests/e2e/test-logo-theme-e2e.js
diff --git a/test-map-modal-fluid-e2e.js b/tests/e2e/test-map-modal-fluid-e2e.js
similarity index 100%
rename from test-map-modal-fluid-e2e.js
rename to tests/e2e/test-map-modal-fluid-e2e.js
diff --git a/test-map-nodes-pagination-e2e.js b/tests/e2e/test-map-nodes-pagination-e2e.js
similarity index 100%
rename from test-map-nodes-pagination-e2e.js
rename to tests/e2e/test-map-nodes-pagination-e2e.js
diff --git a/test-marker-outline-weight.js b/tests/e2e/test-marker-outline-weight.js
similarity index 100%
rename from test-marker-outline-weight.js
rename to tests/e2e/test-marker-outline-weight.js
diff --git a/test-nav-drawer-1064-e2e.js b/tests/e2e/test-nav-drawer-1064-e2e.js
similarity index 100%
rename from test-nav-drawer-1064-e2e.js
rename to tests/e2e/test-nav-drawer-1064-e2e.js
diff --git a/test-nav-fluid-1055-e2e.js b/tests/e2e/test-nav-fluid-1055-e2e.js
similarity index 100%
rename from test-nav-fluid-1055-e2e.js
rename to tests/e2e/test-nav-fluid-1055-e2e.js
diff --git a/test-nav-more-floor-1139-e2e.js b/tests/e2e/test-nav-more-floor-1139-e2e.js
similarity index 100%
rename from test-nav-more-floor-1139-e2e.js
rename to tests/e2e/test-nav-more-floor-1139-e2e.js
diff --git a/test-nav-priority-1102-e2e.js b/tests/e2e/test-nav-priority-1102-e2e.js
similarity index 100%
rename from test-nav-priority-1102-e2e.js
rename to tests/e2e/test-nav-priority-1102-e2e.js
diff --git a/test-nav-priority-1311-e2e.js b/tests/e2e/test-nav-priority-1311-e2e.js
similarity index 100%
rename from test-nav-priority-1311-e2e.js
rename to tests/e2e/test-nav-priority-1311-e2e.js
diff --git a/test-nav-priority-1391-e2e.js b/tests/e2e/test-nav-priority-1391-e2e.js
similarity index 100%
rename from test-nav-priority-1391-e2e.js
rename to tests/e2e/test-nav-priority-1391-e2e.js
diff --git a/test-neighbor-map-btn-clip-e2e.js b/tests/e2e/test-neighbor-map-btn-clip-e2e.js
similarity index 97%
rename from test-neighbor-map-btn-clip-e2e.js
rename to tests/e2e/test-neighbor-map-btn-clip-e2e.js
index 59d04cee..a49b80a9 100644
--- a/test-neighbor-map-btn-clip-e2e.js
+++ b/tests/e2e/test-neighbor-map-btn-clip-e2e.js
@@ -35,15 +35,16 @@
  * make the geometry assertions below fail.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('node:fs');
 const path = require('node:path');
 const assert = require('node:assert');
 const { chromium } = require('playwright');
 
-const CSS = fs.readFileSync(path.join(__dirname, 'public', 'style.css'), 'utf8');
-const NODES_JS = fs.readFileSync(path.join(__dirname, 'public', 'nodes.js'), 'utf8');
-const ANALYTICS_JS = fs.readFileSync(path.join(__dirname, 'public', 'analytics.js'), 'utf8');
+const CSS = fs.readFileSync(path.join(REPO_ROOT, 'public', 'style.css'), 'utf8');
+const NODES_JS = fs.readFileSync(path.join(REPO_ROOT, 'public', 'nodes.js'), 'utf8');
+const ANALYTICS_JS = fs.readFileSync(path.join(REPO_ROOT, 'public', 'analytics.js'), 'utf8');
 
 const HEIGHT = 900;
 // The bug's window: below ~640px the table finally overflows and the
diff --git a/test-node-reach-coverage-e2e.js b/tests/e2e/test-node-reach-coverage-e2e.js
similarity index 100%
rename from test-node-reach-coverage-e2e.js
rename to tests/e2e/test-node-reach-coverage-e2e.js
diff --git a/test-node-reach-e2e.js b/tests/e2e/test-node-reach-e2e.js
similarity index 100%
rename from test-node-reach-e2e.js
rename to tests/e2e/test-node-reach-e2e.js
diff --git a/test-nodes-export-e2e.js b/tests/e2e/test-nodes-export-e2e.js
similarity index 100%
rename from test-nodes-export-e2e.js
rename to tests/e2e/test-nodes-export-e2e.js
diff --git a/test-observer-iata-1188-e2e.js b/tests/e2e/test-observer-iata-1188-e2e.js
similarity index 100%
rename from test-observer-iata-1188-e2e.js
rename to tests/e2e/test-observer-iata-1188-e2e.js
diff --git a/test-packets-scope-column.js b/tests/e2e/test-packets-scope-column.js
similarity index 100%
rename from test-packets-scope-column.js
rename to tests/e2e/test-packets-scope-column.js
diff --git a/test-path-inspector-coverage-e2e.js b/tests/e2e/test-path-inspector-coverage-e2e.js
similarity index 100%
rename from test-path-inspector-coverage-e2e.js
rename to tests/e2e/test-path-inspector-coverage-e2e.js
diff --git a/test-path-inspector-e2e.js b/tests/e2e/test-path-inspector-e2e.js
similarity index 100%
rename from test-path-inspector-e2e.js
rename to tests/e2e/test-path-inspector-e2e.js
diff --git a/test-pr-1490-live-map-gpu-animations-e2e.js b/tests/e2e/test-pr-1490-live-map-gpu-animations-e2e.js
similarity index 100%
rename from test-pr-1490-live-map-gpu-animations-e2e.js
rename to tests/e2e/test-pr-1490-live-map-gpu-animations-e2e.js
diff --git a/test-rx-coverage-mobile-nav-e2e.js b/tests/e2e/test-rx-coverage-mobile-nav-e2e.js
similarity index 100%
rename from test-rx-coverage-mobile-nav-e2e.js
rename to tests/e2e/test-rx-coverage-mobile-nav-e2e.js
diff --git a/test-show-neighbors.js b/tests/e2e/test-show-neighbors.js
similarity index 100%
rename from test-show-neighbors.js
rename to tests/e2e/test-show-neighbors.js
diff --git a/test-slideover-1056-e2e.js b/tests/e2e/test-slideover-1056-e2e.js
similarity index 100%
rename from test-slideover-1056-e2e.js
rename to tests/e2e/test-slideover-1056-e2e.js
diff --git a/test-slideover-1168-munger-e2e.js b/tests/e2e/test-slideover-1168-munger-e2e.js
similarity index 100%
rename from test-slideover-1168-munger-e2e.js
rename to tests/e2e/test-slideover-1168-munger-e2e.js
diff --git a/test-table-fluid-e2e.js b/tests/e2e/test-table-fluid-e2e.js
similarity index 100%
rename from test-table-fluid-e2e.js
rename to tests/e2e/test-table-fluid-e2e.js
diff --git a/test-table-sort.js b/tests/e2e/test-table-sort.js
similarity index 98%
rename from test-table-sort.js
rename to tests/e2e/test-table-sort.js
index a6255b91..af20c07e 100644
--- a/test-table-sort.js
+++ b/tests/e2e/test-table-sort.js
@@ -1,5 +1,6 @@
 /* test-table-sort.js — Unit tests for TableSort utility */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const { JSDOM } = require('jsdom');
 const fs = require('fs');
@@ -27,7 +28,7 @@ function createDOM(html) {
     runScripts: 'dangerously'
   });
   // Load TableSort into this DOM
-  const script = fs.readFileSync(path.join(__dirname, 'public', 'table-sort.js'), 'utf8');
+  const script = fs.readFileSync(path.join(REPO_ROOT, 'public', 'table-sort.js'), 'utf8');
   const el = dom.window.document.createElement('script');
   el.textContent = script;
   dom.window.document.head.appendChild(el);
diff --git a/test-touch-gestures-coverage-e2e.js b/tests/e2e/test-touch-gestures-coverage-e2e.js
similarity index 100%
rename from test-touch-gestures-coverage-e2e.js
rename to tests/e2e/test-touch-gestures-coverage-e2e.js
diff --git a/test-touch-targets.js b/tests/e2e/test-touch-targets.js
similarity index 99%
rename from test-touch-targets.js
rename to tests/e2e/test-touch-targets.js
index c509c1f3..86575f4d 100644
--- a/test-touch-targets.js
+++ b/tests/e2e/test-touch-targets.js
@@ -17,13 +17,14 @@
  * in CSS (:focus / :focus-within rule in the Touch Targets section).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 const { chromium, devices } = require('playwright');
 
-const REPO = __dirname;
+const REPO = REPO_ROOT;
 const CSS = fs.readFileSync(path.join(REPO, 'public/style.css'), 'utf8');
 
 // Selectors we claim to make 48x48. Each entry: [selector, tag, classes,
diff --git a/test-1108-region-hide-nodes.js b/tests/unit/test-1108-region-hide-nodes.js
similarity index 96%
rename from test-1108-region-hide-nodes.js
rename to tests/unit/test-1108-region-hide-nodes.js
index c693bfee..2a4b8d52 100644
--- a/test-1108-region-hide-nodes.js
+++ b/tests/unit/test-1108-region-hide-nodes.js
@@ -10,6 +10,7 @@
  * (no DOM, no fetch). Mirrors the pattern from test-area-filter.js.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const assert = require('assert');
@@ -37,7 +38,7 @@ function buildCtx(initialStorage) {
   };
   ctx.window = ctx;
   vm.createContext(ctx);
-  const src = fs.readFileSync(__dirname + '/public/region-filter.js', 'utf8');
+  const src = fs.readFileSync(REPO_ROOT + '/public/region-filter.js', 'utf8');
   vm.runInContext(src, ctx);
   return ctx;
 }
diff --git a/test-1659-analytics-warmup.js b/tests/unit/test-1659-analytics-warmup.js
similarity index 100%
rename from test-1659-analytics-warmup.js
rename to tests/unit/test-1659-analytics-warmup.js
diff --git a/test-a11y-1705-subpath-hop-prefix-e2e.js b/tests/unit/test-a11y-1705-subpath-hop-prefix-e2e.js
similarity index 98%
rename from test-a11y-1705-subpath-hop-prefix-e2e.js
rename to tests/unit/test-a11y-1705-subpath-hop-prefix-e2e.js
index 98dfbefa..959ef6c4 100644
--- a/test-a11y-1705-subpath-hop-prefix-e2e.js
+++ b/tests/unit/test-a11y-1705-subpath-hop-prefix-e2e.js
@@ -45,11 +45,12 @@
  *                     serves from).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 
-const STYLE_CSS_PATH = process.env.STYLE_CSS_PATH || path.join(__dirname, 'public', 'style.css');
+const STYLE_CSS_PATH = process.env.STYLE_CSS_PATH || path.join(REPO_ROOT, 'public', 'style.css');
 const THEMES = ['dark', 'light'];
 
 // -------------------- Pure helpers (unit-testable) --------------------
diff --git a/test-a11y-1715-dark-role-swatches.js b/tests/unit/test-a11y-1715-dark-role-swatches.js
similarity index 98%
rename from test-a11y-1715-dark-role-swatches.js
rename to tests/unit/test-a11y-1715-dark-role-swatches.js
index e60b32fa..0b9ed182 100644
--- a/test-a11y-1715-dark-role-swatches.js
+++ b/tests/unit/test-a11y-1715-dark-role-swatches.js
@@ -32,12 +32,13 @@
  * Usage:  node test-a11y-1715-dark-role-swatches.js
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const ROOT = __dirname;
+const ROOT = REPO_ROOT;
 const STYLE_CSS = process.env.STYLE_CSS_PATH || path.join(ROOT, 'public', 'style.css');
 
 const ROLES = ['repeater', 'companion', 'room', 'sensor', 'observer'];
diff --git a/test-a11y-1716-rf-range-btn-active.js b/tests/unit/test-a11y-1716-rf-range-btn-active.js
similarity index 98%
rename from test-a11y-1716-rf-range-btn-active.js
rename to tests/unit/test-a11y-1716-rf-range-btn-active.js
index db4b9afd..9cbbe641 100644
--- a/test-a11y-1716-rf-range-btn-active.js
+++ b/tests/unit/test-a11y-1716-rf-range-btn-active.js
@@ -31,11 +31,12 @@
  * Usage:  node test-a11y-1716-rf-range-btn-active.js
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 
-const ROOT = __dirname;
+const ROOT = REPO_ROOT;
 const STYLE_CSS = process.env.STYLE_CSS_PATH || path.join(ROOT, 'public', 'style.css');
 
 // ---- WCAG helpers (copied small, no shared import) ----
diff --git a/test-a11y-1719-contrast-root-causes-e2e.js b/tests/unit/test-a11y-1719-contrast-root-causes-e2e.js
similarity index 99%
rename from test-a11y-1719-contrast-root-causes-e2e.js
rename to tests/unit/test-a11y-1719-contrast-root-causes-e2e.js
index d112555e..8517fb9d 100644
--- a/test-a11y-1719-contrast-root-causes-e2e.js
+++ b/tests/unit/test-a11y-1719-contrast-root-causes-e2e.js
@@ -37,11 +37,12 @@
  * Usage:  node test-a11y-1719-contrast-root-causes-e2e.js
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 
-const ROOT = __dirname;
+const ROOT = REPO_ROOT;
 const STYLE_CSS = process.env.STYLE_CSS_PATH || path.join(ROOT, 'public', 'style.css');
 const CUSTOMIZE_JS = path.join(ROOT, 'public', 'customize.js');
 
diff --git a/test-a11y-axe-1668-selftest.js b/tests/unit/test-a11y-axe-1668-selftest.js
similarity index 98%
rename from test-a11y-axe-1668-selftest.js
rename to tests/unit/test-a11y-axe-1668-selftest.js
index 86bb8361..77f40f52 100644
--- a/test-a11y-axe-1668-selftest.js
+++ b/tests/unit/test-a11y-axe-1668-selftest.js
@@ -11,13 +11,14 @@
  */
 
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const assert = require('assert');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-const mod = require('./test-a11y-axe-1668.js');
+const mod = require('../e2e/test-a11y-axe-1668.js');
 
 // ---- routes / themes --------------------------------------------------------
 assert.ok(Array.isArray(mod.ROUTES), 'ROUTES must be an array');
@@ -103,7 +104,7 @@ for (const r of mod.ROUTES) {
 
 // Cross-check REGISTERED_* against actual source code so the constant cannot
 // drift silently from `registerPage()` calls or analytics tab `case` arms.
-const repoRoot = __dirname;
+const repoRoot = REPO_ROOT;
 const publicDir = path.join(repoRoot, 'public');
 if (fs.existsSync(publicDir)) {
   const files = fs.readdirSync(publicDir).filter(f => f.endsWith('.js'));
@@ -184,7 +185,7 @@ assert.throws(
 // And loadAllowlist must propagate the throw end-to-end via a tmpfile.
 const tmpMalformed = path.join(os.tmpdir(), `a11y-malformed-${process.pid}.yaml`);
 fs.writeFileSync(tmpMalformed, 'this :: is :: garbage\n!!! no\n');
-const ALLOWLIST_PATH_ORIG = require.resolve('./test-a11y-axe-1668.js');
+const ALLOWLIST_PATH_ORIG = require.resolve('../e2e/test-a11y-axe-1668.js');
 // We can't easily redirect ALLOWLIST_PATH without re-requiring; instead call
 // parseAllowlistYaml directly on the tmpfile content for end-to-end coverage.
 assert.throws(
@@ -382,7 +383,7 @@ assert.throws(
 );
 
 // ---- repo allowlist file: shape sanity --------------------------------------
-const allowPath = path.join(__dirname, 'tests', 'a11y-allowlist.yaml');
+const allowPath = path.join(REPO_ROOT, 'tests', 'a11y-allowlist.yaml');
 assert.ok(fs.existsSync(allowPath), `tests/a11y-allowlist.yaml missing at ${allowPath}`);
 const entries = mod.loadAllowlist();
 for (const e of entries) {
diff --git a/test-a11y-axe-routes-coverage.js b/tests/unit/test-a11y-axe-routes-coverage.js
similarity index 93%
rename from test-a11y-axe-routes-coverage.js
rename to tests/unit/test-a11y-axe-routes-coverage.js
index b2846281..66b25dc6 100644
--- a/test-a11y-axe-routes-coverage.js
+++ b/tests/unit/test-a11y-axe-routes-coverage.js
@@ -15,15 +15,16 @@
  */
 
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
 
-const mod = require('./test-a11y-axe-1668.js');
+const mod = require('../e2e/test-a11y-axe-1668.js');
 
 const analyticsSrc = fs.readFileSync(
-  path.join(__dirname, 'public', 'analytics.js'),
+  path.join(REPO_ROOT, 'public', 'analytics.js'),
   'utf8'
 );
 
diff --git a/test-aging.js b/tests/unit/test-aging.js
similarity index 100%
rename from test-aging.js
rename to tests/unit/test-aging.js
diff --git a/test-analytics-channels-integration.js b/tests/unit/test-analytics-channels-integration.js
similarity index 98%
rename from test-analytics-channels-integration.js
rename to tests/unit/test-analytics-channels-integration.js
index 43059094..8d0296ed 100644
--- a/test-analytics-channels-integration.js
+++ b/tests/unit/test-analytics-channels-integration.js
@@ -16,6 +16,7 @@
  *      jump to channel activity stats.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -55,7 +56,7 @@ global.histogram = () => ({ svg: '' });
 
 // Load analytics.js — it self-registers global helpers we test.
 const analyticsSrc = fs.readFileSync(
-  path.join(__dirname, 'public/analytics.js'),
+  path.join(REPO_ROOT, 'public/analytics.js'),
   'utf8'
 );
 // Strip top-level `await` / module syntax — analytics.js is plain IIFE so it's
diff --git a/test-anl1-tooltip-render.js b/tests/unit/test-anl1-tooltip-render.js
similarity index 100%
rename from test-anl1-tooltip-render.js
rename to tests/unit/test-anl1-tooltip-render.js
diff --git a/test-area-filter.js b/tests/unit/test-area-filter.js
similarity index 100%
rename from test-area-filter.js
rename to tests/unit/test-area-filter.js
diff --git a/test-channel-color-picker.js b/tests/unit/test-channel-color-picker.js
similarity index 96%
rename from test-channel-color-picker.js
rename to tests/unit/test-channel-color-picker.js
index 54de759b..cbdc7f77 100644
--- a/test-channel-color-picker.js
+++ b/tests/unit/test-channel-color-picker.js
@@ -9,6 +9,7 @@
  */
 
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const path = require('path');
@@ -113,7 +114,7 @@ assert(
 // --- Test 3: channel-colors.js getRowStyle uses border-left only ---
 console.log('\n=== channel-colors.js getRowStyle ===');
 
-const ccSource = fs.readFileSync(path.join(__dirname, 'public', 'channel-colors.js'), 'utf8');
+const ccSource = fs.readFileSync(path.join(REPO_ROOT, 'public', 'channel-colors.js'), 'utf8');
 const ccCtx = {
   window: {},
   localStorage: {
@@ -140,7 +141,7 @@ assert(advertStyle === '', 'getRowStyle returns empty for non-GRP_TXT type');
 // --- Test 4: channel-color-picker.js palette ---
 console.log('\n=== channel-color-picker.js palette ===');
 
-const pickerSource = fs.readFileSync(path.join(__dirname, 'public', 'channel-color-picker.js'), 'utf8');
+const pickerSource = fs.readFileSync(path.join(REPO_ROOT, 'public', 'channel-color-picker.js'), 'utf8');
 const pickerCtx = {
   window: { ChannelColors: ccCtx.window.ChannelColors, matchMedia: () => ({ matches: false }) },
   document: {
diff --git a/test-channel-colors.js b/tests/unit/test-channel-colors.js
similarity index 97%
rename from test-channel-colors.js
rename to tests/unit/test-channel-colors.js
index a3e2426b..19b537d1 100644
--- a/test-channel-colors.js
+++ b/tests/unit/test-channel-colors.js
@@ -1,5 +1,6 @@
 /* Unit tests for channel color highlighting (M1) — #271 */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const assert = require('assert');
@@ -33,7 +34,7 @@ function makeSandbox() {
   };
   ctx.window.ChannelColors = undefined;
   vm.createContext(ctx);
-  const src = fs.readFileSync(__dirname + '/public/channel-colors.js', 'utf8');
+  const src = fs.readFileSync(REPO_ROOT + '/public/channel-colors.js', 'utf8');
   vm.runInContext(src, ctx);
   return ctx;
 }
@@ -217,7 +218,7 @@ test('channel-color-picker.js loads without error in sandbox', function() {
   ctx.setTimeout = function(fn) { fn(); };
   ctx.window.innerWidth = 1024;
   ctx.window.innerHeight = 768;
-  const pickerSrc = fs.readFileSync(__dirname + '/public/channel-color-picker.js', 'utf8');
+  const pickerSrc = fs.readFileSync(REPO_ROOT + '/public/channel-color-picker.js', 'utf8');
   vm.runInContext(pickerSrc, ctx);
   assert.ok(ctx.window.ChannelColorPicker, 'ChannelColorPicker should be exported');
   assert.strictEqual(typeof ctx.window.ChannelColorPicker.install, 'function');
@@ -247,7 +248,7 @@ test('ChannelColorPicker.install does not throw when elements missing', function
   ctx.setTimeout = function(fn) { fn(); };
   ctx.window.innerWidth = 1024;
   ctx.window.innerHeight = 768;
-  const pickerSrc = fs.readFileSync(__dirname + '/public/channel-color-picker.js', 'utf8');
+  const pickerSrc = fs.readFileSync(REPO_ROOT + '/public/channel-color-picker.js', 'utf8');
   vm.runInContext(pickerSrc, ctx);
   // Should not throw when feed/table elements don't exist
   ctx.window.ChannelColorPicker.install();
diff --git a/test-channel-decrypt-ecb.js b/tests/unit/test-channel-decrypt-ecb.js
similarity index 95%
rename from test-channel-decrypt-ecb.js
rename to tests/unit/test-channel-decrypt-ecb.js
index 918a6ea1..bf98e2a0 100644
--- a/test-channel-decrypt-ecb.js
+++ b/tests/unit/test-channel-decrypt-ecb.js
@@ -17,6 +17,7 @@
  *   ciphertext = 69c4e0d86a7b0430d8cdb78070b4c55a
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -47,12 +48,12 @@ function loadChannelDecrypt() {
   vm.createContext(sandbox);
 
   // Load vendored AES (if present) before channel-decrypt.js.
-  const vendorPath = path.join(__dirname, 'public/vendor/aes-ecb.js');
+  const vendorPath = path.join(REPO_ROOT, 'public/vendor/aes-ecb.js');
   if (fs.existsSync(vendorPath)) {
     vm.runInContext(fs.readFileSync(vendorPath, 'utf8'), sandbox);
   }
   vm.runInContext(
-    fs.readFileSync(path.join(__dirname, 'public/channel-decrypt.js'), 'utf8'),
+    fs.readFileSync(path.join(REPO_ROOT, 'public/channel-decrypt.js'), 'utf8'),
     sandbox
   );
   return sandbox.window.ChannelDecrypt;
diff --git a/test-channel-decrypt-insecure-context.js b/tests/unit/test-channel-decrypt-insecure-context.js
similarity index 96%
rename from test-channel-decrypt-insecure-context.js
rename to tests/unit/test-channel-decrypt-insecure-context.js
index 7f69179a..f39a856d 100644
--- a/test-channel-decrypt-insecure-context.js
+++ b/tests/unit/test-channel-decrypt-insecure-context.js
@@ -32,6 +32,7 @@
  *     mac  = b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -63,20 +64,20 @@ function loadChannelDecryptInsecureContext() {
   vm.createContext(sandbox);
 
   // Vendored AES (must load before channel-decrypt.js — same as index.html).
-  const vendorAesPath = path.join(__dirname, 'public/vendor/aes-ecb.js');
+  const vendorAesPath = path.join(REPO_ROOT, 'public/vendor/aes-ecb.js');
   if (fs.existsSync(vendorAesPath)) {
     vm.runInContext(fs.readFileSync(vendorAesPath, 'utf8'), sandbox);
   }
   // Optional vendored SHA-256 / HMAC (the fix). Load if present so the test
   // works whether the fix vendors it as a separate file OR inlines it into
   // channel-decrypt.js.
-  const vendorShaPath = path.join(__dirname, 'public/vendor/sha256-hmac.js');
+  const vendorShaPath = path.join(REPO_ROOT, 'public/vendor/sha256-hmac.js');
   if (fs.existsSync(vendorShaPath)) {
     vm.runInContext(fs.readFileSync(vendorShaPath, 'utf8'), sandbox);
   }
 
   vm.runInContext(
-    fs.readFileSync(path.join(__dirname, 'public/channel-decrypt.js'), 'utf8'),
+    fs.readFileSync(path.join(REPO_ROOT, 'public/channel-decrypt.js'), 'utf8'),
     sandbox
   );
   return sandbox.window.ChannelDecrypt;
diff --git a/test-channel-decrypt-m345.js b/tests/unit/test-channel-decrypt-m345.js
similarity index 97%
rename from test-channel-decrypt-m345.js
rename to tests/unit/test-channel-decrypt-m345.js
index 0dccbbdf..0c77eaa1 100644
--- a/test-channel-decrypt-m345.js
+++ b/tests/unit/test-channel-decrypt-m345.js
@@ -3,6 +3,7 @@
  * Runs in Node.js via vm.createContext to simulate browser environment.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -58,7 +59,7 @@ async function runTests() {
   console.log('\n=== M3: PSK hex key detection ===');
 
   // Load channel-decrypt.js in sandbox
-  const cdSrc = fs.readFileSync(__dirname + '/public/channel-decrypt.js', 'utf8');
+  const cdSrc = fs.readFileSync(REPO_ROOT + '/public/channel-decrypt.js', 'utf8');
   const sandbox = createSandbox();
   const context = vm.createContext(sandbox);
   vm.runInContext(cdSrc, context);
diff --git a/test-channel-fluid-layout.js b/tests/unit/test-channel-fluid-layout.js
similarity index 96%
rename from test-channel-fluid-layout.js
rename to tests/unit/test-channel-fluid-layout.js
index 3d06a899..07bdb1a1 100644
--- a/test-channel-fluid-layout.js
+++ b/tests/unit/test-channel-fluid-layout.js
@@ -9,12 +9,13 @@
  * Companion E2E (real viewport assertions): test-channel-fluid-e2e.js.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const css = fs.readFileSync(path.join(__dirname, 'public/style.css'), 'utf8');
+const css = fs.readFileSync(path.join(REPO_ROOT, 'public/style.css'), 'utf8');
 
 let passed = 0, failed = 0;
 function test(name, fn) {
diff --git a/test-channel-issue-1087.js b/tests/unit/test-channel-issue-1087.js
similarity index 95%
rename from test-channel-issue-1087.js
rename to tests/unit/test-channel-issue-1087.js
index ca3ace34..9bd52abc 100644
--- a/test-channel-issue-1087.js
+++ b/tests/unit/test-channel-issue-1087.js
@@ -20,6 +20,7 @@
  * Companion E2E coverage: test-channel-issue-1087-e2e.js
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -31,10 +32,10 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const chSrc   = fs.readFileSync(path.join(__dirname, 'public/channels.js'),       'utf8');
-const qrSrc   = fs.readFileSync(path.join(__dirname, 'public/channel-qr.js'),     'utf8');
-const decSrc  = fs.readFileSync(path.join(__dirname, 'public/channel-decrypt.js'), 'utf8');
-const idxSrc  = fs.readFileSync(path.join(__dirname, 'public/index.html'),         'utf8');
+const chSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public/channels.js'),       'utf8');
+const qrSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public/channel-qr.js'),     'utf8');
+const decSrc  = fs.readFileSync(path.join(REPO_ROOT, 'public/channel-decrypt.js'), 'utf8');
+const idxSrc  = fs.readFileSync(path.join(REPO_ROOT, 'public/index.html'),         'utf8');
 
 console.log('\n=== #1087 Bug 1: QR vendor library is wired correctly ===');
 
diff --git a/test-channel-issue-1101.js b/tests/unit/test-channel-issue-1101.js
similarity index 95%
rename from test-channel-issue-1101.js
rename to tests/unit/test-channel-issue-1101.js
index d6c178ea..2a4877b4 100644
--- a/test-channel-issue-1101.js
+++ b/tests/unit/test-channel-issue-1101.js
@@ -11,6 +11,7 @@
  *     text, no Copy Key button overlapping it.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -21,8 +22,8 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const channelsSrc = fs.readFileSync(path.join(__dirname, 'public', 'channels.js'), 'utf8');
-const qrSrc = fs.readFileSync(path.join(__dirname, 'public', 'channel-qr.js'), 'utf8');
+const channelsSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'channels.js'), 'utf8');
+const qrSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'channel-qr.js'), 'utf8');
 
 console.log('\n=== #1101: Share modal markup ===');
 
diff --git a/test-channel-live-decrypt-userprefix.js b/tests/unit/test-channel-live-decrypt-userprefix.js
similarity index 98%
rename from test-channel-live-decrypt-userprefix.js
rename to tests/unit/test-channel-live-decrypt-userprefix.js
index 091bdcf2..eaffdc41 100644
--- a/test-channel-live-decrypt-userprefix.js
+++ b/tests/unit/test-channel-live-decrypt-userprefix.js
@@ -38,6 +38,7 @@
  *   4. unread is NOT bumped on the channel currently being viewed
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -150,7 +151,7 @@ function makeBrowserLikeSandbox() {
 }
 
 function loadInCtx(ctx, file) {
-  const src = fs.readFileSync(path.join(__dirname, file), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, file), 'utf8');
   vm.runInContext(src, ctx, { filename: file });
   for (const k of Object.keys(ctx.window)) ctx[k] = ctx.window[k];
 }
diff --git a/test-channel-live-decrypt.js b/tests/unit/test-channel-live-decrypt.js
similarity index 96%
rename from test-channel-live-decrypt.js
rename to tests/unit/test-channel-live-decrypt.js
index e7db96a7..18bd8f5f 100644
--- a/test-channel-live-decrypt.js
+++ b/tests/unit/test-channel-live-decrypt.js
@@ -18,6 +18,7 @@
  *     channels the user is not currently viewing.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -87,8 +88,8 @@ function buildEncryptedGrpTxt(channelName, sender, message) {
 async function run() {
   console.log('\n=== Live PSK decrypt: ChannelDecrypt helpers ===');
 
-  const cdSrc = fs.readFileSync(path.join(__dirname, 'public/channel-decrypt.js'), 'utf8');
-  const aesSrc = fs.readFileSync(path.join(__dirname, 'public/vendor/aes-ecb.js'), 'utf8');
+  const cdSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/channel-decrypt.js'), 'utf8');
+  const aesSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/vendor/aes-ecb.js'), 'utf8');
   const sandbox = createSandbox();
   const ctx = vm.createContext(sandbox);
   vm.runInContext(aesSrc, ctx);
@@ -143,7 +144,7 @@ async function run() {
     'tryDecryptLive returns null when encryptedData/mac missing');
 
   console.log('\n=== Live PSK decrypt: channels.js integration contract ===');
-  const chSrc = fs.readFileSync(path.join(__dirname, 'public/channels.js'), 'utf8');
+  const chSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/channels.js'), 'utf8');
   assert(/tryDecryptLive\s*\(/.test(chSrc),
     'channels.js calls ChannelDecrypt.tryDecryptLive() in the WS path');
   assert(/buildKeyMap\s*\(/.test(chSrc),
diff --git a/test-channel-modal-ux.js b/tests/unit/test-channel-modal-ux.js
similarity index 96%
rename from test-channel-modal-ux.js
rename to tests/unit/test-channel-modal-ux.js
index 5c4e3b17..795e87cf 100644
--- a/test-channel-modal-ux.js
+++ b/tests/unit/test-channel-modal-ux.js
@@ -16,6 +16,7 @@
  * Runs in Node.js — no browser.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -27,8 +28,8 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const chSrc = fs.readFileSync(path.join(__dirname, 'public/channels.js'), 'utf8');
-const cssSrc = fs.readFileSync(path.join(__dirname, 'public/style.css'), 'utf8');
+const chSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/channels.js'), 'utf8');
+const cssSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/style.css'), 'utf8');
 
 console.log('\n=== #1034 PR1: [+ Add Channel] sidebar button ===');
 assert(/id="chAddChannelBtn"/.test(chSrc),
diff --git a/test-channel-psk-ux.js b/tests/unit/test-channel-psk-ux.js
similarity index 97%
rename from test-channel-psk-ux.js
rename to tests/unit/test-channel-psk-ux.js
index 9123b7f4..a75ea5f7 100644
--- a/test-channel-psk-ux.js
+++ b/tests/unit/test-channel-psk-ux.js
@@ -9,6 +9,7 @@
  * Runs in Node.js via vm.createContext to simulate the browser.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -47,7 +48,7 @@ function createSandbox() {
 async function run() {
   console.log('\n=== #1020 PSK UX: ChannelDecrypt label storage ===');
 
-  const cdSrc = fs.readFileSync(path.join(__dirname, 'public/channel-decrypt.js'), 'utf8');
+  const cdSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/channel-decrypt.js'), 'utf8');
   const sandbox = createSandbox();
   vm.runInContext(cdSrc, vm.createContext(sandbox));
   const CD = sandbox.window.ChannelDecrypt;
@@ -78,7 +79,7 @@ async function run() {
   assert(!CD.getLabel('#LongFast'), 'no label means getLabel returns falsy');
 
   console.log('\n=== #1020 PSK UX: channels.js DOM/contract ===');
-  const chSrc = fs.readFileSync(path.join(__dirname, 'public/channels.js'), 'utf8');
+  const chSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/channels.js'), 'utf8');
 
   // E2E DOM: optional label input in add form (now in #1034 modal as #chPskName)
   assert(chSrc.includes('id="chPskName"') || chSrc.includes('id="chKeyLabelInput"'),
diff --git a/test-channel-qr-wiring.js b/tests/unit/test-channel-qr-wiring.js
similarity index 96%
rename from test-channel-qr-wiring.js
rename to tests/unit/test-channel-qr-wiring.js
index 4d92a966..5284cce5 100644
--- a/test-channel-qr-wiring.js
+++ b/tests/unit/test-channel-qr-wiring.js
@@ -8,6 +8,7 @@
  * E2E behavior is covered by test-channel-modal-e2e.js extensions.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -20,7 +21,7 @@ function assert(cond, msg) {
 }
 
 const src = fs.readFileSync(
-  path.join(__dirname, 'public/channels.js'),
+  path.join(REPO_ROOT, 'public/channels.js'),
   'utf8'
 );
 
diff --git a/test-channel-qr.js b/tests/unit/test-channel-qr.js
similarity index 96%
rename from test-channel-qr.js
rename to tests/unit/test-channel-qr.js
index 310f6603..3bbd6f45 100644
--- a/test-channel-qr.js
+++ b/tests/unit/test-channel-qr.js
@@ -7,6 +7,7 @@
  * elsewhere in the redesign series.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -30,7 +31,7 @@ function loadChannelQR() {
   sandbox.self = sandbox;
   vm.createContext(sandbox);
 
-  const src = fs.readFileSync(path.join(__dirname, 'public/channel-qr.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public/channel-qr.js'), 'utf8');
   vm.runInContext(src, sandbox);
   return sandbox.window.ChannelQR;
 }
diff --git a/test-channel-sidebar-layout.js b/tests/unit/test-channel-sidebar-layout.js
similarity index 95%
rename from test-channel-sidebar-layout.js
rename to tests/unit/test-channel-sidebar-layout.js
index 6d57f462..ec8e93e3 100644
--- a/test-channel-sidebar-layout.js
+++ b/tests/unit/test-channel-sidebar-layout.js
@@ -19,6 +19,7 @@
  * clearer copy and stays grouped with the channel controls.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -29,8 +30,8 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const chSrc = fs.readFileSync(path.join(__dirname, 'public/channels.js'), 'utf8');
-const cssSrc = fs.readFileSync(path.join(__dirname, 'public/style.css'), 'utf8');
+const chSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/channels.js'), 'utf8');
+const cssSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/style.css'), 'utf8');
 
 console.log('\n=== Sidebar layout: no nested <button> inside .ch-item ===');
 
diff --git a/test-channel-ux-followup.js b/tests/unit/test-channel-ux-followup.js
similarity index 97%
rename from test-channel-ux-followup.js
rename to tests/unit/test-channel-ux-followup.js
index c41a24ee..c121d94f 100644
--- a/test-channel-ux-followup.js
+++ b/tests/unit/test-channel-ux-followup.js
@@ -12,12 +12,13 @@
  *      Likewise no key hex in the default row rendering.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 
-const chSrc = fs.readFileSync(path.join(__dirname, 'public/channels.js'), 'utf8');
-const cssSrc = fs.readFileSync(path.join(__dirname, 'public/style.css'), 'utf8');
+const chSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/channels.js'), 'utf8');
+const cssSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/style.css'), 'utf8');
 
 let passed = 0, failed = 0;
 function assert(cond, msg) {
diff --git a/test-channel-ux-round2.js b/tests/unit/test-channel-ux-round2.js
similarity index 95%
rename from test-channel-ux-round2.js
rename to tests/unit/test-channel-ux-round2.js
index e18db123..07913b66 100644
--- a/test-channel-ux-round2.js
+++ b/tests/unit/test-channel-ux-round2.js
@@ -10,12 +10,13 @@
  *      styling — looks like a destructive action.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 
-const chSrc = fs.readFileSync(path.join(__dirname, 'public/channels.js'), 'utf8');
-const cssSrc = fs.readFileSync(path.join(__dirname, 'public/style.css'), 'utf8');
+const chSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/channels.js'), 'utf8');
+const cssSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/style.css'), 'utf8');
 
 let passed = 0, failed = 0;
 function assert(cond, msg) {
diff --git a/test-channels-merge-1498-unit.js b/tests/unit/test-channels-merge-1498-unit.js
similarity index 100%
rename from test-channels-merge-1498-unit.js
rename to tests/unit/test-channels-merge-1498-unit.js
diff --git a/test-clear-filters.js b/tests/unit/test-clear-filters.js
similarity index 98%
rename from test-clear-filters.js
rename to tests/unit/test-clear-filters.js
index 2a4c3bae..ce293192 100644
--- a/test-clear-filters.js
+++ b/tests/unit/test-clear-filters.js
@@ -3,6 +3,7 @@
  * not source-grep tautology.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -109,7 +110,7 @@ function makeSandbox() {
  * This is more robust than loading the entire IIFE (which needs full DOM).
  */
 function extractClearHandler() {
-  const src = fs.readFileSync(__dirname + '/public/packets.js', 'utf-8');
+  const src = fs.readFileSync(REPO_ROOT + '/public/packets.js', 'utf-8');
 
   // Find the clear handler
   const marker = "if (clearBtn) clearBtn.addEventListener('click', function()";
@@ -134,7 +135,7 @@ function extractClearHandler() {
  * Extract updatePacketsUrl function body
  */
 function extractUpdatePacketsUrl() {
-  const src = fs.readFileSync(__dirname + '/public/packets.js', 'utf-8');
+  const src = fs.readFileSync(REPO_ROOT + '/public/packets.js', 'utf-8');
   const marker = 'function updatePacketsUrl()';
   const idx = src.indexOf(marker);
   assert(idx !== -1, 'updatePacketsUrl not found');
diff --git a/test-color-picker-ux.js b/tests/unit/test-color-picker-ux.js
similarity index 93%
rename from test-color-picker-ux.js
rename to tests/unit/test-color-picker-ux.js
index a294f0fe..cbacc07a 100644
--- a/test-color-picker-ux.js
+++ b/tests/unit/test-color-picker-ux.js
@@ -9,6 +9,7 @@
  */
 
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const path = require('path');
@@ -29,7 +30,7 @@ function assert(condition, msg) {
 // --- Test 1: Live feed dot size ---
 console.log('\n=== Live feed color dot size (#681) ===');
 
-const liveSource = fs.readFileSync(path.join(__dirname, 'public/live.js'), 'utf8');
+const liveSource = fs.readFileSync(path.join(REPO_ROOT, 'public/live.js'), 'utf8');
 
 // The feed-color-dot inline style should use width >= 16px
 const dotMatch = liveSource.match(/feed-color-dot.*?width:(\d+)px/);
@@ -49,7 +50,7 @@ if (dotHeightMatch) {
 // --- Test 2: No contextmenu hijack on live feed ---
 console.log('\n=== No right-click hijack on live feed (#681) ===');
 
-const pickerSource = fs.readFileSync(path.join(__dirname, 'public/channel-color-picker.js'), 'utf8');
+const pickerSource = fs.readFileSync(path.join(REPO_ROOT, 'public/channel-color-picker.js'), 'utf8');
 
 // The picker should NOT install a contextmenu listener on the live feed
 // Look for the installLiveFeedHandlers function and check it doesn't add contextmenu
@@ -68,7 +69,7 @@ if (liveFeedHandlerMatch) {
 // --- Test 3: Channels page clear affordance ---
 console.log('\n=== Channels page clear affordance (#681) ===');
 
-const channelsSource = fs.readFileSync(path.join(__dirname, 'public/channels.js'), 'utf8');
+const channelsSource = fs.readFileSync(path.join(REPO_ROOT, 'public/channels.js'), 'utf8');
 
 // Channels page should render a clear button/icon next to colored dots
 // without requiring the picker to be opened
diff --git a/test-compare-flood-filter.js b/tests/unit/test-compare-flood-filter.js
similarity index 95%
rename from test-compare-flood-filter.js
rename to tests/unit/test-compare-flood-filter.js
index 387e4261..b9652d56 100644
--- a/test-compare-flood-filter.js
+++ b/tests/unit/test-compare-flood-filter.js
@@ -1,5 +1,6 @@
 /* Unit tests for compare.js flood/direct packet filter — #928 */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const assert = require('assert');
@@ -42,7 +43,7 @@ function makeSandbox() {
 
 const ctx = makeSandbox();
 const sandbox = vm.createContext(ctx);
-const compareSrc = fs.readFileSync(__dirname + '/public/compare.js', 'utf8');
+const compareSrc = fs.readFileSync(REPO_ROOT + '/public/compare.js', 'utf8');
 vm.runInContext(compareSrc, sandbox);
 
 // --- Tests ---
diff --git a/test-compare-overlap.js b/tests/unit/test-compare-overlap.js
similarity index 96%
rename from test-compare-overlap.js
rename to tests/unit/test-compare-overlap.js
index a15bee81..220b8cdc 100644
--- a/test-compare-overlap.js
+++ b/tests/unit/test-compare-overlap.js
@@ -1,5 +1,6 @@
 /* Unit tests for compare.js asymmetric overlap stats — Fixes #671 */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const assert = require('assert');
@@ -40,7 +41,7 @@ function makeSandbox() {
 
 const ctx = makeSandbox();
 const sandbox = vm.createContext(ctx);
-const compareSrc = fs.readFileSync(__dirname + '/public/compare.js', 'utf8');
+const compareSrc = fs.readFileSync(REPO_ROOT + '/public/compare.js', 'utf8');
 vm.runInContext(compareSrc, sandbox);
 
 console.log('\ncompare.js asymmetric overlap stats (#671):');
diff --git a/test-confidence-indicator.js b/tests/unit/test-confidence-indicator.js
similarity index 97%
rename from test-confidence-indicator.js
rename to tests/unit/test-confidence-indicator.js
index 89274f8b..ea70c61b 100644
--- a/test-confidence-indicator.js
+++ b/tests/unit/test-confidence-indicator.js
@@ -7,6 +7,7 @@
 // it against synthetic NeighborEntry-shaped inputs.
 
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const vm = require('vm');
 const assert = require('assert');
@@ -21,7 +22,7 @@ function test(name, fn) {
 // inner `function getConfidenceIndicator(entry) { ... }` — pull the body
 // via a balanced-brace scan and re-evaluate it standalone.
 function extractGetConfidenceIndicator() {
-  const src = fs.readFileSync(__dirname + '/public/nodes.js', 'utf8');
+  const src = fs.readFileSync(REPO_ROOT + '/public/nodes.js', 'utf8');
   const start = src.indexOf('function getConfidenceIndicator(');
   if (start < 0) throw new Error('getConfidenceIndicator not found in nodes.js');
   // Walk braces to find end.
diff --git a/test-coverage-gate.js b/tests/unit/test-coverage-gate.js
similarity index 95%
rename from test-coverage-gate.js
rename to tests/unit/test-coverage-gate.js
index ec96315c..7894f805 100644
--- a/test-coverage-gate.js
+++ b/tests/unit/test-coverage-gate.js
@@ -1,4 +1,5 @@
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 // Unit test for the client-RX coverage frontend gate (SP2).
 //
 // The coverage toggle (#nqCoverage) and its legend (#nqCovLegend) are built
@@ -12,7 +13,7 @@ const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
 
-const src = fs.readFileSync(path.join(__dirname, 'public', 'node-reach.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'node-reach.js'), 'utf8');
 
 // Slice the actions-HTML expression: from the '<div class="nq-actions ...' line
 // through the table that closes the block (ends with '</div></div>';).
diff --git a/test-customizer-v2.js b/tests/unit/test-customizer-v2.js
similarity index 100%
rename from test-customizer-v2.js
rename to tests/unit/test-customizer-v2.js
diff --git a/test-drag-manager.js b/tests/unit/test-drag-manager.js
similarity index 99%
rename from test-drag-manager.js
rename to tests/unit/test-drag-manager.js
index 67285129..109fed9d 100644
--- a/test-drag-manager.js
+++ b/tests/unit/test-drag-manager.js
@@ -1,5 +1,6 @@
 /* test-drag-manager.js — Unit tests for DragManager (#608 M1) */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -91,7 +92,7 @@ const mockLocalStorage = {
 };
 
 // Load DragManager
-const src = fs.readFileSync(path.join(__dirname, 'public', 'drag-manager.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'drag-manager.js'), 'utf8');
 const ctx = vm.createContext({
   window: mockWindow,
   document: mockDocument,
diff --git a/test-e2e-badge-aggregate.sh b/tests/unit/test-e2e-badge-aggregate.sh
similarity index 98%
rename from test-e2e-badge-aggregate.sh
rename to tests/unit/test-e2e-badge-aggregate.sh
index c274ddb9..f2be0dcd 100755
--- a/test-e2e-badge-aggregate.sh
+++ b/tests/unit/test-e2e-badge-aggregate.sh
@@ -5,7 +5,7 @@
 #
 # Regression for #1296.
 set -u
-script_dir=$(cd "$(dirname "$0")" && pwd)
+script_dir=$(cd "$(dirname "$0")/../.." && pwd)
 aggregator="$script_dir/scripts/aggregate-e2e-pass.sh"
 fixture="$script_dir/test-fixtures/e2e-output-sample.txt"
 
diff --git a/test-embed-mode-1369.js b/tests/unit/test-embed-mode-1369.js
similarity index 97%
rename from test-embed-mode-1369.js
rename to tests/unit/test-embed-mode-1369.js
index 480d5f13..2066ebd1 100644
--- a/test-embed-mode-1369.js
+++ b/tests/unit/test-embed-mode-1369.js
@@ -13,6 +13,7 @@
  *     ship the two surfaces operators asked for, no more).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const path = require('path');
@@ -26,7 +27,7 @@ function test(name, fn) {
 
 // Load app.js into a sandbox. We only need the helper, so we wrap with a
 // minimal browser shim that no-ops everything app.js touches at import time.
-const appSrc = fs.readFileSync(path.join(__dirname, 'public', 'app.js'), 'utf8');
+const appSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'app.js'), 'utf8');
 const ctx = {
   window: { addEventListener: () => {}, dispatchEvent: () => {}, matchMedia: () => ({ matches: false }) },
   document: {
diff --git a/test-fetch-all-nodes-pagination.js b/tests/unit/test-fetch-all-nodes-pagination.js
similarity index 100%
rename from test-fetch-all-nodes-pagination.js
rename to tests/unit/test-fetch-all-nodes-pagination.js
diff --git a/test-fluid-scaffolding.js b/tests/unit/test-fluid-scaffolding.js
similarity index 96%
rename from test-fluid-scaffolding.js
rename to tests/unit/test-fluid-scaffolding.js
index 04b2e77a..9b8eec15 100644
--- a/test-fluid-scaffolding.js
+++ b/tests/unit/test-fluid-scaffolding.js
@@ -3,12 +3,13 @@
  * via clamp() and that base selectors consume them instead of hardcoded px.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const css = fs.readFileSync(path.join(__dirname, 'public/style.css'), 'utf8');
+const css = fs.readFileSync(path.join(REPO_ROOT, 'public/style.css'), 'utf8');
 const rules = css.replace(/\/\*[\s\S]*?\*\//g, '');
 
 let passed = 0, failed = 0;
diff --git a/test-frontend-helpers.js b/tests/unit/test-frontend-helpers.js
similarity index 99%
rename from test-frontend-helpers.js
rename to tests/unit/test-frontend-helpers.js
index a0559c48..ad54cb4f 100644
--- a/test-frontend-helpers.js
+++ b/tests/unit/test-frontend-helpers.js
@@ -1,5 +1,6 @@
 /* Unit tests for frontend helper functions (tested via VM sandbox) */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const assert = require('assert');
@@ -6112,7 +6113,7 @@ console.log('\n=== analytics.js: renderCollisionsFromServer collision table ==='
 
   // Test 1: ROLE_COLORS.observer is defined and not empty
   test('ROLE_COLORS.observer is defined and not empty', () => {
-    const rolesJs = fs.readFileSync(__dirname + '/public/roles.js', 'utf8');
+    const rolesJs = fs.readFileSync(REPO_ROOT + '/public/roles.js', 'utf8');
     const ctx = makeSandbox();
     vm.runInNewContext(rolesJs, ctx);
     assert.ok(ctx.window.ROLE_COLORS.observer, 'ROLE_COLORS.observer should be defined');
@@ -6121,7 +6122,7 @@ console.log('\n=== analytics.js: renderCollisionsFromServer collision table ==='
 
   // Test 2: Observer checkbox exists in neighbor graph filter (unchecked by default)
   test('Observer checkbox exists in neighbor graph filter section', () => {
-    const analyticsJs = fs.readFileSync(__dirname + '/public/analytics.js', 'utf8');
+    const analyticsJs = fs.readFileSync(REPO_ROOT + '/public/analytics.js', 'utf8');
     // The observer checkbox is added with data-role="observer" and NO "checked" attribute
     assert.ok(analyticsJs.includes('data-role="observer"'), 'analytics.js should contain observer checkbox');
     // Verify it's NOT checked by default (no "checked" attribute on observer checkbox)
@@ -6132,7 +6133,7 @@ console.log('\n=== analytics.js: renderCollisionsFromServer collision table ==='
 
   // Test 3: Other role checkboxes ARE checked by default
   test('Non-observer role checkboxes are checked by default', () => {
-    const analyticsJs = fs.readFileSync(__dirname + '/public/analytics.js', 'utf8');
+    const analyticsJs = fs.readFileSync(REPO_ROOT + '/public/analytics.js', 'utf8');
     // The main role loop uses "checked" attribute
     const mainRoleCheckbox = analyticsJs.match(/data-role="\$\{r\}"[^>]*checked/);
     assert.ok(mainRoleCheckbox, 'Main role checkboxes should have checked attribute');
@@ -6140,13 +6141,13 @@ console.log('\n=== analytics.js: renderCollisionsFromServer collision table ==='
 
   // Test 4: --role-observer CSS variable exists in style.css
   test('--role-observer CSS variable exists in style.css', () => {
-    const css = fs.readFileSync(__dirname + '/public/style.css', 'utf8');
+    const css = fs.readFileSync(REPO_ROOT + '/public/style.css', 'utf8');
     assert.ok(css.includes('--role-observer:'), 'style.css should define --role-observer CSS variable');
   });
 
   // Test 5: Filter logic does NOT auto-include observer role
   test('Filter logic excludes observer nodes when checkbox unchecked', () => {
-    const analyticsJs = fs.readFileSync(__dirname + '/public/analytics.js', 'utf8');
+    const analyticsJs = fs.readFileSync(REPO_ROOT + '/public/analytics.js', 'utf8');
     // Old code had: return checkedRoles.has(role) || role === 'unknown' || role === 'observer';
     // New code: return checkedRoles.has(role) || role === 'unknown';
     // Verify observer is NOT given special pass-through treatment
@@ -6301,7 +6302,7 @@ console.log('\n=== analytics.js: renderCollisionsFromServer collision table ==='
   test('#852: no var(--muted) in public/ files (regression guard)', () => {
     const fs = require('fs');
     const path = require('path');
-    const pubDir = path.join(__dirname, 'public');
+    const pubDir = path.join(REPO_ROOT, 'public');
     const files = fs.readdirSync(pubDir).filter(f => f.endsWith('.js') || f.endsWith('.css'));
     files.forEach(f => {
       const content = fs.readFileSync(path.join(pubDir, f), 'utf8');
@@ -6495,7 +6496,7 @@ console.log('\n=== analytics.js: renderCollisionsFromServer collision table ==='
     sb.self = sb.window;
     sb.globalThis = sb.window;
     const ctx = vm.createContext(sb);
-    const hopSrc = fs.readFileSync(__dirname + '/public/hop-display.js', 'utf8');
+    const hopSrc = fs.readFileSync(REPO_ROOT + '/public/hop-display.js', 'utf8');
     vm.runInContext(hopSrc, ctx);
     return ctx;
   }
@@ -6598,7 +6599,7 @@ console.log('\n=== roles.js: Map Tile Config Parsing ===');
 {
   function makeRolesSandbox(cfg) {
     const ctx = makeSandbox();
-    const rolesJs = fs.readFileSync(__dirname + '/public/roles.js', 'utf8');
+    const rolesJs = fs.readFileSync(REPO_ROOT + '/public/roles.js', 'utf8');
     ctx.fetch = () => Promise.resolve({ json: () => Promise.resolve(cfg) });
     ctx.window.fetch = ctx.fetch;
     // Load it
@@ -6644,7 +6645,7 @@ console.log('\n=== roles.js: Map Tile Config Parsing ===');
   };
   sb.window.document = sb.document; sb.self = sb.window; sb.globalThis = sb.window;
   const ctx1504 = vm.createContext(sb);
-  vm.runInContext(fs.readFileSync(__dirname + '/public/hop-display.js', 'utf8'), ctx1504);
+  vm.runInContext(fs.readFileSync(REPO_ROOT + '/public/hop-display.js', 'utf8'), ctx1504);
   const HD = ctx1504.window.HopDisplay;
 
   test('#1504: HopDisplay.PATH_SYMBOLS_LEGEND is defined and non-empty array', () => {
@@ -6675,7 +6676,7 @@ console.log('\n=== roles.js: Map Tile Config Parsing ===');
   });
 
   test('#1504: packets.js places legend in a sibling wrapper (NOT inside any <th> with data-sort-key)', () => {
-    const src = fs.readFileSync(__dirname + '/public/packets.js', 'utf8');
+    const src = fs.readFileSync(REPO_ROOT + '/public/packets.js', 'utf8');
     assert.ok(src.includes('renderPathSymbolsLegend'),
       'packets.js must invoke HopDisplay.renderPathSymbolsLegend()');
     assert.ok(src.includes('path-symbols-legend-wrapper'),
@@ -6691,7 +6692,7 @@ console.log('\n=== roles.js: Map Tile Config Parsing ===');
   });
 
   test('#1504: nodes.js places legend in a sibling wrapper (NOT inside <h4>)', () => {
-    const src = fs.readFileSync(__dirname + '/public/nodes.js', 'utf8');
+    const src = fs.readFileSync(REPO_ROOT + '/public/nodes.js', 'utf8');
     assert.ok(src.includes('path-symbols-legend-wrapper'),
       'nodes.js must wrap the legend in .path-symbols-legend-wrapper (sibling, not inside <h4>)');
     src.split('\n').forEach((line, i) => {
@@ -6703,7 +6704,7 @@ console.log('\n=== roles.js: Map Tile Config Parsing ===');
   });
 
   test('#1504: style.css gives .path-symbols-legend position:relative so absolutely-positioned panel anchors correctly', () => {
-    const css = fs.readFileSync(__dirname + '/public/style.css', 'utf8');
+    const css = fs.readFileSync(REPO_ROOT + '/public/style.css', 'utf8');
     // Find the rule block for .path-symbols-legend (NOT .path-symbols-legend-wrapper)
     const m = css.match(/\.path-symbols-legend\s*\{[^}]*\}/);
     assert.ok(m, '.path-symbols-legend rule must exist');
@@ -6716,7 +6717,7 @@ console.log('\n=== roles.js: Map Tile Config Parsing ===');
   });
 
   test('#1504: legend glyphs match what hop-display.js actually renders (no documented-but-missing glyphs)', () => {
-    const hopSrc = fs.readFileSync(__dirname + '/public/hop-display.js', 'utf8');
+    const hopSrc = fs.readFileSync(REPO_ROOT + '/public/hop-display.js', 'utf8');
     HD.PATH_SYMBOLS_LEGEND.forEach(entry => {
       // #1648 M3: glyphs are now sprite HTML (glyphHtml); the legend uses
       // ph-warning sprite refs which appear inline in hop-display.js too.
@@ -6743,7 +6744,7 @@ console.log('\n=== roles.js: Map Tile Config Parsing ===');
     // Simulate the structural guarantee from the wrapper move: legend must not be a descendant of a sortable <th>.
     // table-sort.js binds click on th[data-sort-key]; with the legend in a sibling div, no click on summary
     // can bubble to a sortable th.
-    const pktSrc = fs.readFileSync(__dirname + '/public/packets.js', 'utf8');
+    const pktSrc = fs.readFileSync(REPO_ROOT + '/public/packets.js', 'utf8');
     // Extract the snippet around the table head and confirm the legend is OUTSIDE <thead>...</thead>
     const theadIdx = pktSrc.indexOf('<thead>');
     const theadEnd = pktSrc.indexOf('</thead>', theadIdx);
@@ -6928,7 +6929,7 @@ console.log('\n=== roles.js: hashPrefixInfo ===');
 // ===== map.js: no bare `hash_size || 1` =====
 console.log('\n=== map.js: hash size fallback ===');
 {
-  const mapSrc = fs.readFileSync(__dirname + '/public/map.js', 'utf8');
+  const mapSrc = fs.readFileSync(REPO_ROOT + '/public/map.js', 'utf8');
 
   test('map.js does not default an unknown hash_size to 1', () => {
     assert.ok(!/hash_size\s*\|\|\s*1/.test(mapSrc),
diff --git a/test-geofilter-draft.js b/tests/unit/test-geofilter-draft.js
similarity index 96%
rename from test-geofilter-draft.js
rename to tests/unit/test-geofilter-draft.js
index 6d7c491a..4b7641c3 100644
--- a/test-geofilter-draft.js
+++ b/tests/unit/test-geofilter-draft.js
@@ -1,5 +1,6 @@
 /* Unit tests for geofilter-builder draft save/load + download config */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const assert = require('assert');
 
 let passed = 0, failed = 0;
@@ -46,7 +47,7 @@ const vm = require('vm');
 const path = require('path');
 
 function loadModule(localStorage, document) {
-  const code = fs.readFileSync(path.join(__dirname, 'public', 'geofilter-draft.js'), 'utf8');
+  const code = fs.readFileSync(path.join(REPO_ROOT, 'public', 'geofilter-draft.js'), 'utf8');
   const sandbox = { localStorage, document, window: {}, URL: { createObjectURL() { return 'blob:mock'; }, revokeObjectURL() {} }, Blob: class { constructor(parts, opts) { this.parts = parts; this.opts = opts; } } };
   vm.runInNewContext(code, sandbox);
   sandbox.GeofilterDraft = sandbox.window.GeofilterDraft;
diff --git a/test-hash-color.js b/tests/unit/test-hash-color.js
similarity index 98%
rename from test-hash-color.js
rename to tests/unit/test-hash-color.js
index fbba2992..8b122c4f 100644
--- a/test-hash-color.js
+++ b/tests/unit/test-hash-color.js
@@ -3,11 +3,12 @@
  *        outline darker than fill, sentinel, perceptual distance
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const path = require('path');
 
-const src = fs.readFileSync(path.join(__dirname, 'public', 'hash-color.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'hash-color.js'), 'utf8');
 
 function createSandbox() {
   const sandbox = { window: {}, module: {} };
diff --git a/test-hop-resolver-affinity.js b/tests/unit/test-hop-resolver-affinity.js
similarity index 98%
rename from test-hop-resolver-affinity.js
rename to tests/unit/test-hop-resolver-affinity.js
index 14dfe51a..353cf736 100644
--- a/test-hop-resolver-affinity.js
+++ b/tests/unit/test-hop-resolver-affinity.js
@@ -2,11 +2,12 @@
  * Unit tests for HopResolver affinity-aware hop resolution.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const vm = require('vm');
 
 // Load hop-resolver.js in a sandboxed context
-const code = fs.readFileSync(__dirname + '/public/hop-resolver.js', 'utf8');
+const code = fs.readFileSync(REPO_ROOT + '/public/hop-resolver.js', 'utf8');
 const sandbox = { window: {}, console, Math, Object, Array, Number, Date, Map, Set, parseInt, parseFloat, encodeURIComponent };
 vm.createContext(sandbox);
 vm.runInContext(code, sandbox);
diff --git a/test-issue-1065-gesture-hints-gates.js b/tests/unit/test-issue-1065-gesture-hints-gates.js
similarity index 94%
rename from test-issue-1065-gesture-hints-gates.js
rename to tests/unit/test-issue-1065-gesture-hints-gates.js
index f18976eb..621d5171 100644
--- a/test-issue-1065-gesture-hints-gates.js
+++ b/tests/unit/test-issue-1065-gesture-hints-gates.js
@@ -12,12 +12,13 @@
  * Pure source-file assertions — no browser required.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 
-const JS_PATH = path.join(__dirname, 'public', 'gesture-hints.js');
-const CSS_PATH = path.join(__dirname, 'public', 'style.css');
+const JS_PATH = path.join(REPO_ROOT, 'public', 'gesture-hints.js');
+const CSS_PATH = path.join(REPO_ROOT, 'public', 'style.css');
 
 let failures = 0, passes = 0;
 const fail = (m) => { failures++; console.error('  FAIL: ' + m); };
diff --git a/test-issue-1107-live-layout.js b/tests/unit/test-issue-1107-live-layout.js
similarity index 98%
rename from test-issue-1107-live-layout.js
rename to tests/unit/test-issue-1107-live-layout.js
index 0e5a682a..fb8c99ee 100644
--- a/test-issue-1107-live-layout.js
+++ b/tests/unit/test-issue-1107-live-layout.js
@@ -15,6 +15,7 @@
  * test-issue-1532-live-fullscreen.js (runs in the JS unit test gate).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -25,7 +26,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  \u2717 ' + msg); }
 }
 
-const liveCss = fs.readFileSync(path.join(__dirname, 'public', 'live.css'), 'utf8');
+const liveCss = fs.readFileSync(path.join(REPO_ROOT, 'public', 'live.css'), 'utf8');
 
 // Extract the .live-legend base block (first occurrence, not the media
 // queries, not the .matrix-theme override, not .live-legend.hidden).
diff --git a/test-issue-1136-observer-iata-map.js b/tests/unit/test-issue-1136-observer-iata-map.js
similarity index 100%
rename from test-issue-1136-observer-iata-map.js
rename to tests/unit/test-issue-1136-observer-iata-map.js
diff --git a/test-issue-1166-first-seen-column.js b/tests/unit/test-issue-1166-first-seen-column.js
similarity index 95%
rename from test-issue-1166-first-seen-column.js
rename to tests/unit/test-issue-1166-first-seen-column.js
index 067f4d93..104afb71 100644
--- a/test-issue-1166-first-seen-column.js
+++ b/tests/unit/test-issue-1166-first-seen-column.js
@@ -5,6 +5,7 @@
  * semantics).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const assert = require('assert');
@@ -18,7 +19,7 @@ function test(name, fn) {
 console.log('\n=== issue #1166: First Seen column ===');
 
 // --- 1. Source-level assertions on public/nodes.js ---
-const src = fs.readFileSync(__dirname + '/public/nodes.js', 'utf8');
+const src = fs.readFileSync(REPO_ROOT + '/public/nodes.js', 'utf8');
 
 test('nodes table header includes a "First Seen" column', () => {
   // Match a <th> with text "First Seen" (case-insensitive)
@@ -99,9 +100,9 @@ function loadInCtx(ctx, file) {
 }
 
 const ctx = makeSandbox();
-loadInCtx(ctx, __dirname + '/public/roles.js');
-loadInCtx(ctx, __dirname + '/public/app.js');
-loadInCtx(ctx, __dirname + '/public/nodes.js');
+loadInCtx(ctx, REPO_ROOT + '/public/roles.js');
+loadInCtx(ctx, REPO_ROOT + '/public/app.js');
+loadInCtx(ctx, REPO_ROOT + '/public/nodes.js');
 
 const sortNodes = ctx.window._nodesSortNodes;
 const setState = ctx.window._nodesSetSortState;
diff --git a/test-issue-1189-composed-cell.js b/tests/unit/test-issue-1189-composed-cell.js
similarity index 97%
rename from test-issue-1189-composed-cell.js
rename to tests/unit/test-issue-1189-composed-cell.js
index ffb6a566..9970bef3 100644
--- a/test-issue-1189-composed-cell.js
+++ b/tests/unit/test-issue-1189-composed-cell.js
@@ -16,6 +16,7 @@
  * fix → this test must turn red.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
@@ -26,7 +27,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  \u274c ' + msg); }
 }
 
-const src = fs.readFileSync(path.join(__dirname, 'public/packets.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public/packets.js'), 'utf8');
 
 // ── Extract the composed col-observer cell expression. ──────────────────
 // The cell is built inline in buildGroupRowHtml's template literal:
diff --git a/test-issue-1189-live-iata-badge.js b/tests/unit/test-issue-1189-live-iata-badge.js
similarity index 97%
rename from test-issue-1189-live-iata-badge.js
rename to tests/unit/test-issue-1189-live-iata-badge.js
index 91445402..4cc7ac30 100644
--- a/test-issue-1189-live-iata-badge.js
+++ b/tests/unit/test-issue-1189-live-iata-badge.js
@@ -13,6 +13,7 @@
  * emit ${iataBadge} — protects against partial-fix regressions.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
@@ -23,7 +24,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  \u274c ' + msg); }
 }
 
-const src = fs.readFileSync(path.join(__dirname, 'public/live.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public/live.js'), 'utf8');
 
 // ── Extract obsIataBadgeHtml(pkt) ─────────────────────────────────────────
 function extractFn(name) {
diff --git a/test-issue-1279-p2-code-filter.js b/tests/unit/test-issue-1279-p2-code-filter.js
similarity index 100%
rename from test-issue-1279-p2-code-filter.js
rename to tests/unit/test-issue-1279-p2-code-filter.js
diff --git a/test-issue-1293-marker-shapes.js b/tests/unit/test-issue-1293-marker-shapes.js
similarity index 95%
rename from test-issue-1293-marker-shapes.js
rename to tests/unit/test-issue-1293-marker-shapes.js
index 8f2b61af..10b36bcb 100644
--- a/test-issue-1293-marker-shapes.js
+++ b/tests/unit/test-issue-1293-marker-shapes.js
@@ -21,6 +21,7 @@
  * in the JS-unit-tests step of the CI workflow (fast red).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -31,9 +32,9 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const rolesSrc = fs.readFileSync(path.join(__dirname, 'public', 'roles.js'), 'utf8');
-const liveSrc  = fs.readFileSync(path.join(__dirname, 'public', 'live.js'),  'utf8');
-const mapSrc   = fs.readFileSync(path.join(__dirname, 'public', 'map.js'),   'utf8');
+const rolesSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'roles.js'), 'utf8');
+const liveSrc  = fs.readFileSync(path.join(REPO_ROOT, 'public', 'live.js'),  'utf8');
+const mapSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public', 'map.js'),   'utf8');
 
 console.log('\n=== #1293: ROLE_SHAPES single source of truth ===');
 
diff --git a/test-issue-1356-map-a11y.js b/tests/unit/test-issue-1356-map-a11y.js
similarity index 98%
rename from test-issue-1356-map-a11y.js
rename to tests/unit/test-issue-1356-map-a11y.js
index d8a28b32..22cf4bac 100644
--- a/test-issue-1356-map-a11y.js
+++ b/tests/unit/test-issue-1356-map-a11y.js
@@ -14,6 +14,7 @@
  * so this runs in the JS-unit-tests CI step without a browser.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -24,8 +25,8 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const mapSrc   = fs.readFileSync(path.join(__dirname, 'public', 'map.js'),   'utf8');
-const cssSrc   = fs.readFileSync(path.join(__dirname, 'public', 'style.css'), 'utf8');
+const mapSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public', 'map.js'),   'utf8');
+const cssSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public', 'style.css'), 'utf8');
 
 // ── Load map.js in a DOM-less sandbox so the label assertions can call the
 // real makeRepeaterLabelIcon and look at what it renders.
@@ -88,7 +89,7 @@ function loadMapInternals() {
   ctx.window.L = ctx.L;
   vm.createContext(ctx);
   for (const f of ['public/roles.js', 'public/map.js']) {
-    vm.runInContext(fs.readFileSync(path.join(__dirname, f), 'utf8'), ctx, { filename: f });
+    vm.runInContext(fs.readFileSync(path.join(REPO_ROOT, f), 'utf8'), ctx, { filename: f });
     for (const k of Object.keys(ctx.window)) ctx[k] = ctx.window[k];
   }
   return ctx.window.__meshcoreMapInternals;
diff --git a/test-issue-1360-pill-letter-count.js b/tests/unit/test-issue-1360-pill-letter-count.js
similarity index 95%
rename from test-issue-1360-pill-letter-count.js
rename to tests/unit/test-issue-1360-pill-letter-count.js
index a6e4c5e9..c911c206 100644
--- a/test-issue-1360-pill-letter-count.js
+++ b/tests/unit/test-issue-1360-pill-letter-count.js
@@ -7,6 +7,7 @@
  * Pure-string assertions over public/map.js (mirrors #1356 test pattern).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -17,7 +18,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const mapSrc = fs.readFileSync(path.join(__dirname, 'public', 'map.js'), 'utf8');
+const mapSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'map.js'), 'utf8');
 
 console.log('\n=== #1360: pill body emits letter + count (not letter alone) ===');
 
@@ -74,7 +75,7 @@ assert(jsCapRe.test(mapSrc),
 
 // G. CSS guard: .mc-pill rule must include max-width AND text-overflow:ellipsis
 //    as defense-in-depth in case a render slips past the JS cap.
-const cssSrc = fs.readFileSync(path.join(__dirname, 'public', 'style.css'), 'utf8');
+const cssSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'style.css'), 'utf8');
 const pillRuleRe = /\.mc-cluster\s+\.mc-pill\s*\{([\s\S]*?)\}/;
 const pillMatch = cssSrc.match(pillRuleRe);
 assert(pillMatch, '.mc-cluster .mc-pill rule found in style.css');
diff --git a/test-issue-1361-cb-presets.js b/tests/unit/test-issue-1361-cb-presets.js
similarity index 96%
rename from test-issue-1361-cb-presets.js
rename to tests/unit/test-issue-1361-cb-presets.js
index f9e5cb17..6ca5f077 100644
--- a/test-issue-1361-cb-presets.js
+++ b/tests/unit/test-issue-1361-cb-presets.js
@@ -18,6 +18,7 @@
  * are explicitly DEFERRED and intentionally NOT asserted here.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -29,11 +30,11 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const presetsPath = path.join(__dirname, 'public', 'cb-presets.js');
-const styleSrc    = fs.readFileSync(path.join(__dirname, 'public', 'style.css'), 'utf8');
-const customSrc   = fs.readFileSync(path.join(__dirname, 'public', 'customize-v2.js'), 'utf8');
-const appSrc      = fs.readFileSync(path.join(__dirname, 'public', 'app.js'), 'utf8');
-const indexSrc    = fs.readFileSync(path.join(__dirname, 'public', 'index.html'), 'utf8');
+const presetsPath = path.join(REPO_ROOT, 'public', 'cb-presets.js');
+const styleSrc    = fs.readFileSync(path.join(REPO_ROOT, 'public', 'style.css'), 'utf8');
+const customSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public', 'customize-v2.js'), 'utf8');
+const appSrc      = fs.readFileSync(path.join(REPO_ROOT, 'public', 'app.js'), 'utf8');
+const indexSrc    = fs.readFileSync(path.join(REPO_ROOT, 'public', 'index.html'), 'utf8');
 
 console.log('\n=== #1361 A: cb-presets.js module exists and is loadable ===');
 assert(fs.existsSync(presetsPath), 'public/cb-presets.js exists');
diff --git a/test-issue-1364-pill-no-clamp.js b/tests/unit/test-issue-1364-pill-no-clamp.js
similarity index 93%
rename from test-issue-1364-pill-no-clamp.js
rename to tests/unit/test-issue-1364-pill-no-clamp.js
index 634b1512..d5a02801 100644
--- a/test-issue-1364-pill-no-clamp.js
+++ b/tests/unit/test-issue-1364-pill-no-clamp.js
@@ -11,6 +11,7 @@
  * `text-overflow:ellipsis` as graceful-degrade if JS ever fails.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -21,7 +22,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const cssSrc = fs.readFileSync(path.join(__dirname, 'public', 'style.css'), 'utf8');
+const cssSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'style.css'), 'utf8');
 const pillRuleRe = /\.mc-cluster\s+\.mc-pill\s*\{([\s\S]*?)\}/;
 const pillMatch = cssSrc.match(pillRuleRe);
 
diff --git a/test-issue-1375-scope-stats-fetch.js b/tests/unit/test-issue-1375-scope-stats-fetch.js
similarity index 93%
rename from test-issue-1375-scope-stats-fetch.js
rename to tests/unit/test-issue-1375-scope-stats-fetch.js
index a68b46a4..ae95e39f 100644
--- a/test-issue-1375-scope-stats-fetch.js
+++ b/tests/unit/test-issue-1375-scope-stats-fetch.js
@@ -14,6 +14,7 @@
  * branch never merged, so the bug resurfaced in subsequent rebases.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -25,7 +26,7 @@ function assert(cond, msg) {
 }
 
 const src = fs.readFileSync(
-  path.join(__dirname, 'public', 'analytics.js'), 'utf8');
+  path.join(REPO_ROOT, 'public', 'analytics.js'), 'utf8');
 
 console.log('\n=== #1375: Scopes tab scope-stats fetch path ===');
 
diff --git a/test-issue-1380-cb-reset-button.js b/tests/unit/test-issue-1380-cb-reset-button.js
similarity index 96%
rename from test-issue-1380-cb-reset-button.js
rename to tests/unit/test-issue-1380-cb-reset-button.js
index 4b66bfb3..b6edc375 100644
--- a/test-issue-1380-cb-reset-button.js
+++ b/tests/unit/test-issue-1380-cb-reset-button.js
@@ -9,6 +9,7 @@
  * Pure-string + vm.createContext assertions, mirrors test-issue-1361.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs   = require('fs');
 const path = require('path');
@@ -20,8 +21,8 @@ function assert(cond, msg) {
   else      { failed++; console.error('  \u2717 ' + msg); }
 }
 
-const customSrc  = fs.readFileSync(path.join(__dirname, 'public', 'customize-v2.js'), 'utf8');
-const presetsSrc = fs.readFileSync(path.join(__dirname, 'public', 'cb-presets.js'), 'utf8');
+const customSrc  = fs.readFileSync(path.join(REPO_ROOT, 'public', 'customize-v2.js'), 'utf8');
+const presetsSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'cb-presets.js'), 'utf8');
 
 console.log('\n=== #1380 Reset A: customize-v2.js renders a Reset-to-Wong button ===');
 assert(/data-cv2-cb-reset/.test(customSrc),
diff --git a/test-issue-1380-cb-sim-overlay.js b/tests/unit/test-issue-1380-cb-sim-overlay.js
similarity index 96%
rename from test-issue-1380-cb-sim-overlay.js
rename to tests/unit/test-issue-1380-cb-sim-overlay.js
index 8b024f39..5dea9b62 100644
--- a/test-issue-1380-cb-sim-overlay.js
+++ b/tests/unit/test-issue-1380-cb-sim-overlay.js
@@ -15,6 +15,7 @@
  * Persistence is intentionally NOT asserted (preview-only per spec).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs   = require('fs');
 const path = require('path');
@@ -26,9 +27,9 @@ function assert(cond, msg) {
   else      { failed++; console.error('  \u2717 ' + msg); }
 }
 
-const indexSrc  = fs.readFileSync(path.join(__dirname, 'public', 'index.html'), 'utf8');
-const customSrc = fs.readFileSync(path.join(__dirname, 'public', 'customize-v2.js'), 'utf8');
-const labelsSrc = fs.readFileSync(path.join(__dirname, 'public', 'payload-labels.js'), 'utf8');
+const indexSrc  = fs.readFileSync(path.join(REPO_ROOT, 'public', 'index.html'), 'utf8');
+const customSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'customize-v2.js'), 'utf8');
+const labelsSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'payload-labels.js'), 'utf8');
 
 console.log('\n=== #1380 A: index.html has inline SVG filters for the 4 sim classes ===');
 ['cb-deut', 'cb-prot', 'cb-trit', 'cb-achromat'].forEach(function (id) {
diff --git a/test-issue-1407-cb-preset-propagation.js b/tests/unit/test-issue-1407-cb-preset-propagation.js
similarity index 96%
rename from test-issue-1407-cb-preset-propagation.js
rename to tests/unit/test-issue-1407-cb-preset-propagation.js
index 28a30ce7..d4ddfbe4 100644
--- a/test-issue-1407-cb-preset-propagation.js
+++ b/tests/unit/test-issue-1407-cb-preset-propagation.js
@@ -16,6 +16,7 @@
  * without a browser. Mirrors test-issue-1361-cb-presets.js sandbox shape.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -27,10 +28,10 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const rolesSrc   = fs.readFileSync(path.join(__dirname, 'public', 'roles.js'), 'utf8');
-const presetsSrc = fs.readFileSync(path.join(__dirname, 'public', 'cb-presets.js'), 'utf8');
-const styleSrc   = fs.readFileSync(path.join(__dirname, 'public', 'style.css'), 'utf8');
-const mapSrc     = fs.readFileSync(path.join(__dirname, 'public', 'map.js'), 'utf8');
+const rolesSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public', 'roles.js'), 'utf8');
+const presetsSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'cb-presets.js'), 'utf8');
+const styleSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public', 'style.css'), 'utf8');
+const mapSrc     = fs.readFileSync(path.join(REPO_ROOT, 'public', 'map.js'), 'utf8');
 
 // ─── WCAG helpers (independent of cb-presets, so we validate the impl) ───
 function hexToRgb(hex) {
diff --git a/test-issue-1409-no-encrypted-flood.js b/tests/unit/test-issue-1409-no-encrypted-flood.js
similarity index 94%
rename from test-issue-1409-no-encrypted-flood.js
rename to tests/unit/test-issue-1409-no-encrypted-flood.js
index 73bb4851..56635384 100644
--- a/test-issue-1409-no-encrypted-flood.js
+++ b/tests/unit/test-issue-1409-no-encrypted-flood.js
@@ -11,6 +11,7 @@
  * user-toggle handler that writes BOTH 'true' and 'false' under a condition.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
@@ -21,7 +22,7 @@ function test(name, fn) {
   catch (e) { failed++; console.log('  \u274c ' + name + ': ' + e.message); }
 }
 
-const src = fs.readFileSync(path.join(__dirname, 'public/channels.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public/channels.js'), 'utf8');
 
 console.log('Issue #1409 — no force-enable of channels-show-encrypted');
 
diff --git a/test-issue-1412-customizer-no-override.js b/tests/unit/test-issue-1412-customizer-no-override.js
similarity index 96%
rename from test-issue-1412-customizer-no-override.js
rename to tests/unit/test-issue-1412-customizer-no-override.js
index 399fe02e..acae6d6f 100644
--- a/test-issue-1412-customizer-no-override.js
+++ b/tests/unit/test-issue-1412-customizer-no-override.js
@@ -24,6 +24,7 @@
  * write to customize-v2.js makes the first test fail.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -35,9 +36,9 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const rolesSrc   = fs.readFileSync(path.join(__dirname, 'public', 'roles.js'), 'utf8');
-const presetsSrc = fs.readFileSync(path.join(__dirname, 'public', 'cb-presets.js'), 'utf8');
-const cv2Src     = fs.readFileSync(path.join(__dirname, 'public', 'customize-v2.js'), 'utf8');
+const rolesSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public', 'roles.js'), 'utf8');
+const presetsSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'cb-presets.js'), 'utf8');
+const cv2Src     = fs.readFileSync(path.join(REPO_ROOT, 'public', 'customize-v2.js'), 'utf8');
 
 // Browser-ish sandbox (CSS var setProperty/getPropertyValue).
 function makeSandbox() {
@@ -199,7 +200,7 @@ console.log('\n=== #1412 D: customize.js per-key node-color picker uses setRoleC
   // ROLE_COLORS directly. The proxy-on-read trick in roles.js handles direct
   // assignment, but going through the explicit API keeps semantics obvious
   // and lets us delete the proxy layer later.
-  const customizeSrc = fs.readFileSync(path.join(__dirname, 'public', 'customize.js'), 'utf8');
+  const customizeSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'customize.js'), 'utf8');
 
   // Grep for the two affected handlers (data-node input handler + reset).
   // Locate the input[data-node] handler — slice forward through the inner forEach callback.
diff --git a/test-issue-1415-packets-layout.js b/tests/unit/test-issue-1415-packets-layout.js
similarity index 97%
rename from test-issue-1415-packets-layout.js
rename to tests/unit/test-issue-1415-packets-layout.js
index 2cc6abff..52e43218 100644
--- a/test-issue-1415-packets-layout.js
+++ b/tests/unit/test-issue-1415-packets-layout.js
@@ -24,6 +24,7 @@
  * fails. Cheap to run, deterministic, runs in CI without browser deps.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const path = require('path');
 
@@ -33,8 +34,8 @@ function assert(cond, msg) {
   else { failed++; console.error('  \u274c ' + msg); }
 }
 
-const pktJs = fs.readFileSync(path.join(__dirname, 'public/packets.js'), 'utf8');
-const css = fs.readFileSync(path.join(__dirname, 'public/style.css'), 'utf8');
+const pktJs = fs.readFileSync(path.join(REPO_ROOT, 'public/packets.js'), 'utf8');
+const css = fs.readFileSync(path.join(REPO_ROOT, 'public/style.css'), 'utf8');
 
 // ── 1. col-expand class + CSS pin ────────────────────────────────────────
 assert(
diff --git a/test-issue-1418-cb-preset-ramp.js b/tests/unit/test-issue-1418-cb-preset-ramp.js
similarity index 96%
rename from test-issue-1418-cb-preset-ramp.js
rename to tests/unit/test-issue-1418-cb-preset-ramp.js
index 6fe38704..ea3583d8 100644
--- a/test-issue-1418-cb-preset-ramp.js
+++ b/tests/unit/test-issue-1418-cb-preset-ramp.js
@@ -11,6 +11,7 @@
  * Pattern mirrors test-issue-1407-cb-preset-propagation.js sandbox shape.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -22,9 +23,9 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const rolesSrc   = fs.readFileSync(path.join(__dirname, 'public', 'roles.js'), 'utf8');
-const presetsSrc = fs.readFileSync(path.join(__dirname, 'public', 'cb-presets.js'), 'utf8');
-const routeSrc   = fs.readFileSync(path.join(__dirname, 'public', 'route-view.js'), 'utf8');
+const rolesSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public', 'roles.js'), 'utf8');
+const presetsSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'cb-presets.js'), 'utf8');
+const routeSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public', 'route-view.js'), 'utf8');
 
 console.log('\n=== #1418 ramp A: route-view reads --mc-rt-ramp-* CSS vars ===');
 assert(/--mc-rt-ramp-/.test(routeSrc),
diff --git a/test-issue-1418-deeplink-hops-channels.js b/tests/unit/test-issue-1418-deeplink-hops-channels.js
similarity index 98%
rename from test-issue-1418-deeplink-hops-channels.js
rename to tests/unit/test-issue-1418-deeplink-hops-channels.js
index a921d3ab..793a404f 100644
--- a/test-issue-1418-deeplink-hops-channels.js
+++ b/tests/unit/test-issue-1418-deeplink-hops-channels.js
@@ -13,6 +13,7 @@
  *      reproduced via node's built-in crypto.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -24,7 +25,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const mapSrc = fs.readFileSync(path.join(__dirname, 'public', 'map.js'), 'utf8');
+const mapSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'map.js'), 'utf8');
 
 console.log('\n=== #1418 hop-priority A: source invariants (3-tier priority) ===');
 // Priority comment is documented; assert the structural keywords are in order.
diff --git a/test-issue-1418-edge-weights.js b/tests/unit/test-issue-1418-edge-weights.js
similarity index 97%
rename from test-issue-1418-edge-weights.js
rename to tests/unit/test-issue-1418-edge-weights.js
index fc65089b..b420a2c2 100644
--- a/test-issue-1418-edge-weights.js
+++ b/tests/unit/test-issue-1418-edge-weights.js
@@ -17,6 +17,7 @@
  * function — if route-view.js drifts, the test breaks.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -28,7 +29,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const src = fs.readFileSync(path.join(__dirname, 'public', 'route-view.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'route-view.js'), 'utf8');
 
 console.log('\n=== #1418 edgeWeight A: source invariants ===');
 assert(/function\s+edgeWeight\s*\(\s*idx\s*\)/.test(src),
diff --git a/test-issue-1418-polish-review.js b/tests/unit/test-issue-1418-polish-review.js
similarity index 96%
rename from test-issue-1418-polish-review.js
rename to tests/unit/test-issue-1418-polish-review.js
index f8daf32f..dbd5d5b1 100644
--- a/test-issue-1418-polish-review.js
+++ b/tests/unit/test-issue-1418-polish-review.js
@@ -15,6 +15,7 @@
  *   - innerHTML row re-wire factored (dijkstra) — wireRow helper
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -25,8 +26,8 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const rvSrc = fs.readFileSync(path.join(__dirname, 'public', 'route-view.js'), 'utf8');
-const mapSrc = fs.readFileSync(path.join(__dirname, 'public', 'map.js'), 'utf8');
+const rvSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'route-view.js'), 'utf8');
+const mapSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'map.js'), 'utf8');
 
 console.log('\n=== A. resize listener leak fix (carmack/munger) ===');
 // Single resize listener attached via window.__mc_routeResizeRefit stash,
diff --git a/test-issue-1418-raw-hex-extraction.js b/tests/unit/test-issue-1418-raw-hex-extraction.js
similarity index 98%
rename from test-issue-1418-raw-hex-extraction.js
rename to tests/unit/test-issue-1418-raw-hex-extraction.js
index 831e6f98..88e24a6a 100644
--- a/test-issue-1418-raw-hex-extraction.js
+++ b/tests/unit/test-issue-1418-raw-hex-extraction.js
@@ -20,6 +20,7 @@
  * that drops the extraction is caught.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -30,7 +31,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const mapSrc = fs.readFileSync(path.join(__dirname, 'public', 'map.js'), 'utf8');
+const mapSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'map.js'), 'utf8');
 
 console.log('\n=== #1418 raw_hex A: source invariants in map.js ===');
 assert(/TYPES_WITH_DST_SRC\s*=\s*\[\s*1\s*,\s*2\s*,\s*7\s*,\s*8\s*\]/.test(mapSrc),
diff --git a/test-issue-1418-spider-fan.js b/tests/unit/test-issue-1418-spider-fan.js
similarity index 98%
rename from test-issue-1418-spider-fan.js
rename to tests/unit/test-issue-1418-spider-fan.js
index 4e2dd8f9..cbcb1bc7 100644
--- a/test-issue-1418-spider-fan.js
+++ b/tests/unit/test-issue-1418-spider-fan.js
@@ -17,6 +17,7 @@
  * specific SVG markup.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -28,7 +29,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const src = fs.readFileSync(path.join(__dirname, 'public', 'route-view.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'route-view.js'), 'utf8');
 
 console.log('\n=== #1418 spider A: source invariants ===');
 assert(/COLLISION_THRESHOLD\s*=\s*14/.test(src),
diff --git a/test-issue-1420-tile-providers.js b/tests/unit/test-issue-1420-tile-providers.js
similarity index 99%
rename from test-issue-1420-tile-providers.js
rename to tests/unit/test-issue-1420-tile-providers.js
index 5c9c4854..f0592480 100644
--- a/test-issue-1420-tile-providers.js
+++ b/tests/unit/test-issue-1420-tile-providers.js
@@ -8,6 +8,7 @@
  * No jsdom or Playwright dependency — pure vm sandbox.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm   = require('vm');
 const fs   = require('fs');
 const path = require('path');
@@ -72,7 +73,7 @@ function makeSandbox(opts) {
 function loadProviders(ctx, mapCfg) {
   // Optionally pre-populate MC_MAP_CFG before the IIFE runs
   if (mapCfg !== undefined) ctx.window.MC_MAP_CFG = mapCfg;
-  const src = fs.readFileSync(path.join(__dirname, 'public', 'map-tile-providers.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'map-tile-providers.js'), 'utf8');
   vm.runInContext(src, ctx);
 }
 
diff --git a/test-issue-1438-customizer-mcrole.js b/tests/unit/test-issue-1438-customizer-mcrole.js
similarity index 96%
rename from test-issue-1438-customizer-mcrole.js
rename to tests/unit/test-issue-1438-customizer-mcrole.js
index ff8989b3..93546557 100644
--- a/test-issue-1438-customizer-mcrole.js
+++ b/tests/unit/test-issue-1438-customizer-mcrole.js
@@ -26,6 +26,7 @@
  * fix in customize-v2.js breaks it.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -37,10 +38,10 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const cv2Src     = fs.readFileSync(path.join(__dirname, 'public', 'customize-v2.js'), 'utf8');
-const rolesSrc   = fs.readFileSync(path.join(__dirname, 'public', 'roles.js'), 'utf8');
-const presetsSrc = fs.readFileSync(path.join(__dirname, 'public', 'cb-presets.js'), 'utf8');
-const styleSrc   = fs.readFileSync(path.join(__dirname, 'public', 'style.css'), 'utf8');
+const cv2Src     = fs.readFileSync(path.join(REPO_ROOT, 'public', 'customize-v2.js'), 'utf8');
+const rolesSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public', 'roles.js'), 'utf8');
+const presetsSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'cb-presets.js'), 'utf8');
+const styleSrc   = fs.readFileSync(path.join(REPO_ROOT, 'public', 'style.css'), 'utf8');
 
 // ─── Extract the nodeColors-processing block from customize-v2.js. ───
 function extractBlock(src, anchor) {
diff --git a/test-issue-1438-marker-css-vars.js b/tests/unit/test-issue-1438-marker-css-vars.js
similarity index 95%
rename from test-issue-1438-marker-css-vars.js
rename to tests/unit/test-issue-1438-marker-css-vars.js
index c08905f0..b2ef94ca 100644
--- a/test-issue-1438-marker-css-vars.js
+++ b/tests/unit/test-issue-1438-marker-css-vars.js
@@ -23,6 +23,7 @@
  * This test is the RED gate: assert the source pattern is the var form.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -33,10 +34,10 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const liveSrc      = fs.readFileSync(path.join(__dirname, 'public', 'live.js'),      'utf8');
-const mapSrc       = fs.readFileSync(path.join(__dirname, 'public', 'map.js'),       'utf8');
-const rolesSrc     = fs.readFileSync(path.join(__dirname, 'public', 'roles.js'),     'utf8');
-const customizeSrc = fs.readFileSync(path.join(__dirname, 'public', 'customize.js'), 'utf8');
+const liveSrc      = fs.readFileSync(path.join(REPO_ROOT, 'public', 'live.js'),      'utf8');
+const mapSrc       = fs.readFileSync(path.join(REPO_ROOT, 'public', 'map.js'),       'utf8');
+const rolesSrc     = fs.readFileSync(path.join(REPO_ROOT, 'public', 'roles.js'),     'utf8');
+const customizeSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'customize.js'), 'utf8');
 
 console.log('\n=== #1438 A: roles.js makeRoleMarkerSVG uses CSS-var fill ===');
 {
diff --git a/test-issue-1446-cb-preset-cascade.js b/tests/unit/test-issue-1446-cb-preset-cascade.js
similarity index 99%
rename from test-issue-1446-cb-preset-cascade.js
rename to tests/unit/test-issue-1446-cb-preset-cascade.js
index 20ec2733..d69daf56 100644
--- a/test-issue-1446-cb-preset-cascade.js
+++ b/tests/unit/test-issue-1446-cb-preset-cascade.js
@@ -13,6 +13,7 @@
  * brings them back red.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -24,7 +25,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const ROOT = __dirname;
+const ROOT = REPO_ROOT;
 const cv2Src     = fs.readFileSync(path.join(ROOT, 'public', 'customize-v2.js'), 'utf8');
 const rolesSrc   = fs.readFileSync(path.join(ROOT, 'public', 'roles.js'), 'utf8');
 const presetsSrc = fs.readFileSync(path.join(ROOT, 'public', 'cb-presets.js'), 'utf8');
diff --git a/test-issue-1450-logo-aspect.js b/tests/unit/test-issue-1450-logo-aspect.js
similarity index 98%
rename from test-issue-1450-logo-aspect.js
rename to tests/unit/test-issue-1450-logo-aspect.js
index 630d78e3..f81b6ab9 100644
--- a/test-issue-1450-logo-aspect.js
+++ b/tests/unit/test-issue-1450-logo-aspect.js
@@ -17,11 +17,12 @@
  * Pure-Node, no browser. Parses style.css + greps customize-v2.js.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 
-const ROOT = __dirname;
+const ROOT = REPO_ROOT;
 const CSS = fs.readFileSync(path.join(ROOT, 'public/style.css'), 'utf8');
 const CUSTOMIZE = fs.readFileSync(path.join(ROOT, 'public/customize-v2.js'), 'utf8');
 
diff --git a/test-issue-1454-channels-toggle.js b/tests/unit/test-issue-1454-channels-toggle.js
similarity index 94%
rename from test-issue-1454-channels-toggle.js
rename to tests/unit/test-issue-1454-channels-toggle.js
index 2c2f8ba7..aafbd0a4 100644
--- a/test-issue-1454-channels-toggle.js
+++ b/tests/unit/test-issue-1454-channels-toggle.js
@@ -12,6 +12,7 @@
  * code must break these.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -23,9 +24,9 @@ function assert(cond, msg) {
 }
 
 const customizeSrc = fs.readFileSync(
-  path.join(__dirname, 'public', 'customize-v2.js'), 'utf8');
+  path.join(REPO_ROOT, 'public', 'customize-v2.js'), 'utf8');
 const channelsSrc = fs.readFileSync(
-  path.join(__dirname, 'public', 'channels.js'), 'utf8');
+  path.join(REPO_ROOT, 'public', 'channels.js'), 'utf8');
 
 console.log('\n=== #1454 A: read gate in channels.js unchanged ===');
 // The localStorage read-gate stays as the source-of-truth contract.
diff --git a/test-issue-1456-score-labels.js b/tests/unit/test-issue-1456-score-labels.js
similarity index 96%
rename from test-issue-1456-score-labels.js
rename to tests/unit/test-issue-1456-score-labels.js
index 804d21a1..f6567171 100644
--- a/test-issue-1456-score-labels.js
+++ b/tests/unit/test-issue-1456-score-labels.js
@@ -11,6 +11,7 @@
  * This file pins the frontend pieces by file-grep on nodes.js.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -21,7 +22,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const src = fs.readFileSync(path.join(__dirname, 'public', 'nodes.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'nodes.js'), 'utf8');
 
 console.log('\n=== #1456: nodes.js renders "Traffic share" label ===');
 
diff --git a/test-issue-1461-mobile-page-actions.js b/tests/unit/test-issue-1461-mobile-page-actions.js
similarity index 99%
rename from test-issue-1461-mobile-page-actions.js
rename to tests/unit/test-issue-1461-mobile-page-actions.js
index 59edb039..79d4920e 100644
--- a/test-issue-1461-mobile-page-actions.js
+++ b/tests/unit/test-issue-1461-mobile-page-actions.js
@@ -15,6 +15,7 @@
  * No source-grep. All assertions are on real function side effects.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const path = require('path');
@@ -212,7 +213,7 @@ function makeSandbox(opts) {
 }
 
 function loadMPA(ctx) {
-  const src = fs.readFileSync(path.join(__dirname, 'public', 'mobile-page-actions.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'mobile-page-actions.js'), 'utf8');
   vm.runInContext(src, ctx);
 }
 
diff --git a/test-issue-1470-card-bg-contrast.js b/tests/unit/test-issue-1470-card-bg-contrast.js
similarity index 98%
rename from test-issue-1470-card-bg-contrast.js
rename to tests/unit/test-issue-1470-card-bg-contrast.js
index 14bc7a10..4a3ab287 100644
--- a/test-issue-1470-card-bg-contrast.js
+++ b/tests/unit/test-issue-1470-card-bg-contrast.js
@@ -15,12 +15,13 @@
  * Mutation guards: reverting either hunk makes the corresponding test fail.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs   = require('fs');
 const path = require('path');
 const vm   = require('vm');
 const assert = require('assert');
 
-const ROOT = __dirname;
+const ROOT = REPO_ROOT;
 function read(rel) { return fs.readFileSync(path.join(ROOT, rel), 'utf8'); }
 
 let passed = 0, failed = 0;
diff --git a/test-issue-1470-node-tile-helper.js b/tests/unit/test-issue-1470-node-tile-helper.js
similarity index 97%
rename from test-issue-1470-node-tile-helper.js
rename to tests/unit/test-issue-1470-node-tile-helper.js
index bf0d74d7..d67218bb 100644
--- a/test-issue-1470-node-tile-helper.js
+++ b/tests/unit/test-issue-1470-node-tile-helper.js
@@ -17,6 +17,7 @@
  * code path end-to-end. Reverting the fix (re-hardcoding OSM) breaks this.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const path = require('path');
@@ -104,7 +105,7 @@ function makeSandbox(opts) {
 }
 
 function loadInto(ctx, relPath) {
-  const src = fs.readFileSync(path.join(__dirname, relPath), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, relPath), 'utf8');
   vm.runInContext(src, ctx, { filename: relPath });
   // Mirror window.* back to sandbox globals so code that uses bare names
   // (which in a browser are window.X) can still resolve them in vm. We do
@@ -117,7 +118,7 @@ function loadInto(ctx, relPath) {
 }
 
 function extractApplyTilesHelper() {
-  const nodesSrc = fs.readFileSync(path.join(__dirname, 'public', 'nodes.js'), 'utf8');
+  const nodesSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'nodes.js'), 'utf8');
   // Match the function _applyTilesToNodeMap(map) { ... } block. Brace-count.
   const startMatch = nodesSrc.match(/function\s+_applyTilesToNodeMap\s*\(map\)\s*\{/);
   if (!startMatch) throw new Error('_applyTilesToNodeMap definition not found in public/nodes.js');
diff --git a/test-issue-1473-prefix-generator.js b/tests/unit/test-issue-1473-prefix-generator.js
similarity index 94%
rename from test-issue-1473-prefix-generator.js
rename to tests/unit/test-issue-1473-prefix-generator.js
index 1c055756..387f97f2 100644
--- a/test-issue-1473-prefix-generator.js
+++ b/tests/unit/test-issue-1473-prefix-generator.js
@@ -7,13 +7,14 @@
  * Reporter: @halo779 (community).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
 const assert = require('assert');
 
-const src = fs.readFileSync(path.join(__dirname, 'public', 'prefix-reserved.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'prefix-reserved.js'), 'utf8');
 const sandbox = { module: { exports: {} }, exports: {}, window: {} };
 vm.createContext(sandbox);
 vm.runInContext(src, sandbox);
@@ -93,14 +94,14 @@ test('with only {00, FE, FF} free, generator returns "FE" (NOT 00 or FF)',
   () => assert.strictEqual(enumerateFirstFree(1, usedAllBut3), 'FE'));
 
 console.log('\n=== #1473: analytics.js wires reserved filter into the generator ===');
-const analyticsSrc = fs.readFileSync(path.join(__dirname, 'public', 'analytics.js'), 'utf8');
+const analyticsSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'analytics.js'), 'utf8');
 test('analytics.js references PrefixReserved (generator wiring)',
   () => assert.ok(/PrefixReserved/.test(analyticsSrc)));
 test('analytics.js mentions the reserved-excluded note in the generator card',
   () => assert.ok(/0x00 and 0xFF[\s\S]{0,200}excluded/i.test(analyticsSrc)));
 test('analytics.js loads prefix-reserved before analytics in index.html',
   () => {
-    const html = fs.readFileSync(path.join(__dirname, 'public', 'index.html'), 'utf8');
+    const html = fs.readFileSync(path.join(REPO_ROOT, 'public', 'index.html'), 'utf8');
     const pri = html.indexOf('prefix-reserved.js');
     const ani = html.indexOf('analytics.js');
     assert.ok(pri > 0 && ani > 0 && pri < ani, 'prefix-reserved.js must load before analytics.js');
diff --git a/test-issue-1473-reserved-prefixes.js b/tests/unit/test-issue-1473-reserved-prefixes.js
similarity index 95%
rename from test-issue-1473-reserved-prefixes.js
rename to tests/unit/test-issue-1473-reserved-prefixes.js
index 943792a8..81872d18 100644
--- a/test-issue-1473-reserved-prefixes.js
+++ b/tests/unit/test-issue-1473-reserved-prefixes.js
@@ -15,6 +15,7 @@
  * Reporter: @halo779 (community).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -22,7 +23,7 @@ const vm = require('vm');
 const assert = require('assert');
 
 // Load prefix-reserved.js as a CommonJS module under vm.
-const src = fs.readFileSync(path.join(__dirname, 'public', 'prefix-reserved.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'prefix-reserved.js'), 'utf8');
 const sandbox = { module: { exports: {} }, exports: {}, window: {} };
 vm.createContext(sandbox);
 vm.runInContext(src, sandbox);
@@ -95,9 +96,9 @@ test('cell 00 title cites MeshCore firmware keygen', () => assert.ok(/MeshCore f
 test('cell FF title cites MeshCore firmware keygen', () => assert.ok(/MeshCore firmware keygen/i.test(cells[255]._attrs.title)));
 
 console.log('\n=== #1473: prefix-reserved.js loaded by index.html ===');
-const indexHtml = fs.readFileSync(path.join(__dirname, 'public', 'index.html'), 'utf8');
+const indexHtml = fs.readFileSync(path.join(REPO_ROOT, 'public', 'index.html'), 'utf8');
 test('index.html includes prefix-reserved.js script', () => assert.ok(/prefix-reserved\.js/.test(indexHtml)));
-const styleCss = fs.readFileSync(path.join(__dirname, 'public', 'style.css'), 'utf8');
+const styleCss = fs.readFileSync(path.join(REPO_ROOT, 'public', 'style.css'), 'utf8');
 test('style.css defines .prefix-reserved', () => assert.ok(/\.prefix-reserved\b/.test(styleCss)));
 test('style.css disables pointer events on reserved cell',
   () => assert.ok(/\.prefix-reserved[\s\S]{0,400}pointer-events:\s*none/i.test(styleCss)));
diff --git a/test-issue-1485-live-anim-z.js b/tests/unit/test-issue-1485-live-anim-z.js
similarity index 97%
rename from test-issue-1485-live-anim-z.js
rename to tests/unit/test-issue-1485-live-anim-z.js
index 9d969a56..3ab947a7 100644
--- a/test-issue-1485-live-anim-z.js
+++ b/tests/unit/test-issue-1485-live-anim-z.js
@@ -25,6 +25,7 @@
  * and assert addTo()/L.layerGroup() receive the pane option.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -35,7 +36,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const liveSrc = fs.readFileSync(path.join(__dirname, 'public', 'live.js'), 'utf8');
+const liveSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'live.js'), 'utf8');
 
 console.log('\n=== #1485 live anim z-order A: custom pane created ===');
 
diff --git a/test-issue-1488-marker-stroke-vars.js b/tests/unit/test-issue-1488-marker-stroke-vars.js
similarity index 93%
rename from test-issue-1488-marker-stroke-vars.js
rename to tests/unit/test-issue-1488-marker-stroke-vars.js
index 324a858d..7b916e97 100644
--- a/test-issue-1488-marker-stroke-vars.js
+++ b/tests/unit/test-issue-1488-marker-stroke-vars.js
@@ -15,6 +15,7 @@
  *   - public/customize-v2.js has marker-stroke controls + routes them to CSS
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -25,11 +26,11 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const rolesSrc     = fs.readFileSync(path.join(__dirname, 'public', 'roles.js'),        'utf8');
-const mapSrc       = fs.readFileSync(path.join(__dirname, 'public', 'map.js'),          'utf8');
-const liveSrc      = fs.readFileSync(path.join(__dirname, 'public', 'live.js'),         'utf8');
-const styleSrc     = fs.readFileSync(path.join(__dirname, 'public', 'style.css'),       'utf8');
-const customizeSrc = fs.readFileSync(path.join(__dirname, 'public', 'customize-v2.js'), 'utf8');
+const rolesSrc     = fs.readFileSync(path.join(REPO_ROOT, 'public', 'roles.js'),        'utf8');
+const mapSrc       = fs.readFileSync(path.join(REPO_ROOT, 'public', 'map.js'),          'utf8');
+const liveSrc      = fs.readFileSync(path.join(REPO_ROOT, 'public', 'live.js'),         'utf8');
+const styleSrc     = fs.readFileSync(path.join(REPO_ROOT, 'public', 'style.css'),       'utf8');
+const customizeSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'customize-v2.js'), 'utf8');
 
 console.log('\n=== #1488 A: style.css declares marker-stroke CSS vars ===');
 {
@@ -118,7 +119,7 @@ console.log('\n=== #1506 F: server defaults restored to v3.7.2 (solid white, 2px
 
   // config.example.json defaults must also match so fresh deploys ship
   // the v3.7.2 visual without operator action.
-  var configSrc = fs.readFileSync(path.join(__dirname, 'config.example.json'), 'utf8');
+  var configSrc = fs.readFileSync(path.join(REPO_ROOT, 'config.example.json'), 'utf8');
   var cfg = JSON.parse(configSrc);
   assert(cfg.markerStroke && /^(#fff|#ffffff|white|rgb\(\s*255\s*,\s*255\s*,\s*255\s*\))$/i.test(String(cfg.markerStroke.color || '').trim()),
     'config.example.json markerStroke.color is solid white (got: ' + (cfg.markerStroke && cfg.markerStroke.color) + ')');
diff --git a/test-issue-1496-reset-all-complete.js b/tests/unit/test-issue-1496-reset-all-complete.js
similarity index 98%
rename from test-issue-1496-reset-all-complete.js
rename to tests/unit/test-issue-1496-reset-all-complete.js
index 20c3eb0e..2818f404 100644
--- a/test-issue-1496-reset-all-complete.js
+++ b/tests/unit/test-issue-1496-reset-all-complete.js
@@ -17,6 +17,7 @@
  *     mc-channels-* selection state
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -151,7 +152,7 @@ function loadCustomizer() {
   };
   env.ctx.window.MC_getDarkTileProvider = () => env.localStorage.getItem('mc-dark-tile-provider') || 'carto-dark';
 
-  const code = fs.readFileSync(path.join(__dirname, 'public', 'customize-v2.js'), 'utf8');
+  const code = fs.readFileSync(path.join(REPO_ROOT, 'public', 'customize-v2.js'), 'utf8');
   vm.createContext(env.ctx);
   vm.runInContext(code, env.ctx, { filename: 'customize-v2.js' });
   env.api = env.ctx.window._customizerV2;
diff --git a/test-issue-1509-detect-preset.js b/tests/unit/test-issue-1509-detect-preset.js
similarity index 100%
rename from test-issue-1509-detect-preset.js
rename to tests/unit/test-issue-1509-detect-preset.js
diff --git a/test-issue-1509-nav-active-bg.js b/tests/unit/test-issue-1509-nav-active-bg.js
similarity index 100%
rename from test-issue-1509-nav-active-bg.js
rename to tests/unit/test-issue-1509-nav-active-bg.js
diff --git a/test-issue-1518-home-url.js b/tests/unit/test-issue-1518-home-url.js
similarity index 100%
rename from test-issue-1518-home-url.js
rename to tests/unit/test-issue-1518-home-url.js
diff --git a/test-issue-1532-live-fullscreen.js b/tests/unit/test-issue-1532-live-fullscreen.js
similarity index 97%
rename from test-issue-1532-live-fullscreen.js
rename to tests/unit/test-issue-1532-live-fullscreen.js
index 617368dc..02e72e95 100644
--- a/test-issue-1532-live-fullscreen.js
+++ b/tests/unit/test-issue-1532-live-fullscreen.js
@@ -18,6 +18,7 @@
  * unit-test gate (no playwright/server needed).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -28,8 +29,8 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const liveJs  = fs.readFileSync(path.join(__dirname, 'public', 'live.js'),  'utf8');
-const liveCss = fs.readFileSync(path.join(__dirname, 'public', 'live.css'), 'utf8');
+const liveJs  = fs.readFileSync(path.join(REPO_ROOT, 'public', 'live.js'),  'utf8');
+const liveCss = fs.readFileSync(path.join(REPO_ROOT, 'public', 'live.css'), 'utf8');
 
 // ─────────────────────────────────────────────────────────────────────
 console.log('\n=== #1532 A: #liveFullscreenToggle button declared ===');
diff --git a/test-issue-1562-observers-summary.js b/tests/unit/test-issue-1562-observers-summary.js
similarity index 96%
rename from test-issue-1562-observers-summary.js
rename to tests/unit/test-issue-1562-observers-summary.js
index adf74ff0..1422f05b 100644
--- a/test-issue-1562-observers-summary.js
+++ b/tests/unit/test-issue-1562-observers-summary.js
@@ -7,6 +7,7 @@
  * without a DOM) + render-string assertions for the header HTML.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -51,7 +52,7 @@ function makeSandbox() {
   return ctx;
 }
 function load(ctx, file) {
-  vm.runInContext(fs.readFileSync(path.join(__dirname, file), 'utf8'), ctx);
+  vm.runInContext(fs.readFileSync(path.join(REPO_ROOT, file), 'utf8'), ctx);
   for (const k of Object.keys(ctx.window)) ctx[k] = ctx.window[k];
 }
 
@@ -136,7 +137,7 @@ t('renderHeader still renders cleanly when fetchedAt is null/0 (graceful degrade
 
 console.log('\n=== #1562 DOM-grep checks ===');
 
-const observersSrc = fs.readFileSync(path.join(__dirname, 'public', 'observers.js'), 'utf8');
+const observersSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'observers.js'), 'utf8');
 
 t('observers.js exposes ObserversSummary global', () => {
   assert.ok(/window\.ObserversSummary\s*=/.test(observersSrc),
@@ -158,7 +159,7 @@ t('observers.js bypasses cache on manual refresh (bust: true)', () => {
     'expected api(..., { bust: true }) on the manual refresh path');
 });
 
-const styleSrc = fs.readFileSync(path.join(__dirname, 'public', 'style.css'), 'utf8');
+const styleSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'style.css'), 'utf8');
 t('style.css defines .obs-updated-stale visual rule', () => {
   assert.ok(/\.obs-updated-stale\b/.test(styleSrc),
     'expected .obs-updated-stale class in style.css');
diff --git a/test-issue-1563-aggregate-and-inflight.js b/tests/unit/test-issue-1563-aggregate-and-inflight.js
similarity index 96%
rename from test-issue-1563-aggregate-and-inflight.js
rename to tests/unit/test-issue-1563-aggregate-and-inflight.js
index 40630ad7..e0b8bf54 100644
--- a/test-issue-1563-aggregate-and-inflight.js
+++ b/tests/unit/test-issue-1563-aggregate-and-inflight.js
@@ -13,6 +13,7 @@
  *     "Last updated" pill reflects the latest fetch, not the stale one).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -67,7 +68,7 @@ function makeSandbox() {
   return ctx;
 }
 function load(ctx, file) {
-  vm.runInContext(fs.readFileSync(path.join(__dirname, file), 'utf8'), ctx);
+  vm.runInContext(fs.readFileSync(path.join(REPO_ROOT, file), 'utf8'), ctx);
   for (const k of Object.keys(ctx.window)) ctx[k] = ctx.window[k];
 }
 
@@ -129,7 +130,7 @@ console.log('\n=== #1563 A. Aggregate uses same classifier as per-row dots ===')
 
   t('source: observers.js no longer contains the old standalone `classify()` ladder', () => {
     // Defense in depth — make sure the parallel ladder isn't re-introduced.
-    const src = fs.readFileSync(path.join(__dirname, 'public', 'observers.js'), 'utf8');
+    const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'observers.js'), 'utf8');
     // Old code had `function classify(lastSeen)` returning string 'online'/'stale'/'offline'
     // The new defaultClassify() returns { cls: 'health-*' } objects.
     assert.ok(!/function\s+classify\s*\(\s*lastSeen\s*\)\s*\{[\s\S]*?return\s+'online'/.test(src),
@@ -185,7 +186,7 @@ console.log('\n=== #1563 B. loadObservers in-flight guard ===');
   // window seam in observers.js. If it doesn't exist, skip the runtime
   // test but the source-grep test below still asserts the guard exists.
   await t('source: loadObservers tracks a monotonic request id', () => {
-    const src = fs.readFileSync(path.join(__dirname, 'public', 'observers.js'), 'utf8');
+    const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'observers.js'), 'utf8');
     assert.ok(/_loadObserversReqId|loadObserversReqId/.test(src),
       'observers.js must track a monotonic request id on loadObservers');
     assert.ok(/myId\s*!==\s*_loadObserversReqId/.test(src) || /myId\s*!==\s*loadObserversReqId/.test(src),
@@ -193,7 +194,7 @@ console.log('\n=== #1563 B. loadObservers in-flight guard ===');
   });
 
   await t('source: stale resolutions return early before assigning observers/_fetchedAt', () => {
-    const src = fs.readFileSync(path.join(__dirname, 'public', 'observers.js'), 'utf8');
+    const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'observers.js'), 'utf8');
     // The guard must appear BEFORE `observers = data.observers` to actually drop stale data.
     const guardIdx = src.search(/if\s*\(\s*myId\s*!==\s*_loadObserversReqId\s*\)\s*return/);
     const assignIdx = src.search(/observers\s*=\s*data\.observers/);
@@ -238,7 +239,7 @@ console.log('\n=== #1563 B. loadObservers in-flight guard ===');
     // Inject a seam: re-exec observers.js with a trailing line that
     // exposes loadObservers + the `observers` local + `_fetchedAt` for
     // inspection. We patch the source on the fly.
-    const src = fs.readFileSync(path.join(__dirname, 'public', 'observers.js'), 'utf8');
+    const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'observers.js'), 'utf8');
     // Append exposure inside the IIFE by replacing the closing `})();` of
     // the second IIFE with seam code then re-closing.
     const seam =
diff --git a/test-issue-1574-live-map-max-nodes.js b/tests/unit/test-issue-1574-live-map-max-nodes.js
similarity index 89%
rename from test-issue-1574-live-map-max-nodes.js
rename to tests/unit/test-issue-1574-live-map-max-nodes.js
index 5cfdd789..e5da0e97 100644
--- a/test-issue-1574-live-map-max-nodes.js
+++ b/tests/unit/test-issue-1574-live-map-max-nodes.js
@@ -14,6 +14,7 @@
  * this test red.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const path = require('path');
 
@@ -23,8 +24,8 @@ function assert(cond, msg) {
   else { failed++; console.error('  \u274c ' + msg); }
 }
 
-const liveSrc = fs.readFileSync(path.join(__dirname, 'public', 'live.js'), 'utf8');
-const rolesSrc = fs.readFileSync(path.join(__dirname, 'public', 'roles.js'), 'utf8');
+const liveSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'live.js'), 'utf8');
+const rolesSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'roles.js'), 'utf8');
 
 // ── 1. The hardcoded /api/nodes?limit=2000 literal must be gone ─────────
 const nodesLiteralHits = (liveSrc.match(/\/api\/nodes\?limit=2000/g) || []).length;
@@ -41,7 +42,7 @@ assert(/liveMapMaxNodes/.test(rolesSrc),
   'public/roles.js reads `liveMapMaxNodes` from /api/config/client and exposes LIVE_MAP_MAX_NODES');
 
 // ── 4. config.example.json documents the knob ────────────────────────────
-const cfgExample = fs.readFileSync(path.join(__dirname, 'config.example.json'), 'utf8');
+const cfgExample = fs.readFileSync(path.join(REPO_ROOT, 'config.example.json'), 'utf8');
 assert(/"maxNodes"\s*:/.test(cfgExample),
   'config.example.json declares liveMap.maxNodes default');
 
diff --git a/test-issue-1606-pagination.js b/tests/unit/test-issue-1606-pagination.js
similarity index 98%
rename from test-issue-1606-pagination.js
rename to tests/unit/test-issue-1606-pagination.js
index 4b72517e..7f1d4e5b 100644
--- a/test-issue-1606-pagination.js
+++ b/tests/unit/test-issue-1606-pagination.js
@@ -12,6 +12,7 @@
  * assertion below fails. With the pagination loop in place, it passes.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const path = require('path');
@@ -143,7 +144,7 @@ function makeNodesEnv(totalNodes, serverCap) {
   let pageMod = null;
   ctx.registerPage = (name, handlers) => { pageMod = handlers; };
 
-  const repoRoot = path.resolve(__dirname);
+  const repoRoot = path.resolve(REPO_ROOT);
   loadInCtx(ctx, path.join(repoRoot, 'public/nodes.js'));
 
   return { ctx, pageMod: () => pageMod, apiCalls, fixtureTotal: fixture.length };
@@ -232,7 +233,7 @@ test('B1: after api() throws mid-pagination, _allNodes resets so next call refet
   ctx.debouncedOnWS = () => () => {};
   let pageMod = null;
   ctx.registerPage = (name, handlers) => { pageMod = handlers; };
-  loadInCtx(ctx, path.join(__dirname, 'public/nodes.js'));
+  loadInCtx(ctx, path.join(REPO_ROOT, 'public/nodes.js'));
 
   // First call — will fail on page 2
   pageMod.init(ctx.document.getElementById('page'));
@@ -300,7 +301,7 @@ test('M1: pagination fetches all pages even when total is understated (filter in
   ctx.debouncedOnWS = () => () => {};
   let pageMod = null;
   ctx.registerPage = (name, handlers) => { pageMod = handlers; };
-  loadInCtx(ctx, path.join(__dirname, 'public/nodes.js'));
+  loadInCtx(ctx, path.join(REPO_ROOT, 'public/nodes.js'));
 
   pageMod.init(ctx.document.getElementById('page'));
   for (let i = 0; i < 50; i++) await new Promise(r => setImmediate(r));
@@ -377,7 +378,7 @@ test('M2: progress feedback is shown between page fetches', async () => {
   ctx.debouncedOnWS = () => () => {};
   let pageMod = null;
   ctx.registerPage = (name, handlers) => { pageMod = handlers; };
-  loadInCtx(ctx, path.join(__dirname, 'public/nodes.js'));
+  loadInCtx(ctx, path.join(REPO_ROOT, 'public/nodes.js'));
 
   pageMod.init(ctx.document.getElementById('page'));
   for (let i = 0; i < 50; i++) await new Promise(r => setImmediate(r));
diff --git a/test-issue-1614-tile-url-function.js b/tests/unit/test-issue-1614-tile-url-function.js
similarity index 97%
rename from test-issue-1614-tile-url-function.js
rename to tests/unit/test-issue-1614-tile-url-function.js
index b812cf99..63d25336 100644
--- a/test-issue-1614-tile-url-function.js
+++ b/tests/unit/test-issue-1614-tile-url-function.js
@@ -20,6 +20,7 @@
  * fail if map-tile-providers.js drifted.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const path = require('path');
@@ -56,7 +57,7 @@ function makeSandbox(theme) {
   ctx.window.document = ctx.document;
   ctx.globalThis = ctx;
   vm.createContext(ctx);
-  const src = fs.readFileSync(path.join(__dirname, 'public', 'roles.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'roles.js'), 'utf8');
   vm.runInContext(src, ctx, { filename: 'public/roles.js' });
   // Mirror window.* back so bare-name refs inside roles.js (TILE_DARK etc.) resolve.
   for (const k of Object.keys(ctx.window)) if (!(k in ctx)) ctx[k] = ctx.window[k];
diff --git a/test-issue-1619-feed-detail-card-draggable.js b/tests/unit/test-issue-1619-feed-detail-card-draggable.js
similarity index 95%
rename from test-issue-1619-feed-detail-card-draggable.js
rename to tests/unit/test-issue-1619-feed-detail-card-draggable.js
index 963280a2..a3697ae4 100644
--- a/test-issue-1619-feed-detail-card-draggable.js
+++ b/tests/unit/test-issue-1619-feed-detail-card-draggable.js
@@ -14,6 +14,7 @@
  *      the exposed instance.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -24,8 +25,8 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const liveCss = fs.readFileSync(path.join(__dirname, 'public', 'live.css'), 'utf8');
-const liveJs = fs.readFileSync(path.join(__dirname, 'public', 'live.js'), 'utf8');
+const liveCss = fs.readFileSync(path.join(REPO_ROOT, 'public', 'live.css'), 'utf8');
+const liveJs = fs.readFileSync(path.join(REPO_ROOT, 'public', 'live.js'), 'utf8');
 
 console.log('\n=== #1619 A: .feed-detail-card z-index above legend ===');
 
diff --git a/test-issue-1633-hide-1byte-hops.js b/tests/unit/test-issue-1633-hide-1byte-hops.js
similarity index 96%
rename from test-issue-1633-hide-1byte-hops.js
rename to tests/unit/test-issue-1633-hide-1byte-hops.js
index 74068890..307f9b0f 100644
--- a/test-issue-1633-hide-1byte-hops.js
+++ b/tests/unit/test-issue-1633-hide-1byte-hops.js
@@ -14,6 +14,7 @@
  *     multi-byte hop hexes when ON.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const assert = require('assert');
 const fs = require('fs');
@@ -60,7 +61,7 @@ function makeSandbox() {
 }
 
 function load(ctx, file) {
-  const src = fs.readFileSync(path.join(__dirname, file), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, file), 'utf8');
   vm.runInContext(src, ctx, { filename: file });
 }
 
@@ -332,7 +333,7 @@ test('[adv #1] route-view.js: all-1-byte paths do NOT collide on empty key', ()
 test('[adv #1] route-view.js source: key derivation uses sentinel for all-1-byte buckets', () => {
   // Source-grep guard: if a future refactor reverts to `hops.join("-")`
   // bare aggregation, this test catches it.
-  const src = fs.readFileSync(path.join(__dirname, 'public/route-view.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public/route-view.js'), 'utf8');
   assert.ok(src.indexOf('__all1byte__::') !== -1 || src.indexOf('⟨all-1byte⟩::') !== -1,
     'route-view.js must include a sentinel for all-1-byte aggregation buckets');
 });
@@ -341,7 +342,7 @@ test('[adv #2] map.js source: drawPacketRoute propagates hopsHiddenCount to rend
   // Source-grep guard: the polyline MUST carry the redacted-count down
   // to the renderer so it can dash + badge. A revert that drops the
   // `hopsHiddenCount` option from the render call regresses operator UX.
-  const src = fs.readFileSync(path.join(__dirname, 'public/map.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public/map.js'), 'utf8');
   assert.ok(/hopsHiddenCount\s*:\s*hopsHiddenCount/.test(src),
     'map.js must pass hopsHiddenCount into the route renderer opts');
   assert.ok(/var\s+hopsHiddenCount\s*=\s*0/.test(src) || /let\s+hopsHiddenCount\s*=\s*0/.test(src),
@@ -349,7 +350,7 @@ test('[adv #2] map.js source: drawPacketRoute propagates hopsHiddenCount to rend
 });
 
 test('[adv #2] route-render.js: redacted edges use dashed + reduced opacity + emit badge', () => {
-  const src = fs.readFileSync(path.join(__dirname, 'public/route-render.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public/route-render.js'), 'utf8');
   assert.ok(src.indexOf('mc-route-edge-redacted') !== -1,
     'route-render.js must add a .mc-route-edge-redacted className when hopsHiddenCount > 0');
   assert.ok(src.indexOf('mc-route-redacted-badge') !== -1,
@@ -359,7 +360,7 @@ test('[adv #2] route-render.js: redacted edges use dashed + reduced opacity + em
 });
 
 test('[adv #3] observer-detail.js source: hop count honors MC_filterPathHops', () => {
-  const src = fs.readFileSync(path.join(__dirname, 'public/observer-detail.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public/observer-detail.js'), 'utf8');
   assert.ok(src.indexOf('MC_filterPathHops') !== -1,
     'observer-detail.js renderRecentPackets must call MC_filterPathHops');
 });
@@ -393,14 +394,14 @@ test('[r2 MAJOR] live.js packetInvolvesFilterNode: node-filter search is INDEPEN
 });
 
 test('[adv #4] customize-v2.js still dispatches mc-hide-1byte-hops-changed', () => {
-  const src = fs.readFileSync(path.join(__dirname, 'public/customize-v2.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public/customize-v2.js'), 'utf8');
   assert.ok(src.indexOf('mc-hide-1byte-hops-changed') !== -1,
     'customizer must continue to dispatch the event');
 });
 
 test('[adv #4] map.js + packets.js subscribe to mc-hide-1byte-hops-changed', () => {
-  const mapSrc = fs.readFileSync(path.join(__dirname, 'public/map.js'), 'utf8');
-  const pktSrc = fs.readFileSync(path.join(__dirname, 'public/packets.js'), 'utf8');
+  const mapSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/map.js'), 'utf8');
+  const pktSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/packets.js'), 'utf8');
   assert.ok(/addEventListener\(['"]mc-hide-1byte-hops-changed['"]/.test(mapSrc),
     'map.js must subscribe to mc-hide-1byte-hops-changed');
   assert.ok(/addEventListener\(['"]mc-hide-1byte-hops-changed['"]/.test(pktSrc),
@@ -426,7 +427,7 @@ test('[kb #2] (1-byte filtered) chip text is emitted by every render boundary',
     'public/route-view.js'
   ];
   for (const f of files) {
-    const src = fs.readFileSync(path.join(__dirname, f), 'utf8');
+    const src = fs.readFileSync(path.join(REPO_ROOT, f), 'utf8');
     assert.ok(src.indexOf('1-byte filtered') !== -1,
       f + ' must render the literal "(1-byte filtered)" chip text');
   }
@@ -549,7 +550,7 @@ test('#1784: MC_meetsPathTrust handles null/undefined safely', () => {
 console.log('\n=== #1784: consumer wiring guards ===');
 
 test('#1784: map.js references MC_pathBelowTrust for trust-gated route display', () => {
-  const src = fs.readFileSync(path.join(__dirname, 'public/map.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public/map.js'), 'utf8');
   assert.ok(src.indexOf('MC_pathBelowTrust') !== -1,
     'map.js must call MC_pathBelowTrust to gate route drawing on trust threshold');
   assert.ok(src.indexOf('Route not displayed') !== -1,
@@ -561,7 +562,7 @@ test('#1784: map.js references MC_pathBelowTrust for trust-gated route display',
 });
 
 test('#1784: analytics.js references MC_meetsPathTrust for subpath filtering', () => {
-  const src = fs.readFileSync(path.join(__dirname, 'public/analytics.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public/analytics.js'), 'utf8');
   assert.ok(src.indexOf('MC_meetsPathTrust') !== -1,
     'analytics.js must call MC_meetsPathTrust to filter subpaths by trust');
   assert.ok(src.indexOf('MC_getPathTrustThreshold') !== -1,
@@ -571,7 +572,7 @@ test('#1784: analytics.js references MC_meetsPathTrust for subpath filtering', (
 });
 
 test('#1784: route-view.js references MC_meetsPathTrust for speculative annotation', () => {
-  const src = fs.readFileSync(path.join(__dirname, 'public/route-view.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public/route-view.js'), 'utf8');
   assert.ok(src.indexOf('MC_meetsPathTrust') !== -1,
     'route-view.js must call MC_meetsPathTrust to mark paths as speculative');
   assert.ok(src.indexOf('belowTrust') !== -1,
@@ -581,7 +582,7 @@ test('#1784: route-view.js references MC_meetsPathTrust for speculative annotati
 });
 
 test('#1784: live.js references MC_meetsPathTrust for Paths Through widget', () => {
-  const src = fs.readFileSync(path.join(__dirname, 'public/live.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public/live.js'), 'utf8');
   assert.ok(src.indexOf('MC_meetsPathTrust') !== -1,
     'live.js must call MC_meetsPathTrust in the Paths Through widget');
   assert.ok(src.indexOf('pathTrust.minHashBytesForMapping') !== -1,
@@ -589,7 +590,7 @@ test('#1784: live.js references MC_meetsPathTrust for Paths Through widget', ()
 });
 
 test('#1784: nodes.js references MC_getPathTrustThreshold for confidence weights', () => {
-  const src = fs.readFileSync(path.join(__dirname, 'public/nodes.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public/nodes.js'), 'utf8');
   assert.ok(src.indexOf('MC_getPathTrustThreshold') !== -1,
     'nodes.js must read trust threshold for confidence weight adjustment');
 });
diff --git a/test-issue-1644-redesign.js b/tests/unit/test-issue-1644-redesign.js
similarity index 97%
rename from test-issue-1644-redesign.js
rename to tests/unit/test-issue-1644-redesign.js
index 8f2680bb..69b2b1db 100644
--- a/test-issue-1644-redesign.js
+++ b/tests/unit/test-issue-1644-redesign.js
@@ -19,13 +19,14 @@
  * verification (looks Tufte-grade) is screenshot-based, not asserted here.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
 
-const CSS = fs.readFileSync(path.join(__dirname, 'public/style.css'), 'utf8');
-const OBS_JS = fs.readFileSync(path.join(__dirname, 'public/observers.js'), 'utf8');
-const COMPARE_JS = fs.readFileSync(path.join(__dirname, 'public/compare.js'), 'utf8');
+const CSS = fs.readFileSync(path.join(REPO_ROOT, 'public/style.css'), 'utf8');
+const OBS_JS = fs.readFileSync(path.join(REPO_ROOT, 'public/observers.js'), 'utf8');
+const COMPARE_JS = fs.readFileSync(path.join(REPO_ROOT, 'public/compare.js'), 'utf8');
 
 let passed = 0, failed = 0;
 function test(name, fn) {
diff --git a/test-issue-1646-compare-polish.js b/tests/unit/test-issue-1646-compare-polish.js
similarity index 98%
rename from test-issue-1646-compare-polish.js
rename to tests/unit/test-issue-1646-compare-polish.js
index d77d4449..f9e8a960 100644
--- a/test-issue-1646-compare-polish.js
+++ b/tests/unit/test-issue-1646-compare-polish.js
@@ -28,11 +28,12 @@
  *   8) The legacy Compare button has been removed from the DOM in compare.js.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const path = require('path');
 
-const CSS = fs.readFileSync(path.join(__dirname, 'public/style.css'), 'utf8').replace(/\/\*[\s\S]*?\*\//g, '');
-const COMPARE_JS = fs.readFileSync(path.join(__dirname, 'public/compare.js'), 'utf8');
+const CSS = fs.readFileSync(path.join(REPO_ROOT, 'public/style.css'), 'utf8').replace(/\/\*[\s\S]*?\*\//g, '');
+const COMPARE_JS = fs.readFileSync(path.join(REPO_ROOT, 'public/compare.js'), 'utf8');
 
 // Token-rank used by font-size comparisons. Comments-only mirror of the
 // scale; if --fs-xl ever moves, only the relative order matters and that
diff --git a/test-issue-1648-followup-phosphor-leaks.js b/tests/unit/test-issue-1648-followup-phosphor-leaks.js
similarity index 97%
rename from test-issue-1648-followup-phosphor-leaks.js
rename to tests/unit/test-issue-1648-followup-phosphor-leaks.js
index da25388d..20ab9a3b 100644
--- a/test-issue-1648-followup-phosphor-leaks.js
+++ b/tests/unit/test-issue-1648-followup-phosphor-leaks.js
@@ -13,6 +13,7 @@
  * is a sprite swap; same playbook.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const path = require('path');
@@ -53,7 +54,7 @@ console.log('\n=== v384-1.2 — /observers .obs-clock-naive-chip sprite ===');
     debouncedOnWS: (fn) => fn,
   };
   vm.createContext(ctx);
-  vm.runInContext(fs.readFileSync(path.join(__dirname, 'public/observers.js'), 'utf8'), ctx);
+  vm.runInContext(fs.readFileSync(path.join(REPO_ROOT, 'public/observers.js'), 'utf8'), ctx);
 
   const html = ctx.window.ObserversNaiveChip.render({
     id: 'x', clock_naive: true, clock_skew_seconds: -28800,
@@ -108,7 +109,7 @@ console.log('\n=== v384-12.18 — /analytics Channels encrypted group labels ===
   global.histogram = () => ({ svg: '' });
 
   // eslint-disable-next-line no-eval
-  eval(fs.readFileSync(path.join(__dirname, 'public/analytics.js'), 'utf8'));
+  eval(fs.readFileSync(path.join(REPO_ROOT, 'public/analytics.js'), 'utf8'));
 
   const decorate = global._analyticsDecorateChannels;
   const tbodyFn = global._analyticsChannelTbodyHtml;
diff --git a/test-issue-1648-m1-emoji-scan.js b/tests/unit/test-issue-1648-m1-emoji-scan.js
similarity index 97%
rename from test-issue-1648-m1-emoji-scan.js
rename to tests/unit/test-issue-1648-m1-emoji-scan.js
index a1f89d50..8b58094a 100644
--- a/test-issue-1648-m1-emoji-scan.js
+++ b/tests/unit/test-issue-1648-m1-emoji-scan.js
@@ -17,12 +17,13 @@
  * each named line currently contains the offending codepoint.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const ROOT = path.resolve(__dirname, 'public');
+const ROOT = path.resolve(REPO_ROOT, 'public');
 
 // File-by-file expected codepoint-free regions.
 // We scan the WHOLE file for nav/UI emoji rather than specific lines so
diff --git a/test-issue-1648-m2-emoji-scan.js b/tests/unit/test-issue-1648-m2-emoji-scan.js
similarity index 98%
rename from test-issue-1648-m2-emoji-scan.js
rename to tests/unit/test-issue-1648-m2-emoji-scan.js
index c8163e75..beb98eba 100644
--- a/test-issue-1648-m2-emoji-scan.js
+++ b/tests/unit/test-issue-1648-m2-emoji-scan.js
@@ -18,12 +18,13 @@
  * M2 file currently contains many of the offending codepoints.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const ROOT = path.resolve(__dirname, 'public');
+const ROOT = path.resolve(REPO_ROOT, 'public');
 
 const M2_FILES = [
   'analytics.js',
diff --git a/test-issue-1648-m3-emoji-scan.js b/tests/unit/test-issue-1648-m3-emoji-scan.js
similarity index 98%
rename from test-issue-1648-m3-emoji-scan.js
rename to tests/unit/test-issue-1648-m3-emoji-scan.js
index 0767602e..6fe7d2c0 100644
--- a/test-issue-1648-m3-emoji-scan.js
+++ b/tests/unit/test-issue-1648-m3-emoji-scan.js
@@ -20,12 +20,13 @@
  * exist in style.css and set color via var(--status-*).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const ROOT = path.resolve(__dirname, 'public');
+const ROOT = path.resolve(REPO_ROOT, 'public');
 
 const M3_FILES = [
   'home.js',
diff --git a/test-issue-1648-m4-emoji-scan.js b/tests/unit/test-issue-1648-m4-emoji-scan.js
similarity index 98%
rename from test-issue-1648-m4-emoji-scan.js
rename to tests/unit/test-issue-1648-m4-emoji-scan.js
index 2da43d93..048bc5a0 100644
--- a/test-issue-1648-m4-emoji-scan.js
+++ b/tests/unit/test-issue-1648-m4-emoji-scan.js
@@ -16,12 +16,13 @@
  * Anti-tautology: this test FAILS pre-implementation by construction.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const ROOT = path.resolve(__dirname, 'public');
+const ROOT = path.resolve(REPO_ROOT, 'public');
 
 const M4_FILES = [
   'map.js',
diff --git a/test-issue-1648-m5-emoji-scan.js b/tests/unit/test-issue-1648-m5-emoji-scan.js
similarity index 98%
rename from test-issue-1648-m5-emoji-scan.js
rename to tests/unit/test-issue-1648-m5-emoji-scan.js
index e53e131d..af346b21 100644
--- a/test-issue-1648-m5-emoji-scan.js
+++ b/tests/unit/test-issue-1648-m5-emoji-scan.js
@@ -23,12 +23,13 @@
  * every M5 file has at least one icon emoji or misc-symbol today.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const ROOT = path.resolve(__dirname);
+const ROOT = path.resolve(REPO_ROOT);
 const PUB = path.join(ROOT, 'public');
 
 const M5_FILES = [
diff --git a/test-issue-1648-m6-final-sweep.js b/tests/unit/test-issue-1648-m6-final-sweep.js
similarity index 98%
rename from test-issue-1648-m6-final-sweep.js
rename to tests/unit/test-issue-1648-m6-final-sweep.js
index bd38fac4..b42dec7e 100644
--- a/test-issue-1648-m6-final-sweep.js
+++ b/tests/unit/test-issue-1648-m6-final-sweep.js
@@ -27,12 +27,13 @@
  * feeds a known-bad fixture and asserts this lint script flags it.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const ROOT = path.resolve(__dirname);
+const ROOT = path.resolve(REPO_ROOT);
 
 // Exposed for unit tests.
 const EMOJI_RANGES = [
diff --git a/test-issue-1648-m6-lint-self.js b/tests/unit/test-issue-1648-m6-lint-self.js
similarity index 97%
rename from test-issue-1648-m6-lint-self.js
rename to tests/unit/test-issue-1648-m6-lint-self.js
index bed94f37..b668b03b 100644
--- a/test-issue-1648-m6-lint-self.js
+++ b/tests/unit/test-issue-1648-m6-lint-self.js
@@ -10,6 +10,7 @@
  *      emoji injection.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const os = require('os');
@@ -114,7 +115,7 @@ var beforeViolations = lint.runLint();
 assert.strictEqual(beforeViolations.length, 0,
   'repo MUST be clean before anti-tautology probe');
 
-var probeFile = path.join(__dirname, 'public', '__m6_lint_probe.js');
+var probeFile = path.join(REPO_ROOT, 'public', '__m6_lint_probe.js');
 fs.writeFileSync(probeFile, '/* synthetic probe — emoji should be flagged: ⭐ */\n');
 try {
   var afterViolations = lint.runLint();
diff --git a/test-issue-1668-m2-contrast.js b/tests/unit/test-issue-1668-m2-contrast.js
similarity index 100%
rename from test-issue-1668-m2-contrast.js
rename to tests/unit/test-issue-1668-m2-contrast.js
diff --git a/test-issue-1668-m3-typography.js b/tests/unit/test-issue-1668-m3-typography.js
similarity index 98%
rename from test-issue-1668-m3-typography.js
rename to tests/unit/test-issue-1668-m3-typography.js
index 2b77b73d..33d90e63 100644
--- a/test-issue-1668-m3-typography.js
+++ b/tests/unit/test-issue-1668-m3-typography.js
@@ -15,12 +15,13 @@
  */
 
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const repoRoot = __dirname;
+const repoRoot = REPO_ROOT;
 const cssPath = path.join(repoRoot, 'public', 'style.css');
 const audioLabJsPath = path.join(repoRoot, 'public', 'audio-lab.js');
 const css = fs.readFileSync(cssPath, 'utf8');
diff --git a/test-issue-1668-m4-per-route.js b/tests/unit/test-issue-1668-m4-per-route.js
similarity index 99%
rename from test-issue-1668-m4-per-route.js
rename to tests/unit/test-issue-1668-m4-per-route.js
index 0aa8ea0d..dda7ee1f 100644
--- a/test-issue-1668-m4-per-route.js
+++ b/tests/unit/test-issue-1668-m4-per-route.js
@@ -19,12 +19,13 @@
  */
 
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const repoRoot = __dirname;
+const repoRoot = REPO_ROOT;
 const cssPath = path.join(repoRoot, 'public', 'style.css');
 const liveCssPath = path.join(repoRoot, 'public', 'live.css');
 const audioLabJsPath = path.join(repoRoot, 'public', 'audio-lab.js');
diff --git a/test-issue-1697-mqtt-mobile-e2e.js b/tests/unit/test-issue-1697-mqtt-mobile-e2e.js
similarity index 97%
rename from test-issue-1697-mqtt-mobile-e2e.js
rename to tests/unit/test-issue-1697-mqtt-mobile-e2e.js
index 5d74aec1..2d436ea7 100644
--- a/test-issue-1697-mqtt-mobile-e2e.js
+++ b/tests/unit/test-issue-1697-mqtt-mobile-e2e.js
@@ -11,6 +11,7 @@
  * Failure on current master (before #1697 fix) is the RED commit gate.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -41,7 +42,7 @@ function loadPanel(innerWidth) {
     Promise
   };
   vm.createContext(ctx);
-  const src = fs.readFileSync(path.resolve(__dirname, 'public/mqtt-status-panel.js'), 'utf8');
+  const src = fs.readFileSync(path.resolve(REPO_ROOT, 'public/mqtt-status-panel.js'), 'utf8');
   vm.runInContext(src, ctx);
   return { Panel: ctx.window.MqttStatusPanel, container: container, win: win };
 }
diff --git a/test-issue-1699-retransmission-chart.js b/tests/unit/test-issue-1699-retransmission-chart.js
similarity index 98%
rename from test-issue-1699-retransmission-chart.js
rename to tests/unit/test-issue-1699-retransmission-chart.js
index 0483a4e5..1a775e75 100644
--- a/test-issue-1699-retransmission-chart.js
+++ b/tests/unit/test-issue-1699-retransmission-chart.js
@@ -9,6 +9,7 @@
  * Usage: node test-issue-1699-retransmission-chart.js
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -40,7 +41,7 @@ ctx.document = {
   getElementById: () => null,
 };
 vm.createContext(ctx);
-vm.runInContext(fs.readFileSync(path.join(__dirname, 'public/analytics.js'), 'utf8'), ctx);
+vm.runInContext(fs.readFileSync(path.join(REPO_ROOT, 'public/analytics.js'), 'utf8'), ctx);
 
 const bucketFor = ctx._analyticsRetransmissionBucketFor;
 const render = ctx._analyticsRenderRetransmissionChart;
diff --git a/test-issue-1705-subpath-contrast.js b/tests/unit/test-issue-1705-subpath-contrast.js
similarity index 100%
rename from test-issue-1705-subpath-contrast.js
rename to tests/unit/test-issue-1705-subpath-contrast.js
diff --git a/test-issue-1753-copy-url-slash.js b/tests/unit/test-issue-1753-copy-url-slash.js
similarity index 94%
rename from test-issue-1753-copy-url-slash.js
rename to tests/unit/test-issue-1753-copy-url-slash.js
index 9efcd1c6..12a68e8c 100644
--- a/test-issue-1753-copy-url-slash.js
+++ b/tests/unit/test-issue-1753-copy-url-slash.js
@@ -14,6 +14,7 @@
  * Reverting the fix (dropping the leading '/') re-introduces the failure.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
@@ -24,7 +25,7 @@ function test(name, fn) {
   catch (e) { failed++; console.log('  ❌ ' + name + ': ' + e.message); }
 }
 
-const src = fs.readFileSync(path.join(__dirname, 'public/nodes.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public/nodes.js'), 'utf8');
 
 // Match: location.origin + '<literal>'  (single or double quotes)
 const re = /location\.origin\s*\+\s*(['"])([^'"]*)\1/g;
diff --git a/test-issue-1770-mobile-row-clamp.js b/tests/unit/test-issue-1770-mobile-row-clamp.js
similarity index 96%
rename from test-issue-1770-mobile-row-clamp.js
rename to tests/unit/test-issue-1770-mobile-row-clamp.js
index a1015e8a..c14e0949 100644
--- a/test-issue-1770-mobile-row-clamp.js
+++ b/tests/unit/test-issue-1770-mobile-row-clamp.js
@@ -16,6 +16,7 @@
  * Pattern borrowed from test-issue-1364-pill-no-clamp.js.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -26,7 +27,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const cssSrc = fs.readFileSync(path.join(__dirname, 'public', 'style.css'), 'utf8');
+const cssSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'style.css'), 'utf8');
 
 // Pull the existing mobile breakpoint block. The packets-table mobile
 // overrides (.data-table font-size, .data-table td max-width, etc.) live
diff --git a/test-issue-1789-observer-firmware-cols.js b/tests/unit/test-issue-1789-observer-firmware-cols.js
similarity index 97%
rename from test-issue-1789-observer-firmware-cols.js
rename to tests/unit/test-issue-1789-observer-firmware-cols.js
index 3190b2f8..5e1dc0ea 100644
--- a/test-issue-1789-observer-firmware-cols.js
+++ b/tests/unit/test-issue-1789-observer-firmware-cols.js
@@ -13,12 +13,13 @@
  * Static-source test (like test-observers-headings.js) — no server needed.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const src = fs.readFileSync(path.join(__dirname, 'public', 'observers.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'observers.js'), 'utf8');
 
 let passed = 0, failed = 0;
 function test(name, fn) {
diff --git a/test-issue-1825-observer-node-cross-links.js b/tests/unit/test-issue-1825-observer-node-cross-links.js
similarity index 94%
rename from test-issue-1825-observer-node-cross-links.js
rename to tests/unit/test-issue-1825-observer-node-cross-links.js
index dbb4f6b3..b5541b5f 100644
--- a/test-issue-1825-observer-node-cross-links.js
+++ b/tests/unit/test-issue-1825-observer-node-cross-links.js
@@ -12,6 +12,7 @@
  * Static-source test (grep the file text). No server, no DOM.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -25,8 +26,8 @@ function test(name, fn) {
 
 console.log('\u2500\u2500 Observer <-> Node cross-links (#1825) \u2500\u2500');
 
-const obsSrc = fs.readFileSync(path.join(__dirname, 'public', 'observer-detail.js'), 'utf8');
-const nodesSrc = fs.readFileSync(path.join(__dirname, 'public', 'nodes.js'), 'utf8');
+const obsSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'observer-detail.js'), 'utf8');
+const nodesSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'nodes.js'), 'utf8');
 
 // Note: #1836 introduced case-normalization on these hrefs (currentId →
 // currentId.toLowerCase(), n.public_key → n.public_key.toUpperCase()). The
diff --git a/test-issue-1833-legend-toggle-vcr-offset.js b/tests/unit/test-issue-1833-legend-toggle-vcr-offset.js
similarity index 96%
rename from test-issue-1833-legend-toggle-vcr-offset.js
rename to tests/unit/test-issue-1833-legend-toggle-vcr-offset.js
index 00d99b5b..0090d705 100644
--- a/test-issue-1833-legend-toggle-vcr-offset.js
+++ b/tests/unit/test-issue-1833-legend-toggle-vcr-offset.js
@@ -11,10 +11,11 @@
  * Run: node test-issue-1833-legend-toggle-vcr-offset.js
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const path = require('path');
 
-const cssPath = path.join(__dirname, 'public', 'live.css');
+const cssPath = path.join(REPO_ROOT, 'public', 'live.css');
 const css = fs.readFileSync(cssPath, 'utf8');
 
 let passed = 0, failed = 0;
diff --git a/test-issue-1836-crossnav-case-normalization.js b/tests/unit/test-issue-1836-crossnav-case-normalization.js
similarity index 89%
rename from test-issue-1836-crossnav-case-normalization.js
rename to tests/unit/test-issue-1836-crossnav-case-normalization.js
index d7bf6001..662f42fb 100644
--- a/test-issue-1836-crossnav-case-normalization.js
+++ b/tests/unit/test-issue-1836-crossnav-case-normalization.js
@@ -11,6 +11,7 @@
  * Static-source test (grep the file text). No server, no DOM.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -24,8 +25,8 @@ function test(name, fn) {
 
 console.log('\u2500\u2500 Cross-nav case normalization (#1836) \u2500\u2500');
 
-const obsSrc = fs.readFileSync(path.join(__dirname, 'public', 'observer-detail.js'), 'utf8');
-const nodesSrc = fs.readFileSync(path.join(__dirname, 'public', 'nodes.js'), 'utf8');
+const obsSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'observer-detail.js'), 'utf8');
+const nodesSrc = fs.readFileSync(path.join(REPO_ROOT, 'public', 'nodes.js'), 'utf8');
 
 test('observer-detail.js observer→node href lowercases currentId', () => {
   assert.ok(
diff --git a/test-issue-1843-node-qr-quiet-zone.js b/tests/unit/test-issue-1843-node-qr-quiet-zone.js
similarity index 95%
rename from test-issue-1843-node-qr-quiet-zone.js
rename to tests/unit/test-issue-1843-node-qr-quiet-zone.js
index e0a4b4aa..3144ba6b 100644
--- a/test-issue-1843-node-qr-quiet-zone.js
+++ b/tests/unit/test-issue-1843-node-qr-quiet-zone.js
@@ -15,6 +15,7 @@
  * all dark modules at least that far from the SVG edge.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -32,7 +33,7 @@ function ok(cond, msg) {
 }
 
 // --- (a) Source-grep: both createSvgTag call sites in nodes.js use margin >= 12 ---
-const nodesSrc = fs.readFileSync(path.join(__dirname, 'public/nodes.js'), 'utf8');
+const nodesSrc = fs.readFileSync(path.join(REPO_ROOT, 'public/nodes.js'), 'utf8');
 const callRe = /createSvgTag\(\s*(\d+)\s*,\s*(\d+)\s*\)/g;
 const calls = [];
 let m;
@@ -53,7 +54,7 @@ sandbox.window = sandbox;
 sandbox.self = sandbox;
 vm.createContext(sandbox);
 vm.runInContext(
-  fs.readFileSync(path.join(__dirname, 'public/vendor/qrcode.js'), 'utf8'),
+  fs.readFileSync(path.join(REPO_ROOT, 'public/vendor/qrcode.js'), 'utf8'),
   sandbox,
 );
 const qrcode = sandbox.window.qrcode || sandbox.qrcode;
diff --git a/test-issue-1846-observers-width.js b/tests/unit/test-issue-1846-observers-width.js
similarity index 94%
rename from test-issue-1846-observers-width.js
rename to tests/unit/test-issue-1846-observers-width.js
index 97423092..af178850 100644
--- a/test-issue-1846-observers-width.js
+++ b/tests/unit/test-issue-1846-observers-width.js
@@ -16,11 +16,12 @@
  * updating this test.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 
-const css = fs.readFileSync(path.join(__dirname, 'public', 'style.css'), 'utf8');
+const css = fs.readFileSync(path.join(REPO_ROOT, 'public', 'style.css'), 'utf8');
 
 let passed = 0, failed = 0;
 function assert(cond, msg) {
diff --git a/test-issue-1849-trace-hashbytes.js b/tests/unit/test-issue-1849-trace-hashbytes.js
similarity index 100%
rename from test-issue-1849-trace-hashbytes.js
rename to tests/unit/test-issue-1849-trace-hashbytes.js
diff --git a/test-issue-1851-channel-message-scope.js b/tests/unit/test-issue-1851-channel-message-scope.js
similarity index 100%
rename from test-issue-1851-channel-message-scope.js
rename to tests/unit/test-issue-1851-channel-message-scope.js
diff --git a/test-issue-1862-map-region-filter.js b/tests/unit/test-issue-1862-map-region-filter.js
similarity index 100%
rename from test-issue-1862-map-region-filter.js
rename to tests/unit/test-issue-1862-map-region-filter.js
diff --git a/test-issue-1868-control-decode.js b/tests/unit/test-issue-1868-control-decode.js
similarity index 100%
rename from test-issue-1868-control-decode.js
rename to tests/unit/test-issue-1868-control-decode.js
diff --git a/test-issue-1890-og-url.js b/tests/unit/test-issue-1890-og-url.js
similarity index 94%
rename from test-issue-1890-og-url.js
rename to tests/unit/test-issue-1890-og-url.js
index 8db009a2..f3608f8d 100644
--- a/test-issue-1890-og-url.js
+++ b/tests/unit/test-issue-1890-og-url.js
@@ -14,12 +14,13 @@
  * redirect target.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const INDEX = path.resolve(__dirname, 'public', 'index.html');
+const INDEX = path.resolve(REPO_ROOT, 'public', 'index.html');
 const html = fs.readFileSync(INDEX, 'utf8');
 
 let passed = 0, failed = 0;
diff --git a/test-issue-1956-release-routing.js b/tests/unit/test-issue-1956-release-routing.js
similarity index 99%
rename from test-issue-1956-release-routing.js
rename to tests/unit/test-issue-1956-release-routing.js
index fc725883..e5ab4bab 100644
--- a/test-issue-1956-release-routing.js
+++ b/tests/unit/test-issue-1956-release-routing.js
@@ -1,3 +1,4 @@
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 // Run the real release shell steps with registry/dispatch commands stubbed out.
 // No GitHub writes or container builds: node test-issue-1956-release-routing.js
 const assert = require('node:assert/strict');
@@ -7,7 +8,7 @@ const path = require('node:path');
 const vm = require('node:vm');
 const { spawnSync } = require('node:child_process');
 
-const read = name => fs.readFileSync(path.join(__dirname, '.github/workflows', name), 'utf8').replace(/\r/g, '');
+const read = name => fs.readFileSync(path.join(REPO_ROOT, '.github/workflows', name), 'utf8').replace(/\r/g, '');
 const fast = read('release-fast-path.yml');
 const deploy = read('deploy.yml');
 let bash = process.env.BASH_PATH || 'bash';
diff --git a/test-issue-1979-scope-adverts-by-role.js b/tests/unit/test-issue-1979-scope-adverts-by-role.js
similarity index 100%
rename from test-issue-1979-scope-adverts-by-role.js
rename to tests/unit/test-issue-1979-scope-adverts-by-role.js
diff --git a/test-issue-2001-map-scope-state.js b/tests/unit/test-issue-2001-map-scope-state.js
similarity index 100%
rename from test-issue-2001-map-scope-state.js
rename to tests/unit/test-issue-2001-map-scope-state.js
diff --git a/test-issue-2012-clear-filters-selection.js b/tests/unit/test-issue-2012-clear-filters-selection.js
similarity index 98%
rename from test-issue-2012-clear-filters-selection.js
rename to tests/unit/test-issue-2012-clear-filters-selection.js
index 06c37df6..19bc00d2 100644
--- a/test-issue-2012-clear-filters-selection.js
+++ b/tests/unit/test-issue-2012-clear-filters-selection.js
@@ -15,6 +15,7 @@
  * checkbox objects.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const assert = require('assert');
 
@@ -26,7 +27,7 @@ function test(name, fn) {
   catch (e) { failed++; console.log(`  ❌ ${name}: ${e.message}`); }
 }
 
-const src = fs.readFileSync(__dirname + '/public/packets.js', 'utf-8');
+const src = fs.readFileSync(REPO_ROOT + '/public/packets.js', 'utf-8');
 function slice(startMarker, endMarker) {
   const start = src.indexOf(startMarker);
   assert(start !== -1, 'marker not found in packets.js: ' + startMarker);
diff --git a/test-live-anims.js b/tests/unit/test-live-anims.js
similarity index 100%
rename from test-live-anims.js
rename to tests/unit/test-live-anims.js
diff --git a/test-live-dt-cap-1524.js b/tests/unit/test-live-dt-cap-1524.js
similarity index 100%
rename from test-live-dt-cap-1524.js
rename to tests/unit/test-live-dt-cap-1524.js
diff --git a/test-live-legend-helper.js b/tests/unit/test-live-legend-helper.js
similarity index 100%
rename from test-live-legend-helper.js
rename to tests/unit/test-live-legend-helper.js
diff --git a/test-live-multibyte-filter.js b/tests/unit/test-live-multibyte-filter.js
similarity index 95%
rename from test-live-multibyte-filter.js
rename to tests/unit/test-live-multibyte-filter.js
index 1cc2e896..fcf01baf 100644
--- a/test-live-multibyte-filter.js
+++ b/tests/unit/test-live-multibyte-filter.js
@@ -4,6 +4,7 @@
  *   hashSize = (pathByte >> 6) + 1, pathByte at offset 5 (transport) else 1.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
@@ -25,7 +26,7 @@ function load() {
   };
   ctx.window.localStorage = ctx.localStorage;
   vm.createContext(ctx);
-  const src = fs.readFileSync(path.join(__dirname, 'public/hop-filter.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public/hop-filter.js'), 'utf8');
   vm.runInContext(src, ctx, { filename: 'hop-filter.js' });
   return ctx.module.exports.packetHashSize;
 }
diff --git a/test-live-region-filter.js b/tests/unit/test-live-region-filter.js
similarity index 100%
rename from test-live-region-filter.js
rename to tests/unit/test-live-region-filter.js
diff --git a/test-live.js b/tests/unit/test-live.js
similarity index 99%
rename from test-live.js
rename to tests/unit/test-live.js
index fe6cb601..7b104319 100644
--- a/test-live.js
+++ b/tests/unit/test-live.js
@@ -2,6 +2,7 @@
  * Part of #344 — live.js coverage
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const assert = require('assert');
@@ -319,7 +320,7 @@ console.log('\n=== live.js: expandToBufferEntriesAsync ===');
   });
 
   test('VCR_CHUNK_SIZE is defined and async function yields via setTimeout', () => {
-    const src = fs.readFileSync(__dirname + '/public/live.js', 'utf8');
+    const src = fs.readFileSync(REPO_ROOT + '/public/live.js', 'utf8');
     assert.ok(src.includes('VCR_CHUNK_SIZE'), 'VCR_CHUNK_SIZE constant must exist');
     assert.ok(src.includes('expandToBufferEntriesAsync'), 'async version must exist');
     assert.ok(src.includes('setTimeout(processChunk, 0)'), 'must yield via setTimeout between chunks');
diff --git a/test-map-clustering.js b/tests/unit/test-map-clustering.js
similarity index 100%
rename from test-map-clustering.js
rename to tests/unit/test-map-clustering.js
diff --git a/test-mqtt-status-panel.js b/tests/unit/test-mqtt-status-panel.js
similarity index 98%
rename from test-mqtt-status-panel.js
rename to tests/unit/test-mqtt-status-panel.js
index 056d3962..b407adc4 100644
--- a/test-mqtt-status-panel.js
+++ b/tests/unit/test-mqtt-status-panel.js
@@ -12,6 +12,7 @@
  *   - no plaintext password appears in the rendered HTML
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -23,7 +24,7 @@ function test(name, fn) {
   catch (e) { failed++; console.log(`  ❌ ${name}: ${e.message}`); }
 }
 
-const src = fs.readFileSync(require('path').resolve(__dirname, 'public/mqtt-status-panel.js'), 'utf8');
+const src = fs.readFileSync(require('path').resolve(REPO_ROOT, 'public/mqtt-status-panel.js'), 'utf8');
 const ctx = {
   window: {},
   module: { exports: {} },
diff --git a/test-my-repeaters-dashboard.js b/tests/unit/test-my-repeaters-dashboard.js
similarity index 98%
rename from test-my-repeaters-dashboard.js
rename to tests/unit/test-my-repeaters-dashboard.js
index 19b5c563..30664a57 100644
--- a/test-my-repeaters-dashboard.js
+++ b/tests/unit/test-my-repeaters-dashboard.js
@@ -12,6 +12,7 @@
  *    review fixes (escaping, status a11y text, fetch-once caching).
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -22,8 +23,8 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const a = fs.readFileSync(path.join(__dirname, 'public', 'analytics.js'), 'utf8');
-const app = fs.readFileSync(path.join(__dirname, 'public', 'app.js'), 'utf8');
+const a = fs.readFileSync(path.join(REPO_ROOT, 'public', 'analytics.js'), 'utf8');
+const app = fs.readFileSync(path.join(REPO_ROOT, 'public', 'app.js'), 'utf8');
 
 console.log('\n=== tab wiring + dropdown shortcut (structural) ===');
 assert(/data-tab="my-repeaters"[^>]*>\s*My Repeaters\s*</.test(a), 'tab bar has a "My Repeaters" button');
diff --git a/test-naive-banner-tone.js b/tests/unit/test-naive-banner-tone.js
similarity index 95%
rename from test-naive-banner-tone.js
rename to tests/unit/test-naive-banner-tone.js
index 6beb16b9..8c9991ea 100644
--- a/test-naive-banner-tone.js
+++ b/tests/unit/test-naive-banner-tone.js
@@ -1,5 +1,6 @@
 /* Test: naive-clock banner should be a small neutral notice, not a scary alert card */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const assert = require('assert');
@@ -11,7 +12,7 @@ function test(name, fn) {
 }
 
 // Load observer-detail.js in a VM sandbox
-const src = fs.readFileSync(__dirname + '/public/observer-detail.js', 'utf8');
+const src = fs.readFileSync(REPO_ROOT + '/public/observer-detail.js', 'utf8');
 const window = {};
 const ctx = vm.createContext({ window, document: { getElementById: () => null, querySelector: () => null, querySelectorAll: () => [], createElement: () => ({ style: {}, classList: { add(){}, remove(){} }, appendChild(){}, setAttribute(){} }), createDocumentFragment: () => ({ appendChild(){} }) }, console, setTimeout, setInterval, clearInterval, fetch: () => Promise.resolve({ ok: true, json: () => Promise.resolve({}) }), location: { hash: '' }, history: { replaceState() {} }, Chart: function() { return { destroy(){}, update(){} }; }, registerPage() {}, L: { map(){ return { setView(){ return this; }, on(){ return this; }, remove(){} }; }, tileLayer(){ return { addTo(){} }; } } });
 vm.runInContext(src, ctx);
diff --git a/test-node-hop-analytics.js b/tests/unit/test-node-hop-analytics.js
similarity index 96%
rename from test-node-hop-analytics.js
rename to tests/unit/test-node-hop-analytics.js
index b5c7972c..98eb0751 100644
--- a/test-node-hop-analytics.js
+++ b/tests/unit/test-node-hop-analytics.js
@@ -1,4 +1,5 @@
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 // Issue #1812: hop count at this node, node analytics page. Loads the browser
 // IIFE in a vm sandbox (pattern from test-node-reach-coverage.js) and exercises
 // the filter, histogram, box statistics and section render.
@@ -7,7 +8,7 @@ const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
 
-const code = fs.readFileSync(path.join(__dirname, 'public', 'node-hop-analytics.js'), 'utf8');
+const code = fs.readFileSync(path.join(REPO_ROOT, 'public', 'node-hop-analytics.js'), 'utf8');
 const sandbox = { window: {}, console };
 vm.createContext(sandbox);
 vm.runInContext(code, sandbox);
diff --git a/test-node-reach-coverage-debounce.js b/tests/unit/test-node-reach-coverage-debounce.js
similarity index 95%
rename from test-node-reach-coverage-debounce.js
rename to tests/unit/test-node-reach-coverage-debounce.js
index 3299e904..c1184fb9 100644
--- a/test-node-reach-coverage-debounce.js
+++ b/tests/unit/test-node-reach-coverage-debounce.js
@@ -1,4 +1,5 @@
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 // Unit test for #6: pan/zoom coverage redraws must be debounced so dragging the
 // map fires at most one /api/...rx-coverage request per settle, not one per
 // moveend. We load node-reach-coverage.js in a vm sandbox with controllable
@@ -9,7 +10,7 @@ const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
 
-const code = fs.readFileSync(path.join(__dirname, 'public', 'node-reach-coverage.js'), 'utf8');
+const code = fs.readFileSync(path.join(REPO_ROOT, 'public', 'node-reach-coverage.js'), 'utf8');
 
 // Controllable timer queue.
 let now = 0;
diff --git a/test-node-reach-coverage.js b/tests/unit/test-node-reach-coverage.js
similarity index 94%
rename from test-node-reach-coverage.js
rename to tests/unit/test-node-reach-coverage.js
index ab8afcf6..c9b8a3b9 100644
--- a/test-node-reach-coverage.js
+++ b/tests/unit/test-node-reach-coverage.js
@@ -1,4 +1,5 @@
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 // Unit test for node-reach-coverage.js color buckets. Loads the browser IIFE in
 // a vm sandbox (pattern from test-frontend-helpers.js) and exercises the pure
 // coverageColorVar mapping.
@@ -7,7 +8,7 @@ const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
 
-const code = fs.readFileSync(path.join(__dirname, 'public', 'node-reach-coverage.js'), 'utf8');
+const code = fs.readFileSync(path.join(REPO_ROOT, 'public', 'node-reach-coverage.js'), 'utf8');
 const sandbox = { window: {}, document: {}, getComputedStyle: function () { return { getPropertyValue: function () { return ''; } }; } };
 vm.createContext(sandbox);
 vm.runInContext(code, sandbox);
diff --git a/test-nodes-export-wiring.js b/tests/unit/test-nodes-export-wiring.js
similarity index 92%
rename from test-nodes-export-wiring.js
rename to tests/unit/test-nodes-export-wiring.js
index 1f757a05..0ec392cc 100644
--- a/test-nodes-export-wiring.js
+++ b/tests/unit/test-nodes-export-wiring.js
@@ -7,6 +7,7 @@
  * test-nodes-export.js, DOM behavior in test-nodes-export-e2e.js.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -18,8 +19,8 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const html = fs.readFileSync(path.join(__dirname, 'public/index.html'), 'utf8');
-const src = fs.readFileSync(path.join(__dirname, 'public/nodes.js'), 'utf8');
+const html = fs.readFileSync(path.join(REPO_ROOT, 'public/index.html'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public/nodes.js'), 'utf8');
 
 console.log('\n=== nodes-export.js is loaded by the SPA shell ===');
 assert(/<script src="nodes-export\.js\?v=__BUST__"/.test(html),
diff --git a/test-nodes-export.js b/tests/unit/test-nodes-export.js
similarity index 97%
rename from test-nodes-export.js
rename to tests/unit/test-nodes-export.js
index 48e6b4e4..fb6fb99e 100644
--- a/test-nodes-export.js
+++ b/tests/unit/test-nodes-export.js
@@ -1,4 +1,5 @@
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 // Unit test for nodes-export.js — the MeshCore companion "contacts" JSON export
 // of the visible node list. Loads the browser IIFE in a vm sandbox (pattern from
 // test-node-reach-coverage.js) and exercises the pure mapping helpers.
@@ -7,7 +8,7 @@ const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
 
-const code = fs.readFileSync(path.join(__dirname, 'public', 'nodes-export.js'), 'utf8');
+const code = fs.readFileSync(path.join(REPO_ROOT, 'public', 'nodes-export.js'), 'utf8');
 const sandbox = { window: {}, document: {} };
 vm.createContext(sandbox);
 vm.runInContext(code, sandbox);
diff --git a/test-observer-iata-1188.js b/tests/unit/test-observer-iata-1188.js
similarity index 98%
rename from test-observer-iata-1188.js
rename to tests/unit/test-observer-iata-1188.js
index a46f0c43..7a05141e 100644
--- a/test-observer-iata-1188.js
+++ b/tests/unit/test-observer-iata-1188.js
@@ -12,6 +12,7 @@
  * Runs in Node.js — no browser, no jsdom required.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
@@ -22,7 +23,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  \u274c ' + msg); }
 }
 
-const src = fs.readFileSync(path.join(__dirname, 'public/packets.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public/packets.js'), 'utf8');
 
 // ── Extract obsIataBadge source. Function spans a small, bounded block. ──
 // We capture everything from the `function obsIataBadge` keyword up to and
diff --git a/test-observer-menu-interactions.js b/tests/unit/test-observer-menu-interactions.js
similarity index 98%
rename from test-observer-menu-interactions.js
rename to tests/unit/test-observer-menu-interactions.js
index e8fb2cfc..7696685a 100644
--- a/test-observer-menu-interactions.js
+++ b/tests/unit/test-observer-menu-interactions.js
@@ -10,6 +10,7 @@
  *  3. The dropdown must not autofocus the search box on touch devices.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const assert = require('assert');
@@ -22,7 +23,7 @@ function test(name, fn) {
   catch (e) { failed++; console.log(`  ❌ ${name}: ${e.message}`); }
 }
 
-const SRC = fs.readFileSync(__dirname + '/public/packets.js', 'utf-8');
+const SRC = fs.readFileSync(REPO_ROOT + '/public/packets.js', 'utf-8');
 
 /**
  * Extract the source between a marker ending in "{" and its matching "}".
diff --git a/test-observer-naive-clock-1478.js b/tests/unit/test-observer-naive-clock-1478.js
similarity index 100%
rename from test-observer-naive-clock-1478.js
rename to tests/unit/test-observer-naive-clock-1478.js
diff --git a/test-observer-search-filter.js b/tests/unit/test-observer-search-filter.js
similarity index 97%
rename from test-observer-search-filter.js
rename to tests/unit/test-observer-search-filter.js
index ddcdc27d..6e7e0c9f 100644
--- a/test-observer-search-filter.js
+++ b/tests/unit/test-observer-search-filter.js
@@ -3,6 +3,7 @@
  * not source-grep tautology.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const vm = require('vm');
 const fs = require('fs');
@@ -20,7 +21,7 @@ function test(name, fn) {
  * Extract the applyObserverSearchFilter function body from packets.js.
  */
 function extractApplyObserverSearchFilter() {
-  const src = fs.readFileSync(__dirname + '/public/packets.js', 'utf-8');
+  const src = fs.readFileSync(REPO_ROOT + '/public/packets.js', 'utf-8');
   const marker = 'function applyObserverSearchFilter()';
   const idx = src.indexOf(marker);
   assert(idx !== -1, 'applyObserverSearchFilter not found in packets.js');
diff --git a/test-observers-headings.js b/tests/unit/test-observers-headings.js
similarity index 95%
rename from test-observers-headings.js
rename to tests/unit/test-observers-headings.js
index f980c002..825f0876 100644
--- a/test-observers-headings.js
+++ b/tests/unit/test-observers-headings.js
@@ -2,12 +2,13 @@
  * Asserts observer table thead column count matches tbody row column count.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-const src = fs.readFileSync(path.join(__dirname, 'public', 'observers.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'observers.js'), 'utf8');
 
 let passed = 0, failed = 0;
 function test(name, fn) {
diff --git a/test-packet-filter-time.js b/tests/unit/test-packet-filter-time.js
similarity index 100%
rename from test-packet-filter-time.js
rename to tests/unit/test-packet-filter-time.js
diff --git a/test-packet-filter-ux.js b/tests/unit/test-packet-filter-ux.js
similarity index 100%
rename from test-packet-filter-ux.js
rename to tests/unit/test-packet-filter-ux.js
diff --git a/test-packet-filter.js b/tests/unit/test-packet-filter.js
similarity index 100%
rename from test-packet-filter.js
rename to tests/unit/test-packet-filter.js
diff --git a/test-packets-local-channels.js b/tests/unit/test-packets-local-channels.js
similarity index 100%
rename from test-packets-local-channels.js
rename to tests/unit/test-packets-local-channels.js
diff --git a/test-packets.js b/tests/unit/test-packets.js
similarity index 100%
rename from test-packets.js
rename to tests/unit/test-packets.js
diff --git a/test-panel-corner.js b/tests/unit/test-panel-corner.js
similarity index 98%
rename from test-panel-corner.js
rename to tests/unit/test-panel-corner.js
index 22299b27..fd1af09f 100644
--- a/test-panel-corner.js
+++ b/tests/unit/test-panel-corner.js
@@ -3,6 +3,7 @@
  * Tests the pure logic functions extracted from live.js
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const assert = require('assert');
 const vm = require('vm');
@@ -98,7 +99,7 @@ function createContext() {
 function loadLiveModule(ctx) {
   // Load the REAL live.js in a VM context and return window._panelCorner.
   // This tests the actual code, not a copy (per AGENTS.md "test the real code, not copies").
-  const src = fs.readFileSync(path.join(__dirname, 'public', 'live.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'live.js'), 'utf8');
 
   // Minimal stubs for live.js dependencies (only what's needed to avoid errors)
   ctx.registerPage = () => {};
@@ -147,7 +148,7 @@ function loadLiveModule(ctx) {
   ctx.globalThis = ctx;
 
   vm.createContext(ctx);
-  vm.runInContext(fs.readFileSync(path.join(__dirname, 'public', 'payload-labels.js'), 'utf8'), ctx);
+  vm.runInContext(fs.readFileSync(path.join(REPO_ROOT, 'public', 'payload-labels.js'), 'utf8'), ctx);
   vm.runInContext(src, ctx, { timeout: 3000 });
   return ctx.window._panelCorner;
 }
diff --git a/test-path-inspector.js b/tests/unit/test-path-inspector.js
similarity index 96%
rename from test-path-inspector.js
rename to tests/unit/test-path-inspector.js
index 3d818b85..6dbda2d0 100644
--- a/test-path-inspector.js
+++ b/tests/unit/test-path-inspector.js
@@ -1,10 +1,11 @@
 // test-path-inspector.js — vm.createContext sandbox tests for path-inspector.js
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const assert = require('assert');
 
-const src = fs.readFileSync(__dirname + '/public/path-inspector.js', 'utf8');
+const src = fs.readFileSync(REPO_ROOT + '/public/path-inspector.js', 'utf8');
 
 function createSandbox() {
   const sandbox = {
diff --git a/test-payload-labels-content.js b/tests/unit/test-payload-labels-content.js
similarity index 100%
rename from test-payload-labels-content.js
rename to tests/unit/test-payload-labels-content.js
diff --git a/test-payload-labels-namespace.js b/tests/unit/test-payload-labels-namespace.js
similarity index 100%
rename from test-payload-labels-namespace.js
rename to tests/unit/test-payload-labels-namespace.js
diff --git a/test-perf-anomaly.js b/tests/unit/test-perf-anomaly.js
similarity index 100%
rename from test-perf-anomaly.js
rename to tests/unit/test-perf-anomaly.js
diff --git a/test-perf-disk-io-1120.js b/tests/unit/test-perf-disk-io-1120.js
similarity index 100%
rename from test-perf-disk-io-1120.js
rename to tests/unit/test-perf-disk-io-1120.js
diff --git a/test-perf-go-runtime.js b/tests/unit/test-perf-go-runtime.js
similarity index 100%
rename from test-perf-go-runtime.js
rename to tests/unit/test-perf-go-runtime.js
diff --git a/test-perf-render-1258.js b/tests/unit/test-perf-render-1258.js
similarity index 100%
rename from test-perf-render-1258.js
rename to tests/unit/test-perf-render-1258.js
diff --git a/test-preflight-xss-gate.js b/tests/unit/test-preflight-xss-gate.js
similarity index 94%
rename from test-preflight-xss-gate.js
rename to tests/unit/test-preflight-xss-gate.js
index 0d738916..0ac25856 100644
--- a/test-preflight-xss-gate.js
+++ b/tests/unit/test-preflight-xss-gate.js
@@ -16,12 +16,13 @@
 // Exit 1 on any assertion failure.
 
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const { spawnSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
-const SCRIPT = path.resolve(__dirname, 'scripts/check-xss-sinks.sh');
-const FIXTURE_DIR = path.resolve(__dirname, 'testdata/preflight-xss');
+const SCRIPT = path.resolve(REPO_ROOT, 'scripts/check-xss-sinks.sh');
+const FIXTURE_DIR = path.resolve(REPO_ROOT, 'testdata/preflight-xss');
 
 if (!fs.existsSync(SCRIPT)) {
   console.error(`FAIL: ${SCRIPT} missing`);
@@ -74,7 +75,7 @@ for (const c of cases) {
   }
   // The shell protocol uses ':' separators. Relative paths avoid Windows
   // drive-letter colons being mistaken for separators by its Python reader.
-  const tests = (c.tests || []).map(t => path.relative(__dirname, path.join(FIXTURE_DIR, t)));
+  const tests = (c.tests || []).map(t => path.relative(REPO_ROOT, path.join(FIXTURE_DIR, t)));
   const env = Object.assign({}, process.env);
   if (tests.length > 0) {
     env.PREFLIGHT_TEST_FILES = tests.join(':');
@@ -82,7 +83,7 @@ for (const c of cases) {
     delete env.PREFLIGHT_TEST_FILES;
   }
   const res = spawnSync('bash', [SCRIPT, '--file', target], {
-    cwd: __dirname,
+    cwd: REPO_ROOT,
     env,
     encoding: 'utf8',
   });
diff --git a/test-pull-to-reconnect-1091.js b/tests/unit/test-pull-to-reconnect-1091.js
similarity index 100%
rename from test-pull-to-reconnect-1091.js
rename to tests/unit/test-pull-to-reconnect-1091.js
diff --git a/test-pull-to-reconnect.js b/tests/unit/test-pull-to-reconnect.js
similarity index 100%
rename from test-pull-to-reconnect.js
rename to tests/unit/test-pull-to-reconnect.js
diff --git a/test-repeater-metric-scatter.js b/tests/unit/test-repeater-metric-scatter.js
similarity index 98%
rename from test-repeater-metric-scatter.js
rename to tests/unit/test-repeater-metric-scatter.js
index dbaa3c32..eb4557a8 100644
--- a/test-repeater-metric-scatter.js
+++ b/tests/unit/test-repeater-metric-scatter.js
@@ -14,6 +14,7 @@
  *    assert on the produced SVG — real behaviour, not "source contains X".
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -24,7 +25,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const src = fs.readFileSync(path.join(__dirname, 'public', 'analytics.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'analytics.js'), 'utf8');
 
 console.log('\n=== tab wiring (structural — not executable without a DOM) ===');
 assert(/data-tab="repeater-metrics"[^>]*>\s*Repeater Metrics\s*</.test(src),
diff --git a/test-rx-coverage-config-race.js b/tests/unit/test-rx-coverage-config-race.js
similarity index 93%
rename from test-rx-coverage-config-race.js
rename to tests/unit/test-rx-coverage-config-race.js
index 02631088..4de0fdce 100644
--- a/test-rx-coverage-config-race.js
+++ b/tests/unit/test-rx-coverage-config-race.js
@@ -1,4 +1,5 @@
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 // Unit test for #13: a direct land on #/rx-coverage must not read the coverage
 // feature flag before MeshConfigReady resolves. init() should defer its
 // enabled/disabled decision until the config promise settles, instead of
@@ -8,7 +9,7 @@ const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
 
-const code = fs.readFileSync(path.join(__dirname, 'public', 'rx-coverage.js'), 'utf8');
+const code = fs.readFileSync(path.join(REPO_ROOT, 'public', 'rx-coverage.js'), 'utf8');
 
 let page = null;
 let resolveConfig;
diff --git a/test-rx-coverage-escape.js b/tests/unit/test-rx-coverage-escape.js
similarity index 95%
rename from test-rx-coverage-escape.js
rename to tests/unit/test-rx-coverage-escape.js
index 746d002f..3046bdf2 100644
--- a/test-rx-coverage-escape.js
+++ b/tests/unit/test-rx-coverage-escape.js
@@ -1,4 +1,5 @@
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 // Unit test for #14: the mobile RX coverage leaderboard must HTML-escape the
 // pubkey it interpolates into the row markup (data-rx="..." and the truncated
 // fallback label), not only the name. A no-ACL broker / pre-validation rows
@@ -13,7 +14,7 @@ const fs = require('fs');
 const path = require('path');
 const vm = require('vm');
 
-const src = fs.readFileSync(path.join(__dirname, 'public', 'rx-coverage.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'rx-coverage.js'), 'utf8');
 
 // Slice from `var nm = o.name ...` through the end of the returned row string.
 const startMarker = 'var nm = o.name ? escapeHtml(o.name)';
diff --git a/test-scope-audit-styles-linked.js b/tests/unit/test-scope-audit-styles-linked.js
similarity index 100%
rename from test-scope-audit-styles-linked.js
rename to tests/unit/test-scope-audit-styles-linked.js
diff --git a/test-slideover-1056-rowsel-strict.js b/tests/unit/test-slideover-1056-rowsel-strict.js
similarity index 94%
rename from test-slideover-1056-rowsel-strict.js
rename to tests/unit/test-slideover-1056-rowsel-strict.js
index 24c83b31..9376e8c9 100644
--- a/test-slideover-1056-rowsel-strict.js
+++ b/tests/unit/test-slideover-1056-rowsel-strict.js
@@ -10,10 +10,11 @@
  * back in and re-introducing the 5% flake described in #1662.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const fs = require('fs');
 const path = require('path');
 
-const SRC = path.join(__dirname, 'test-slideover-1056-e2e.js');
+const SRC = path.join(REPO_ROOT, 'tests', 'e2e', 'test-slideover-1056-e2e.js');
 const src = fs.readFileSync(SRC, 'utf8');
 
 let passed = 0, failed = 0;
diff --git a/test-test-inventory.js b/tests/unit/test-test-inventory.js
similarity index 60%
rename from test-test-inventory.js
rename to tests/unit/test-test-inventory.js
index 81ff5f0f..c9fe8207 100644
--- a/test-test-inventory.js
+++ b/tests/unit/test-test-inventory.js
@@ -1,5 +1,6 @@
-/* Every root test must have one explicit home; adding a file cannot skip CI silently. */
+/* Every test under tests/unit and tests/e2e must have one explicit home; adding a file cannot skip CI silently. */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const assert = require('assert');
 const fs = require('fs');
@@ -17,33 +18,38 @@ function checkInventory(files, groups) {
     }
   }
   const missing = files.filter(file => !assigned.has(file));
-  assert.deepStrictEqual(missing, [], 'unclassified root tests: ' + missing.join(', '));
+  assert.deepStrictEqual(missing, [], 'unclassified tests: ' + missing.join(', '));
 }
 
 // Exercise the guard itself: omissions, stale paths, duplicate classifications,
 // and undocumented exclusions must fail, even when the rest of the list is valid.
 const unit = files => ({ reason: 'Standalone Node checks', files });
 assert.doesNotThrow(() => checkInventory(['test-a.js'], { unit: unit(['test-a.js']) }));
-assert.throws(() => checkInventory(['test-a.js', 'test-new.js'], { unit: unit(['test-a.js']) }), /unclassified root tests/);
+assert.throws(() => checkInventory(['test-a.js', 'test-new.js'], { unit: unit(['test-a.js']) }), /unclassified tests/);
 assert.throws(() => checkInventory(['test-a.js'], { unit: unit(['test-old.js']) }), /missing test/);
 assert.throws(() => checkInventory(['test-a.js'], { unit: unit(['test-a.js', 'test-a.js']) }), /more than once/);
 assert.throws(() => checkInventory(['test-a.js'], { unit: unit(['test-a.js']), browser: unit(['test-a.js']) }), /more than once/);
 assert.throws(() => checkInventory(['test-a.js'], { browser: { reason: '', files: ['test-a.js'] } }), /prerequisite\/reason/);
 
-const runner = fs.readFileSync(path.join(__dirname, 'test-all.sh'), 'utf8');
-const unitTests = Array.from(runner.matchAll(/^node (test-[^\s]+\.js)\s*$/gm), match => match[1]);
-const groups = JSON.parse(fs.readFileSync(path.join(__dirname, 'scripts', 'non-unit-tests.json'), 'utf8'));
+const runner = fs.readFileSync(path.join(REPO_ROOT, 'test-all.sh'), 'utf8');
+const unitTests = Array.from(runner.matchAll(/^node (tests\/[^\s]+\.js)\s*$/gm), match => match[1]);
+const groups = JSON.parse(fs.readFileSync(path.join(REPO_ROOT, 'scripts', 'non-unit-tests.json'), 'utf8'));
 assert.ok(!Object.prototype.hasOwnProperty.call(groups, 'unit'), 'unit tests belong only in test-all.sh');
-const files = fs.readdirSync(__dirname).filter(file => /^test-.*\.js$/.test(file)).sort();
+const isTest = file => /^test-.*\.js$/.test(file);
+const files = ['tests/unit', 'tests/e2e'].flatMap(dir =>
+  fs.readdirSync(path.join(REPO_ROOT, dir)).filter(isTest).map(file => dir + '/' + file)).sort();
+assert.deepStrictEqual(fs.readdirSync(REPO_ROOT).filter(isTest), [], 'tests belong in tests/unit or tests/e2e, not the repo root');
+for (const file of unitTests) assert.ok(file.startsWith('tests/unit/'), 'test-all.sh runs a suite outside tests/unit: ' + file);
+for (const spec of Object.values(groups)) for (const file of spec.files) assert.ok(file.startsWith('tests/e2e/'), 'non-unit suite outside tests/e2e: ' + file);
 checkInventory(files, { unit: unit(unitTests), ...groups });
 
-const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf8'));
+const pkg = JSON.parse(fs.readFileSync(path.join(REPO_ROOT, 'package.json'), 'utf8'));
 assert.strictEqual(pkg.scripts['test:unit'], 'sh test-all.sh', 'npm test:unit must use the authoritative runner');
 assert.ok(pkg.scripts.test.includes('sh test-all.sh'), 'npm test must use the authoritative runner');
 assert.ok(pkg.scripts['test:coverage'].includes('sh test-all.sh'), 'coverage must use the authoritative runner');
-const workflow = fs.readFileSync(path.join(__dirname, '.github', 'workflows', 'deploy.yml'), 'utf8');
+const workflow = fs.readFileSync(path.join(REPO_ROOT, '.github', 'workflows', 'deploy.yml'), 'utf8');
 const unitStep = workflow.match(/- name: Run JS unit tests[^\n]*\n([\s\S]*?)(?=\n      - name:)/);
 assert.ok(unitStep, 'CI must retain its JS unit-test step');
 assert.match(unitStep[1], /\bsh test-all\.sh\b/, 'CI must use the authoritative runner');
-assert.doesNotMatch(unitStep[1], /\bnode test-/, 'CI must not keep a second unit-test list');
-console.log('Test inventory: ' + files.length + ' root suites classified; ' + unitTests.length + ' run by local and CI unit checks.');
+assert.doesNotMatch(unitStep[1], /\bnode (tests\/unit\/)?test-/, 'CI must not keep a second unit-test list');
+console.log('Test inventory: ' + files.length + ' suites classified; ' + unitTests.length + ' run by local and CI unit checks.');
diff --git a/test-top-routes-overlay.js b/tests/unit/test-top-routes-overlay.js
similarity index 97%
rename from test-top-routes-overlay.js
rename to tests/unit/test-top-routes-overlay.js
index 76d48878..1bb1e8f2 100644
--- a/test-top-routes-overlay.js
+++ b/tests/unit/test-top-routes-overlay.js
@@ -12,6 +12,7 @@
  *    against fixtures and assert on importance, ordering, top-N and skips.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 
 const fs = require('fs');
 const path = require('path');
@@ -22,7 +23,7 @@ function assert(cond, msg) {
   else { failed++; console.error('  ✗ ' + msg); }
 }
 
-const src = fs.readFileSync(path.join(__dirname, 'public', 'map.js'), 'utf8');
+const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'map.js'), 'utf8');
 
 console.log('\n=== overlay wiring (structural — needs Leaflet/DOM) ===');
 assert(/id="mcTopRoutes"[^>]*>\s*<svg/.test(src) || /<input type="checkbox" id="mcTopRoutes">/.test(src),
diff --git a/test-traces.js b/tests/unit/test-traces.js
similarity index 100%
rename from test-traces.js
rename to tests/unit/test-traces.js
diff --git a/test-url-state.js b/tests/unit/test-url-state.js
similarity index 98%
rename from test-url-state.js
rename to tests/unit/test-url-state.js
index 371b3ae9..eb3ba411 100644
--- a/test-url-state.js
+++ b/tests/unit/test-url-state.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const URLState = require('./public/url-state.js');
+const URLState = require('../../public/url-state.js');
 
 let passed = 0, failed = 0;
 function test(name, fn) {
diff --git a/test-warmup-banner.js b/tests/unit/test-warmup-banner.js
similarity index 97%
rename from test-warmup-banner.js
rename to tests/unit/test-warmup-banner.js
index e1fd2f5f..ab93eeea 100644
--- a/test-warmup-banner.js
+++ b/tests/unit/test-warmup-banner.js
@@ -7,6 +7,7 @@
  * test-frontend-helpers.js. No Playwright needed for the FE-only contract.
  */
 'use strict';
+const REPO_ROOT = require('path').resolve(__dirname, '..', '..');
 const vm = require('vm');
 const fs = require('fs');
 const path = require('path');
@@ -27,7 +28,7 @@ async function test(name, fn) {
 function loadPureModule() {
   const ctx = { window: {}, module: { exports: {} }, console, Date };
   vm.createContext(ctx);
-  const src = fs.readFileSync(path.join(__dirname, 'public', 'warmup-banner.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'warmup-banner.js'), 'utf8');
   vm.runInContext(src, ctx);
   return ctx.window.__warmupBanner || ctx.module.exports;
 }
@@ -88,7 +89,7 @@ function bootDomSandbox(initialHealthz, initialHeader) {
   };
   ctx.window.fetch = ctx.fetch;
   vm.createContext(ctx);
-  const src = fs.readFileSync(path.join(__dirname, 'public', 'warmup-banner.js'), 'utf8');
+  const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'warmup-banner.js'), 'utf8');
   vm.runInContext(src, ctx);
   const sapi = ctx.window.__warmupBanner;
   return {
@@ -268,7 +269,7 @@ function bootDomSandbox(initialHealthz, initialHeader) {
     };
     ctx.window.fetch = baseFetch;
     vm.createContext(ctx);
-    const src = fs.readFileSync(path.join(__dirname, 'public', 'warmup-banner.js'), 'utf8');
+    const src = fs.readFileSync(path.join(REPO_ROOT, 'public', 'warmup-banner.js'), 'utf8');
     vm.runInContext(src, ctx);
     const a = ctx.window.__warmupBanner;
     // First install
diff --git a/test-ws-stale-watchdog-1074.js b/tests/unit/test-ws-stale-watchdog-1074.js
similarity index 100%
rename from test-ws-stale-watchdog-1074.js
rename to tests/unit/test-ws-stale-watchdog-1074.js
diff --git a/test-xss-escape-sinks.js b/tests/unit/test-xss-escape-sinks.js
similarity index 100%
rename from test-xss-escape-sinks.js
rename to tests/unit/test-xss-escape-sinks.js