diff --git a/.betterer.results b/.betterer.results
index c99a1a1c714..84fde18b403 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -605,9 +605,6 @@ exports[`better eslint`] = {
     "packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
     "packages/grafana-ui/src/components/DataSourceSettings/CustomHeadersSettings.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
@@ -794,10 +791,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "packages/grafana-ui/src/components/ValuePicker/ValuePicker.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"]
-    ],
-    "packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
     "packages/grafana-ui/src/components/VizLegend/types.ts:5381": [
@@ -6382,12 +6375,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/panel/piechart/PieChart.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"],
       [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
+      [0, 0, 0, "Styles should be written using objects.", "4"]
     ],
     "public/app/plugins/panel/piechart/migrations.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -6543,7 +6535,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
     ],
     "public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
+      [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
       [0, 0, 0, "Styles should be written using objects.", "2"],
       [0, 0, 0, "Styles should be written using objects.", "3"],
@@ -6553,8 +6545,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "7"],
       [0, 0, 0, "Styles should be written using objects.", "8"],
       [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"],
-      [0, 0, 0, "Styles should be written using objects.", "11"]
+      [0, 0, 0, "Styles should be written using objects.", "10"]
     ],
     "public/app/plugins/panel/timeseries/plugins/ThresholdDragHandle.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
