diff --git a/js/testHarness.js b/js/testHarness.js
index b2e5052a..c905fbc4 100644
--- a/js/testHarness.js
+++ b/js/testHarness.js
@@ -472,7 +472,9 @@ function getAppState() {
 function getFeedItems() {
   const cards = document.querySelectorAll("[data-video-card]");
   return Array.from(cards).map((card) => ({
-    title: card.querySelector("[data-video-title]")?.textContent?.trim() || "",
+    title:
+      card.querySelector("[data-video-title]")?.getAttribute("data-video-title") ||
+      "",
     pubkey: card.getAttribute("data-video-pubkey") || "",
     dTag: card.getAttribute("data-video-dtag") || "",
     hasUrl: Boolean(card.getAttribute("data-play-url")),
diff --git a/tests/e2e/video-playback-scenarios.spec.ts b/tests/e2e/video-playback-scenarios.spec.ts
index 800c3e81..f2c0eeb4 100644
--- a/tests/e2e/video-playback-scenarios.spec.ts
+++ b/tests/e2e/video-playback-scenarios.spec.ts
@@ -215,6 +215,7 @@ test.describe("Video playback scenarios", () => {
             if (!modal) return true;
             return (
               modal.classList.contains("hidden") ||
+              modal.style.display === "none" ||
               modal.getAttribute("data-open") === "false"
             );
           },
diff --git a/tests/e2e/video-upload-flow.spec.ts b/tests/e2e/video-upload-flow.spec.ts
index bb42aedc..15ec9e7c 100644
--- a/tests/e2e/video-upload-flow.spec.ts
+++ b/tests/e2e/video-upload-flow.spec.ts
@@ -31,14 +31,7 @@ test.describe("Video upload and discovery", () => {
 
       // Then: upload modal becomes visible with expected form fields
       const modal = page.locator('[data-testid="upload-modal"]');
-      await page.waitForFunction(() => {
-        const m = document.querySelector('[data-testid="upload-modal"]');
-        if (!(m instanceof HTMLElement)) return false;
-        return (
-          m.getAttribute("data-open") === "true" &&
-          !m.classList.contains("hidden")
-        );
-      }, { timeout: 10000 });
+      await expect(modal).toBeVisible({ timeout: 10000 });
 
       await expect(
         page.locator('[data-testid="upload-title"]'),
@@ -204,7 +197,8 @@ test.describe("Video upload and discovery", () => {
       const card = page.locator("[data-video-card]").first();
       await expect(card).toBeVisible();
 
-      const title = await card.getAttribute("data-video-title");
+      const titleEl = card.locator("[data-video-title]");
+      const title = await titleEl.getAttribute("data-video-title");
       expect(title).toBe("Attributed Video");
 
       const pubkey = await card.getAttribute("data-video-pubkey");