diff --git a/src/spec/scenarios/copyValueToClipboard.ts b/src/spec/scenarios/copyValueToClipboard.ts
index 2cd3541..7b9bc67 100644
--- a/src/spec/scenarios/copyValueToClipboard.ts
+++ b/src/spec/scenarios/copyValueToClipboard.ts
@@ -2,6 +2,6 @@ import { Page } from 'playwright'
 import { clickOn } from '../util'
 
 export async function copyValueToClipboard(browser: Page) {
-  const copyButton = await browser.locator('//span[contains(text(), "Value")]//button')
+  const copyButton = await browser.getByRole('button', { name: 'Value' }).getByRole('button').first()
   await clickOn(copyButton, 1)
 }
diff --git a/src/spec/scenarios/showNumericPlot.ts b/src/spec/scenarios/showNumericPlot.ts
index 186ae63..3ad678e 100644
--- a/src/spec/scenarios/showNumericPlot.ts
+++ b/src/spec/scenarios/showNumericPlot.ts
@@ -45,12 +45,12 @@ export async function showNumericPlot(browser: Page) {
 async function valuePreviewGuttersShowChartIcon(name: string, browser: Page) {
   for (let retries = 0; retries < 2; retries += 1) {
     try {
-      return await browser.locator(`//*[contains(@data-test-type, "ShowChart")][contains(@data-test, "${name}")]`)
+      return await browser.locator(`//*[contains(@data-test-type, "ShowChart")][contains(@data-test, "${name}")]`).first()
     } catch {
       // ignore
     }
   }
-  return browser.locator(`//*[contains(@data-test-type, "ShowChart")][contains(@data-test, "${name}")]`)
+  return browser.locator(`//*[contains(@data-test-type, "ShowChart")][contains(@data-test, "${name}")]`).first()
 }
 
 async function chartSettings(name: string, browser: Page) {