diff --git a/playwright/component/audio-menu.spec.ts b/playwright/component/audio-menu.spec.ts
index f4d811598..3276c28a7 100644
--- a/playwright/component/audio-menu.spec.ts
+++ b/playwright/component/audio-menu.spec.ts
@@ -129,7 +129,7 @@ async function openDeviceList(page: Page, pane: Locator): Promise<Locator> {
     .getByRole("button", { name: "Microphone" })
     .click({ timeout: 60_000 });
   await expect(page.getByRole("menu")).toBeVisible();
-  const list = page.locator("[role='menu'] div[role='none']").first();
+  const list = page.getByRole("menu").getByTestId("device-list");
   await expect(list).toBeVisible();
   return list;
 }
diff --git a/src/components/MediaMuteAndSwitchButton.tsx b/src/components/MediaMuteAndSwitchButton.tsx
index 25342f001..cb2dbec39 100644
--- a/src/components/MediaMuteAndSwitchButton.tsx
+++ b/src/components/MediaMuteAndSwitchButton.tsx
@@ -345,6 +345,7 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
           // Keeps the items the menu's own children for assistive tech.
           role="none"
           className={styles.deviceList}
+          data-testid="device-list"
           style={
             {
               "--device-list-max-height":