diff --git a/tests/ui/accessibility.spec.js b/tests/ui/a11y/accessibility.spec.js
similarity index 100%
rename from tests/ui/accessibility.spec.js
rename to tests/ui/a11y/accessibility.spec.js
diff --git a/tests/ui/auth.setup.js b/tests/ui/auth/auth.setup.js
similarity index 100%
rename from tests/ui/auth.setup.js
rename to tests/ui/auth/auth.setup.js
diff --git a/tests/ui/auth.spec.js b/tests/ui/auth/auth.spec.js
similarity index 100%
rename from tests/ui/auth.spec.js
rename to tests/ui/auth/auth.spec.js
diff --git a/tests/ui/dailies.spec.js b/tests/ui/dailies/dailies.spec.js
similarity index 100%
rename from tests/ui/dailies.spec.js
rename to tests/ui/dailies/dailies.spec.js
diff --git a/tests/ui/gpx-journey.spec.js b/tests/ui/gpx/gpx-journey.spec.js
similarity index 100%
rename from tests/ui/gpx-journey.spec.js
rename to tests/ui/gpx/gpx-journey.spec.js
diff --git a/tests/ui/home-highlights.spec.js b/tests/ui/home/home-highlights.spec.js
similarity index 97%
rename from tests/ui/home-highlights.spec.js
rename to tests/ui/home/home-highlights.spec.js
index ebbffe4..464eb4c 100644
--- a/tests/ui/home-highlights.spec.js
+++ b/tests/ui/home/home-highlights.spec.js
@@ -7,7 +7,7 @@ const { test, expect } = require('@playwright/test');
 const fs = require('fs');
 const path = require('path');
 
-const SITE_YAML_PATH = path.join(__dirname, '../../user/config/site.yaml');
+const SITE_YAML_PATH = path.join(__dirname, '../../../user/config/site.yaml');
 
 test.describe('Between-trips highlights mode', () => {
     let originalSiteYaml;
diff --git a/tests/ui/home.spec.js b/tests/ui/home/home.spec.js
similarity index 100%
rename from tests/ui/home.spec.js
rename to tests/ui/home/home.spec.js
diff --git a/tests/ui/maps.spec.js b/tests/ui/maps/maps.spec.js
similarity index 100%
rename from tests/ui/maps.spec.js
rename to tests/ui/maps/maps.spec.js
diff --git a/tests/ui/nav.spec.js b/tests/ui/nav/nav.spec.js
similarity index 100%
rename from tests/ui/nav.spec.js
rename to tests/ui/nav/nav.spec.js
diff --git a/tests/ui/post.spec.js b/tests/ui/post/post.spec.js
similarity index 99%
rename from tests/ui/post.spec.js
rename to tests/ui/post/post.spec.js
index af5b1df..b642961 100644
--- a/tests/ui/post.spec.js
+++ b/tests/ui/post/post.spec.js
@@ -4,7 +4,7 @@
 const { test, expect } = require('@playwright/test');
 const path = require('path');
 const fs = require('fs');
-const { waitForFilePondUpload, cleanupEntry, findEntry, readEntryMd, TRACKER_DIR } = require('./helpers');
+const { waitForFilePondUpload, cleanupEntry, findEntry, readEntryMd, TRACKER_DIR } = require('../helpers');
 
 const TEST_PHOTO = path.join(__dirname, '../fixtures/test-photo.jpg');
 
diff --git a/tests/ui/validation.spec.js b/tests/ui/post/validation.spec.js
similarity index 100%
rename from tests/ui/validation.spec.js
rename to tests/ui/post/validation.spec.js
diff --git a/tests/ui/stories.spec.js b/tests/ui/stories/stories.spec.js
similarity index 100%
rename from tests/ui/stories.spec.js
rename to tests/ui/stories/stories.spec.js
diff --git a/tests/ui/trip-filter.spec.js b/tests/ui/trip/trip-filter.spec.js
similarity index 100%
rename from tests/ui/trip-filter.spec.js
rename to tests/ui/trip/trip-filter.spec.js