diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 9f4d6847..4722c1bd 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -1,5 +1,8 @@
 name: Playwright Tests
 on:
+  pull_request:
+    branches: [main, master]
+
 jobs:
   test:
     timeout-minutes: 60
diff --git a/src/components/MemoryPreview/MemoryInfinite.tsx b/src/components/MemoryPreview/MemoryInfinite.tsx
index a0625975..a00aff73 100644
--- a/src/components/MemoryPreview/MemoryInfinite.tsx
+++ b/src/components/MemoryPreview/MemoryInfinite.tsx
@@ -73,7 +73,9 @@ export const MemoryCell = ({
     >
       {isEqualAcrossWorkers ? (
         <Tooltip delayDuration={100} open={isPageTooltipDisabled ? false : undefined}>
-          <TooltipTrigger>{valueToNumeralSystem(value, numeralSystem, numeralSystem ? 2 : 3, false)}</TooltipTrigger>
+          <TooltipTrigger data-test-id="memory-cell">
+            {valueToNumeralSystem(value, numeralSystem, numeralSystem ? 2 : 3, false)}
+          </TooltipTrigger>
 
           <TooltipPortal>
             <TooltipContent>
@@ -87,6 +89,7 @@ export const MemoryCell = ({
         <Tooltip delayDuration={0}>
           <TooltipTrigger asChild>
             <span
+              data-test-id="memory-cell"
               className="font-inconsolata"
               dangerouslySetInnerHTML={{
                 __html: numeralSystem ? "&quest;&#8288;&quest;&#8288;" : "&quest;&#8288;&quest;&#8288;&quest;&#8288;",
diff --git a/tests/memory-range.spec.ts b/tests/memory-range.spec.ts
index c632f3cb..0d19dd61 100644
--- a/tests/memory-range.spec.ts
+++ b/tests/memory-range.spec.ts
@@ -9,21 +9,15 @@ test("Should modify memory ranges", async ({ page }) => {
   await page.getByRole("tab", { name: "Ranges" }).click();
   await page.getByLabel("Start").click();
   await page.getByLabel("Start").fill("131072");
-  await page
-    .locator("div")
-    .filter({ hasText: /^StartLength$/ })
-    .getByRole("button")
-    .click();
+  await page.getByRole("button", { name: "Add" }).click();
 
-  await expect(page.locator("span > button").first()).toContainText("00");
-  await expect(page.locator("button:nth-child(2) > .relative > span > button").first()).toContainText("00");
+  await expect(page.locator("[data-test-id='memory-cell']").first()).toContainText("00", { timeout: 2000 });
+  await expect(page.locator("[data-test-id='memory-cell']").nth(1)).toContainText("00", { timeout: 2000 });
 
   await step(page);
 
-  await expect(page.locator("span > button").first()).toContainText("78", { timeout: 2000 });
-  await expect(page.locator("button:nth-child(2) > .relative > span > button").first()).toContainText("56", {
-    timeout: 20000,
-  });
+  await expect(page.locator("[data-test-id='memory-cell']").first()).toContainText("78", { timeout: 2000 });
+  await expect(page.locator("[data-test-id='memory-cell']").nth(1)).toContainText("56", { timeout: 2000 });
 });
 
 test("Should show interpretations", async ({ page }) => {
@@ -34,11 +28,7 @@ test("Should show interpretations", async ({ page }) => {
   await page.getByRole("tab", { name: "Ranges" }).click();
   await page.getByLabel("Start").click();
   await page.getByLabel("Start").fill("131072");
-  await page
-    .locator("div")
-    .filter({ hasText: /^StartLength$/ })
-    .getByRole("button")
-    .click();
+  await page.getByRole("button", { name: "Add" }).click();
 
   await step(page);
 
@@ -58,11 +48,7 @@ test("Should not show interpretations for longer memory chunks", async ({ page }
   await page.getByLabel("Length").click();
   await page.getByLabel("Length").fill("40");
 
-  await page
-    .locator("div")
-    .filter({ hasText: /^StartLength$/ })
-    .getByRole("button")
-    .click();
+  await page.getByRole("button", { name: "Add" }).click();
 
   await step(page);
 
@@ -81,11 +67,7 @@ test("Should show diffs between PVMs", async ({ page }) => {
   await page.getByLabel("Length").click();
   await page.getByLabel("Length").fill("40");
 
-  await page
-    .locator("div")
-    .filter({ hasText: /^StartLength$/ })
-    .getByRole("button")
-    .click();
+  await page.getByRole("button", { name: "Add" }).click();
 
   await step(page);