diff --git a/.betterer.results b/.betterer.results
index a2c020658d5..aa90e14d57b 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -5962,26 +5962,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
-    "public/app/plugins/datasource/elasticsearch/ElasticResponse.test.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"]
-    ],
     "public/app/plugins/datasource/elasticsearch/ElasticResponse.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
diff --git a/.eslintrc b/.eslintrc
index 9392bee07f1..4d4e37ed2ae 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -90,7 +90,7 @@
     "jsx-a11y/no-noninteractive-tabindex": "off",
     "jsx-a11y/no-redundant-roles": "error",
     "jsx-a11y/no-static-element-interactions": "off",
-    "jsx-a11y/role-has-required-aria-props": "off",
+    "jsx-a11y/role-has-required-aria-props": "error",
     "jsx-a11y/role-supports-aria-props": "error",
     "jsx-a11y/scope": "error",
     "jsx-a11y/tabindex-no-positive": "error"
diff --git a/packages/grafana-ui/src/components/FormField/FormField.test.tsx b/packages/grafana-ui/src/components/FormField/FormField.test.tsx
index ac95d812c75..71fe532a64d 100644
--- a/packages/grafana-ui/src/components/FormField/FormField.test.tsx
+++ b/packages/grafana-ui/src/components/FormField/FormField.test.tsx
@@ -24,7 +24,7 @@ describe('FormField', () => {
 
   it('should render a custom inputEl instead if specified', () => {
     setup({
-      inputEl: <input role="checkbox" />,
+      inputEl: <input type="checkbox" />,
     });
     expect(screen.queryByRole('textbox')).not.toBeInTheDocument();
     expect(screen.getByRole('checkbox')).toBeInTheDocument();
diff --git a/public/app/features/scenes/components/NestedScene.tsx b/public/app/features/scenes/components/NestedScene.tsx
index a3dd36b62a0..4e2a87e51d1 100644
--- a/public/app/features/scenes/components/NestedScene.tsx
+++ b/public/app/features/scenes/components/NestedScene.tsx
@@ -62,7 +62,7 @@ export function NestedSceneRenderer({ model, isEditing }: SceneComponentProps<Ne
     <div className={styles.row}>
       <div className={styles.rowHeader}>
         <Stack gap={0}>
-          <div className={styles.title} role="heading">
+          <div className={styles.title} role="heading" aria-level={1}>
             {title}
           </div>
           {canCollapse && (