diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelDataAssertion.spec.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelDataAssertion.spec.ts
index d6135f30a7e..29bd1b834dc 100644
--- a/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelDataAssertion.spec.ts
+++ b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelDataAssertion.spec.ts
@@ -1,4 +1,4 @@
-import { expect, test, DashboardPage } from '@grafana/plugin-e2e';
+import { expect, test } from '@grafana/plugin-e2e';
 
 import { formatExpectError } from '../errors';
 import { successfulDataQuery } from '../mocks/queries';
@@ -71,7 +71,7 @@ test.describe('dashboard page', () => {
   test('getting panel by id', async ({ gotoDashboardPage }) => {
     const dashboardPage = await gotoDashboardPage(REACT_TABLE_DASHBOARD);
     await dashboardPage.goto();
-    const panel = await dashboardPage.getPanelById('4');
+    const panel = await dashboardPage.getPanelByTitle('Colored background');
     await expect(panel.fieldNames, formatExpectError('Could not locate header elements in table panel')).toContainText([
       'Field',
       'Max',
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelOptions.test.tsx b/public/app/features/dashboard-scene/panel-edit/PanelOptions.test.tsx
index 4e319506fa2..3bcc582600e 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelOptions.test.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelOptions.test.tsx
@@ -116,7 +116,7 @@ describe('PanelOptions', () => {
 
       expect(screen.getByLabelText(OptionsPaneSelector.fieldLabel('Panel options Title'))).toBeInTheDocument();
 
-      const input = screen.getByTestId('panel-edit-panel-title-input');
+      const input = screen.getByTestId(selectors.components.PanelEditor.OptionsPane.fieldInput('Title'));
       fireEvent.change(input, { target: { value: 'New title' } });
 
       expect(vizManager.state.panel.state.title).toBe('New title');
@@ -127,7 +127,7 @@ describe('PanelOptions', () => {
 
       expect(screen.getByLabelText(OptionsPaneSelector.fieldLabel('Panel options Title'))).toBeInTheDocument();
 
-      const input = screen.getByTestId('panel-edit-panel-title-input');
+      const input = screen.getByTestId(selectors.components.PanelEditor.OptionsPane.fieldInput('Title'));
       fireEvent.change(input, { target: { value: '' } });
 
       expect(vizManager.state.panel.state.title).toBe('');
diff --git a/public/app/features/dashboard-scene/panel-edit/getPanelFrameOptions.tsx b/public/app/features/dashboard-scene/panel-edit/getPanelFrameOptions.tsx
index f3d0350775e..c23d41c81fa 100644
--- a/public/app/features/dashboard-scene/panel-edit/getPanelFrameOptions.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/getPanelFrameOptions.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { SelectableValue } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { config } from '@grafana/runtime';
 import { VizPanel } from '@grafana/scenes';
 import { RadioButtonGroup, Select, DataLinksInlineEditor, Input, TextArea, Switch } from '@grafana/ui';
@@ -187,7 +188,7 @@ function PanelFrameTitle({ vizManager }: { vizManager: VizPanelManager }) {
 
   return (
     <Input
-      data-testid="panel-edit-panel-title-input"
+      data-testid={selectors.components.PanelEditor.OptionsPane.fieldInput('Title')}
       value={title}
       onChange={(e) => vizManager.setPanelTitle(e.currentTarget.value)}
     />