diff --git a/e2e/various-suite/pie-chart.spec.ts b/e2e/various-suite/pie-chart.spec.ts
index 3ed6c1f6896..2030aed53fe 100644
--- a/e2e/various-suite/pie-chart.spec.ts
+++ b/e2e/various-suite/pie-chart.spec.ts
@@ -11,7 +11,7 @@ describe('Pie Chart Panel', () => {
     // open Panel Tests - Pie Chart
     e2e.flows.openDashboard({ uid: 'lVE-2YFMz' });
 
-    cy.get(`[data-panelid=11] [aria-label^="${selectors.components.Panels.Visualization.PieChart.svgSlice}"]`).should(
+    cy.get(`[data-panelid=11] [data-testid^="${selectors.components.Panels.Visualization.PieChart.svgSlice}"]`).should(
       'have.length',
       5
     );
diff --git a/packages/grafana-e2e-selectors/src/selectors/components.ts b/packages/grafana-e2e-selectors/src/selectors/components.ts
index 5814e805b30..3d651915ede 100644
--- a/packages/grafana-e2e-selectors/src/selectors/components.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/components.ts
@@ -64,7 +64,7 @@ export const Components = {
         exemplarsAddButton: 'Add exemplar config button',
         internalLinkSwitch: 'Internal link switch',
       },
-      exemplarMarker: 'Exemplar marker',
+      exemplarMarker: 'data-testid Exemplar marker',
     },
   },
   Menu: {
@@ -113,7 +113,7 @@ export const Components = {
         valueV2: 'data-testid Bar gauge value',
       },
       PieChart: {
-        svgSlice: 'Pie Chart Slice',
+        svgSlice: 'data testid Pie Chart Slice',
       },
       Text: {
         container: () => '.markdown-html',
@@ -126,7 +126,7 @@ export const Components = {
     },
   },
   VizLegend: {
-    seriesName: (name: string) => `VizLegend series ${name}`,
+    seriesName: (name: string) => `data-testid VizLegend series ${name}`,
   },
   Drawer: {
     General: {
@@ -353,8 +353,8 @@ export const Components = {
     matchOperatorSelect: 'Select match operator',
   },
   ValuePicker: {
-    button: (name: string) => `Value picker button ${name}`,
-    select: (name: string) => `Value picker select ${name}`,
+    button: (name: string) => `data-testid Value picker button ${name}`,
+    select: (name: string) => `data-testid Value picker select ${name}`,
   },
   Search: {
     /**
@@ -392,7 +392,7 @@ export const Components = {
     buttonV2: (name: string) => `data-testid Call to action button ${name}`,
   },
   DataLinksContextMenu: {
-    singleLink: 'Data link',
+    singleLink: 'data-testid Data link',
   },
   CodeEditor: {
     container: 'data-testid Code editor container',
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.test.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.test.tsx
index e64e0460618..34c826a03f9 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.test.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.test.tsx
@@ -54,6 +54,6 @@ describe('DataLinksContextMenu', () => {
     );
 
     expect(screen.getByLabelText(fakeAriaLabel)).toBeInTheDocument();
-    expect(screen.getByLabelText(selectors.components.DataLinksContextMenu.singleLink)).toBeInTheDocument();
+    expect(screen.getByTestId(selectors.components.DataLinksContextMenu.singleLink)).toBeInTheDocument();
   });
 });
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx
index 23dbd13c95f..64e11a28288 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx
@@ -63,7 +63,7 @@ export const DataLinksContextMenu = ({ children, links, style }: DataLinksContex
         target={linkModel.target}
         title={linkModel.title}
         style={{ ...style, overflow: 'hidden', display: 'flex' }}
-        aria-label={selectors.components.DataLinksContextMenu.singleLink}
+        data-testid={selectors.components.DataLinksContextMenu.singleLink}
       >
         {children({})}
       </a>
diff --git a/packages/grafana-ui/src/components/ValuePicker/ValuePicker.tsx b/packages/grafana-ui/src/components/ValuePicker/ValuePicker.tsx
index 2fda7a1c086..092d09a1931 100644
--- a/packages/grafana-ui/src/components/ValuePicker/ValuePicker.tsx
+++ b/packages/grafana-ui/src/components/ValuePicker/ValuePicker.tsx
@@ -65,7 +65,7 @@ export function ValuePicker<T>({
           variant={variant}
           fill={fill}
           fullWidth={isFullWidth}
-          aria-label={selectors.components.ValuePicker.button(ariaLabel ?? label)}
+          data-testid={selectors.components.ValuePicker.button(ariaLabel ?? label)}
         >
           {label}
         </Button>
diff --git a/packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx b/packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx
index f1ba5bf7488..0518ae5ac5d 100644
--- a/packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx
+++ b/packages/grafana-ui/src/components/VizLegend/VizLegendListItem.tsx
@@ -68,7 +68,7 @@ export const VizLegendListItem = <T = unknown,>({
   return (
     <div
       className={cx(styles.itemWrapper, item.disabled && styles.itemDisabled, className)}
-      aria-label={selectors.components.VizLegend.seriesName(item.label)}
+      data-testid={selectors.components.VizLegend.seriesName(item.label)}
     >
       <VizLegendSeriesIcon seriesName={item.label} color={item.color} gradient={item.gradient} readonly={readonly} />
       <button
diff --git a/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.test.tsx b/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.test.tsx
index 60a9e08d545..74b3af55698 100644
--- a/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.test.tsx
+++ b/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.test.tsx
@@ -97,7 +97,7 @@ describe('OrganisationSwitcher', () => {
       },
     });
 
-    expect(screen.getByRole('button', { name: /change organization/i })).toBeInTheDocument();
+    expect(screen.getByTestId('data-testid Value picker button Change organization')).toBeInTheDocument();
   });
 
   it('should not render and not try to get user organizations if not signed in', () => {
diff --git a/public/app/core/components/Layers/AddLayerButton.test.tsx b/public/app/core/components/Layers/AddLayerButton.test.tsx
index 082f1e0dc1c..0bdbf16f7fd 100644
--- a/public/app/core/components/Layers/AddLayerButton.test.tsx
+++ b/public/app/core/components/Layers/AddLayerButton.test.tsx
@@ -10,7 +10,7 @@ describe('AddLayerButton', () => {
   it('renders AddLayerButton', () => {
     renderScenario({});
 
-    const button = screen.getByLabelText(selectors.components.ValuePicker.button(testLabel));
+    const button = screen.getByTestId(selectors.components.ValuePicker.button(testLabel));
 
     expect(button).toBeInTheDocument();
   });
diff --git a/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditorModal.test.tsx b/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditorModal.test.tsx
index 18bc74608cd..38eb3ff873f 100644
--- a/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditorModal.test.tsx
+++ b/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditorModal.test.tsx
@@ -74,12 +74,12 @@ describe('ValueMappingsEditorModal', () => {
     });
   });
 
-  describe('When adding and updating value mapp', () => {
+  describe('When adding and updating value map', () => {
     it('should be 3', async () => {
       const onChangeSpy = jest.fn();
       setup(onChangeSpy);
 
-      await userEvent.click(screen.getByLabelText(selectors.components.ValuePicker.button('Add a new mapping')));
+      await userEvent.click(screen.getByTestId(selectors.components.ValuePicker.button('Add a new mapping')));
       const selectComponent = await screen.findByLabelText(
         selectors.components.ValuePicker.select('Add a new mapping')
       );
@@ -129,7 +129,7 @@ describe('ValueMappingsEditorModal', () => {
       setup(onChangeSpy, { value: [] });
       await userEvent.click(screen.getAllByTestId('remove-value-mapping')[0]);
 
-      await userEvent.click(screen.getByLabelText(selectors.components.ValuePicker.button('Add a new mapping')));
+      await userEvent.click(screen.getByTestId(selectors.components.ValuePicker.button('Add a new mapping')));
       const selectComponent = await screen.findByLabelText(
         selectors.components.ValuePicker.select('Add a new mapping')
       );
@@ -168,7 +168,7 @@ describe('ValueMappingsEditorModal', () => {
       setup(onChangeSpy, { value: [] });
       await userEvent.click(screen.getAllByTestId('remove-value-mapping')[0]);
 
-      await userEvent.click(screen.getByLabelText(selectors.components.ValuePicker.button('Add a new mapping')));
+      await userEvent.click(screen.getByTestId(selectors.components.ValuePicker.button('Add a new mapping')));
       const selectComponent = await screen.findByLabelText(
         selectors.components.ValuePicker.select('Add a new mapping')
       );
diff --git a/public/app/plugins/panel/nodeGraph/Legend.test.tsx b/public/app/plugins/panel/nodeGraph/Legend.test.tsx
index 831983305a6..d0e3e6699ed 100644
--- a/public/app/plugins/panel/nodeGraph/Legend.test.tsx
+++ b/public/app/plugins/panel/nodeGraph/Legend.test.tsx
@@ -21,10 +21,10 @@ describe('Legend', () => {
       },
     ] as NodeDatum[];
     render(<Legend nodes={nodes} onSort={(sort) => {}} sortable={false} />);
-    const items = screen.getAllByLabelText(/VizLegend series/);
+    const items = screen.getAllByTestId(/VizLegend series/);
     expect(items.length).toBe(3);
 
-    const item = screen.getByLabelText(/VizLegend series error/);
+    const item = screen.getByTestId(/VizLegend series error/);
     expect((item.firstChild as HTMLDivElement).style.getPropertyValue('background')).toBe('rgb(242, 73, 92)');
   });
 });
diff --git a/public/app/plugins/panel/piechart/PieChart.tsx b/public/app/plugins/panel/piechart/PieChart.tsx
index d12f5456667..674af3e1cf9 100644
--- a/public/app/plugins/panel/piechart/PieChart.tsx
+++ b/public/app/plugins/panel/piechart/PieChart.tsx
@@ -249,7 +249,7 @@ function PieSlice({ arc, pie, highlightState, openMenu, fill, tooltip, tooltipOp
       onMouseMove={tooltipOptions.mode !== 'none' ? onMouseMoveOverArc : undefined}
       onMouseOut={onMouseOut}
       onClick={openMenu}
-      aria-label={selectors.components.Panels.Visualization.PieChart.svgSlice}
+      data-testid={selectors.components.Panels.Visualization.PieChart.svgSlice}
     >
       <path d={pie.path({ ...arc })!} fill={fill} stroke={theme.colors.background.primary} strokeWidth={1} />
     </g>
diff --git a/public/app/plugins/panel/piechart/PieChartPanel.test.tsx b/public/app/plugins/panel/piechart/PieChartPanel.test.tsx
index 48b995f6344..99b3d73e1c1 100644
--- a/public/app/plugins/panel/piechart/PieChartPanel.test.tsx
+++ b/public/app/plugins/panel/piechart/PieChartPanel.test.tsx
@@ -60,7 +60,7 @@ describe('PieChartPanel', () => {
       it('should not filter out any slices or legend items', () => {
         setup({ data: { series: seriesWithNoOverrides } });
 
-        const slices = screen.queryAllByLabelText('Pie Chart Slice');
+        const slices = screen.queryAllByTestId('data testid Pie Chart Slice');
         expect(slices.length).toBe(3);
         expect(screen.queryByText(/Chrome/i)).toBeInTheDocument();
         expect(screen.queryByText(/Firefox/i)).toBeInTheDocument();
@@ -92,7 +92,7 @@ describe('PieChartPanel', () => {
       it('should filter out the Firefox pie chart slice but not the legend', () => {
         setup({ data: { series: seriesWithFirefoxOverride } });
 
-        const slices = screen.queryAllByLabelText('Pie Chart Slice');
+        const slices = screen.queryAllByTestId('data testid Pie Chart Slice');
         expect(slices.length).toBe(2);
         expect(screen.queryByText(/Firefox/i)).toBeInTheDocument();
       });
@@ -122,13 +122,13 @@ describe('PieChartPanel', () => {
       it('should filter out the Firefox series with value 190 from the multi tooltip', async () => {
         setup({ data: { series: seriesWithFirefoxOverride } });
 
-        await userEvent.hover(screen.getAllByLabelText('Pie Chart Slice')[0]);
+        await userEvent.hover(screen.getAllByTestId('data testid Pie Chart Slice')[0]);
         expect(screen.queryByText(/600/i)).toBeInTheDocument();
         expect(screen.queryByText(/190/i)).not.toBeInTheDocument();
         expect(screen.queryByText(/210/i)).toBeInTheDocument();
 
         expect(screen.queryByText(/Firefox/i)).toBeInTheDocument();
-        const slices = screen.queryAllByLabelText('Pie Chart Slice');
+        const slices = screen.queryAllByTestId('data testid Pie Chart Slice');
         expect(slices.length).toBe(3);
       });
     });
@@ -158,7 +158,7 @@ describe('PieChartPanel', () => {
         setup({ data: { series: seriesWithFirefoxOverride } });
 
         expect(screen.queryByText(/Firefox/i)).not.toBeInTheDocument();
-        const slices = screen.queryAllByLabelText('Pie Chart Slice');
+        const slices = screen.queryAllByTestId('data testid Pie Chart Slice');
         expect(slices.length).toBe(3);
       });
     });
diff --git a/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
index 0a60cb13cd7..5a816578769 100644
--- a/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
@@ -220,7 +220,7 @@ export const ExemplarMarker = ({
         onMouseEnter={onMouseEnter}
         onMouseLeave={onMouseLeave}
         className={styles.markerWrapper}
-        aria-label={selectors.components.DataSource.Prometheus.exemplarMarker}
+        data-testid={selectors.components.DataSource.Prometheus.exemplarMarker}
         role="button"
         tabIndex={0}
       >