diff --git a/__mocks__/genInteractives.js b/__mocks__/genInteractives.js
index 68b239260..f12ebcb06 100644
--- a/__mocks__/genInteractives.js
+++ b/__mocks__/genInteractives.js
@@ -45,14 +45,13 @@ const interactiveElementsMap = {
   'input[type="time"]': [{ prop: 'type', value: 'time' }],
   'input[type="url"]': [{ prop: 'type', value: 'url' }],
   'input[type="week"]': [{ prop: 'type', value: 'week' }],
-  link: [{ prop: 'href', value: '#' }],
   menuitem: [],
   option: [],
   select: [],
   // Whereas ARIA makes a distinction between cell and gridcell, the AXObject
   // treats them both as CellRole and since gridcell is interactive, we consider
   // cell interactive as well.
-  // td: [],
+  td: [],
   th: [],
   tr: [],
   textarea: [],
@@ -61,25 +60,27 @@ const interactiveElementsMap = {
 
 const nonInteractiveElementsMap: {[string]: Array<{[string]: string}>} = {
   abbr: [],
+  address: [],
   aside: [],
   article: [],
   blockquote: [],
-  body: [],
   br: [],
   caption: [],
+  code: [],
   dd: [],
+  del: [],
   details: [],
   dfn: [],
   dialog: [],
   dir: [],
   dl: [],
   dt: [],
+  em: [],
   fieldset: [],
   figcaption: [],
   figure: [],
   footer: [],
   form: [],
-  frame: [],
   h1: [],
   h2: [],
   h3: [],
@@ -87,8 +88,10 @@ const nonInteractiveElementsMap: {[string]: Array<{[string]: string}>} = {
   h5: [],
   h6: [],
   hr: [],
+  html: [],
   iframe: [],
   img: [],
+  ins: [],
   label: [],
   legend: [],
   li: [],
@@ -107,9 +110,11 @@ const nonInteractiveElementsMap: {[string]: Array<{[string]: string}>} = {
   ruby: [],
   'section[aria-label]': [{ prop: 'aria-label' }],
   'section[aria-labelledby]': [{ prop: 'aria-labelledby' }],
+  strong: [],
+  sub: [],
+  sup: [],
   table: [],
   tbody: [],
-  td: [],
   tfoot: [],
   thead: [],
   time: [],
diff --git a/__tests__/src/rules/control-has-associated-label-test.js b/__tests__/src/rules/control-has-associated-label-test.js
index 82c564320..fd2950830 100644
--- a/__tests__/src/rules/control-has-associated-label-test.js
+++ b/__tests__/src/rules/control-has-associated-label-test.js
@@ -156,7 +156,6 @@ const alwaysValid = [
   { code: '<section />' },
   { code: '<table />' },
   { code: '<tbody />' },
-  { code: '<td />' },
   { code: '<tfoot />' },
   { code: '<thead />' },
   { code: '<time />' },
@@ -261,6 +260,7 @@ const neverValid = [
   { code: '<area href="#" />', errors: [expectedError] },
   { code: '<menuitem />', errors: [expectedError] },
   { code: '<option />', errors: [expectedError] },
+  { code: '<td />', errors: [expectedError] },
   { code: '<th />', errors: [expectedError] },
   // Interactive Roles
   { code: '<div role="button" />', errors: [expectedError] },
diff --git a/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js b/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js
index 7f8a61b6e..49384d54b 100644
--- a/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js
+++ b/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js
@@ -169,6 +169,7 @@ const alwaysValid = [
   { code: '<style role="button" />;' },
   { code: '<sub role="button" />;' },
   { code: '<summary role="button" />;' },
+  { code: '<summary role="listitem" />;' },
   { code: '<sup role="button" />;' },
   { code: '<th role="button" />;' },
   { code: '<time role="button" />;' },
diff --git a/__tests__/src/rules/no-noninteractive-element-interactions-test.js b/__tests__/src/rules/no-noninteractive-element-interactions-test.js
index ba0206b83..c74abae18 100644
--- a/__tests__/src/rules/no-noninteractive-element-interactions-test.js
+++ b/__tests__/src/rules/no-noninteractive-element-interactions-test.js
@@ -76,7 +76,6 @@ const alwaysValid = [
   { code: '<tr onClick={() => {}} />;' },
   /* HTML elements with neither an interactive or non-interactive valence (static) */
   { code: '<acronym onClick={() => {}} />;' },
-  { code: '<address onClick={() => {}} />;' },
   { code: '<applet onClick={() => {}} />;' },
   { code: '<audio onClick={() => {}} />;' },
   { code: '<b onClick={() => {}} />;' },
@@ -86,16 +85,15 @@ const alwaysValid = [
   { code: '<big onClick={() => {}} />;' },
   { code: '<blink onClick={() => {}} />;' },
   { code: '<body onLoad={() => {}} />;' },
+  { code: '<body onClick={() => {}} />;' },
   { code: '<canvas onClick={() => {}} />;' },
   { code: '<center onClick={() => {}} />;' },
   { code: '<cite onClick={() => {}} />;' },
-  { code: '<code onClick={() => {}} />;' },
   { code: '<col onClick={() => {}} />;' },
   { code: '<colgroup onClick={() => {}} />;' },
   { code: '<content onClick={() => {}} />;' },
   { code: '<data onClick={() => {}} />;' },
   { code: '<datalist onClick={() => {}} />;' },
-  { code: '<del onClick={() => {}} />;' },
   { code: '<div />;' },
   { code: '<div className="foo" />;' },
   { code: '<div className="foo" {...props} />;' },
@@ -106,7 +104,6 @@ const alwaysValid = [
   { code: '<div onClick={() => void 0} {...props} />;' },
   { code: '<div onClick={null} />;' },
   { code: '<div onKeyUp={() => void 0} aria-hidden={false} />;' },
-  { code: '<em onClick={() => {}} />;' },
   { code: '<embed onClick={() => {}} />;' },
   { code: '<font onClick={() => {}} />;' },
   { code: '<font onSubmit={() => {}} />;' },
@@ -120,11 +117,11 @@ const alwaysValid = [
       </form>
     `,
   },
+  { code: '<frame onClick={() => {}} />;' },
   { code: '<frameset onClick={() => {}} />;' },
   { code: '<head onClick={() => {}} />;' },
   { code: '<header onClick={() => {}} />;' },
   { code: '<hgroup onClick={() => {}} />;' },
-  { code: '<html onClick={() => {}} />;' },
   { code: '<i onClick={() => {}} />;' },
   { code: '<iframe onLoad={() => {}} />;' },
   {
@@ -152,7 +149,6 @@ const alwaysValid = [
       />
     `,
   },
-  { code: '<ins onClick={() => {}} />;' },
   { code: '<kbd onClick={() => {}} />;' },
   { code: '<keygen onClick={() => {}} />;' },
   { code: '<link onClick={() => {}} />;' },
@@ -177,11 +173,9 @@ const alwaysValid = [
   { code: '<spacer onClick={() => {}} />;' },
   { code: '<span onClick={() => {}} />;' },
   { code: '<strike onClick={() => {}} />;' },
-  { code: '<strong onClick={() => {}} />;' },
   { code: '<style onClick={() => {}} />;' },
-  { code: '<sub onClick={() => {}} />;' },
   { code: '<summary onClick={() => {}} />;' },
-  { code: '<sup onClick={() => {}} />;' },
+  { code: '<td onClick={() => {}} />;' },
   { code: '<th onClick={() => {}} />;' },
   { code: '<title onClick={() => {}} />;' },
   { code: '<track onClick={() => {}} />;' },
@@ -285,24 +279,26 @@ const alwaysValid = [
 const neverValid = [
   /* HTML elements with an inherent, non-interactive role */
   { code: '<main onClick={() => void 0} />;', errors: [expectedError] },
+  { code: '<address onClick={() => {}} />;', errors: [expectedError] },
   { code: '<article onClick={() => {}} />;', errors: [expectedError] },
   { code: '<aside onClick={() => {}} />;', errors: [expectedError] },
   { code: '<blockquote onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<body onClick={() => {}} />;', errors: [expectedError] },
   { code: '<br onClick={() => {}} />;', errors: [expectedError] },
   { code: '<caption onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<code onClick={() => {}} />;', errors: [expectedError] },
   { code: '<dd onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<del onClick={() => {}} />;', errors: [expectedError] },
   { code: '<details onClick={() => {}} />;', errors: [expectedError] },
   { code: '<dfn onClick={() => {}} />;', errors: [expectedError] },
   { code: '<dl onClick={() => {}} />;', errors: [expectedError] },
   { code: '<dir onClick={() => {}} />;', errors: [expectedError] },
   { code: '<dt onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<em onClick={() => {}} />;', errors: [expectedError] },
   { code: '<fieldset onClick={() => {}} />;', errors: [expectedError] },
   { code: '<figcaption onClick={() => {}} />;', errors: [expectedError] },
   { code: '<figure onClick={() => {}} />;', errors: [expectedError] },
   { code: '<footer onClick={() => {}} />;', errors: [expectedError] },
   { code: '<form onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<frame onClick={() => {}} />;', errors: [expectedError] },
   { code: '<h1 onClick={() => {}} />;', errors: [expectedError] },
   { code: '<h2 onClick={() => {}} />;', errors: [expectedError] },
   { code: '<h3 onClick={() => {}} />;', errors: [expectedError] },
@@ -310,8 +306,10 @@ const neverValid = [
   { code: '<h5 onClick={() => {}} />;', errors: [expectedError] },
   { code: '<h6 onClick={() => {}} />;', errors: [expectedError] },
   { code: '<hr onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<html onClick={() => {}} />;', errors: [expectedError] },
   { code: '<iframe onClick={() => {}} />;', errors: [expectedError] },
   { code: '<img onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<ins onClick={() => {}} />;', errors: [expectedError] },
   { code: '<label onClick={() => {}} />;', errors: [expectedError] },
   { code: '<legend onClick={() => {}} />;', errors: [expectedError] },
   { code: '<li onClick={() => {}} />;', errors: [expectedError] },
@@ -329,9 +327,11 @@ const neverValid = [
   { code: '<ruby onClick={() => {}} />;', errors: [expectedError] },
   { code: '<section onClick={() => {}} aria-label="Aardvark" />;', errors: [expectedError] },
   { code: '<section onClick={() => {}} aria-labelledby="js_1" />;', errors: [expectedError] },
+  { code: '<strong onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<sub onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<sup onClick={() => {}} />;', errors: [expectedError] },
   { code: '<table onClick={() => {}} />;', errors: [expectedError] },
   { code: '<tbody onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<td onClick={() => {}} />;', errors: [expectedError] },
   { code: '<tfoot onClick={() => {}} />;', errors: [expectedError] },
   { code: '<thead onClick={() => {}} />;', errors: [expectedError] },
   { code: '<time onClick={() => {}} />;', errors: [expectedError] },
diff --git a/__tests__/src/rules/no-noninteractive-element-to-interactive-role-test.js b/__tests__/src/rules/no-noninteractive-element-to-interactive-role-test.js
index ce4c7f0ef..2f25c95ab 100644
--- a/__tests__/src/rules/no-noninteractive-element-to-interactive-role-test.js
+++ b/__tests__/src/rules/no-noninteractive-element-to-interactive-role-test.js
@@ -153,7 +153,6 @@ const alwaysValid = [
   { code: '<tr role="listitem" />;' },
   /* HTML elements with neither an interactive or non-interactive valence (static) */
   { code: '<acronym role="button" />;' },
-  { code: '<address role="button" />;' },
   { code: '<applet role="button" />;' },
   { code: '<audio role="button" />;' },
   { code: '<b role="button" />;' },
@@ -165,13 +164,11 @@ const alwaysValid = [
   { code: '<canvas role="button" />;' },
   { code: '<center role="button" />;' },
   { code: '<cite role="button" />;' },
-  { code: '<code role="button" />;' },
   { code: '<col role="button" />;' },
   { code: '<colgroup role="button" />;' },
   { code: '<content role="button" />;' },
   { code: '<data role="button" />;' },
   { code: '<datalist role="button" />;' },
-  { code: '<del role="button" />;' },
   { code: '<div role="button" />;' },
   { code: '<div className="foo" role="button" />;' },
   { code: '<div className="foo" {...props} role="button" />;' },
@@ -181,16 +178,13 @@ const alwaysValid = [
   { code: '<div role={undefined} role="button" />;' },
   { code: '<div {...props} role="button" />;' },
   { code: '<div onKeyUp={() => void 0} aria-hidden={false} role="button" />;' },
-  { code: '<em role="button" />;' },
   { code: '<embed role="button" />;' },
   { code: '<font role="button" />;' },
   { code: '<frameset role="button" />;' },
   { code: '<head role="button" />;' },
   { code: '<header role="button" />;' },
   { code: '<hgroup role="button" />;' },
-  { code: '<html role="button" />;' },
   { code: '<i role="button" />;' },
-  { code: '<ins role="button" />;' },
   { code: '<kbd role="button" />;' },
   { code: '<keygen role="button" />;' },
   { code: '<link role="button" />;' },
@@ -213,11 +207,10 @@ const alwaysValid = [
   { code: '<spacer role="button" />;' },
   { code: '<span role="button" />;' },
   { code: '<strike role="button" />;' },
-  { code: '<strong role="button" />;' },
   { code: '<style role="button" />;' },
-  { code: '<sub role="button" />;' },
   { code: '<summary role="button" />;' },
-  { code: '<sup role="button" />;' },
+  { code: '<td role="button" />;' },
+  { code: '<td role="menuitem" />;' },
   { code: '<th role="button" />;' },
   { code: '<title role="button" />;' },
   { code: '<track role="button" />;' },
@@ -285,6 +278,7 @@ const alwaysValid = [
   { code: '<area role="listitem" />;' },
   { code: '<article role="listitem" />;' },
   { code: '<article role="listitem" />;' },
+  { code: '<body role="button" />;' },
   { code: '<dd role="listitem" />;' },
   { code: '<dfn role="listitem" />;' },
   { code: '<dt role="listitem" />;' },
@@ -358,25 +352,27 @@ const neverValid = [
   /* HTML elements with an inherent non-interactive role, assigned an
    * interactive role. */
   { code: '<main role="button" />;', errors: [expectedError] },
+  { code: '<address role="button" />;', errors: [expectedError] },
   { code: '<article role="button" />;', errors: [expectedError] },
   { code: '<article role="button" />;', errors: [expectedError] },
   { code: '<aside role="button" />;', errors: [expectedError] },
   { code: '<blockquote role="button" />;', errors: [expectedError] },
-  { code: '<body role="button" />;', errors: [expectedError] },
   { code: '<br role="button" />;', errors: [expectedError] },
   { code: '<caption role="button" />;', errors: [expectedError] },
+  { code: '<code role="button" />;', errors: [expectedError] },
   { code: '<dd role="button" />;', errors: [expectedError] },
+  { code: '<del role="button" />;', errors: [expectedError] },
   { code: '<details role="button" />;', errors: [expectedError] },
   { code: '<dir role="button" />;', errors: [expectedError] },
   { code: '<dl role="button" />;', errors: [expectedError] },
   { code: '<dfn role="button" />;', errors: [expectedError] },
   { code: '<dt role="button" />;', errors: [expectedError] },
+  { code: '<em role="button" />;', errors: [expectedError] },
   { code: '<fieldset role="button" />;', errors: [expectedError] },
   { code: '<figcaption role="button" />;', errors: [expectedError] },
   { code: '<figure role="button" />;', errors: [expectedError] },
   { code: '<footer role="button" />;', errors: [expectedError] },
   { code: '<form role="button" />;', errors: [expectedError] },
-  { code: '<frame role="button" />;', errors: [expectedError] },
   { code: '<h1 role="button" />;', errors: [expectedError] },
   { code: '<h2 role="button" />;', errors: [expectedError] },
   { code: '<h3 role="button" />;', errors: [expectedError] },
@@ -384,8 +380,10 @@ const neverValid = [
   { code: '<h5 role="button" />;', errors: [expectedError] },
   { code: '<h6 role="button" />;', errors: [expectedError] },
   { code: '<hr role="button" />;', errors: [expectedError] },
+  { code: '<html role="button" />;', errors: [expectedError] },
   { code: '<iframe role="button" />;', errors: [expectedError] },
   { code: '<img role="button" />;', errors: [expectedError] },
+  { code: '<ins role="button" />;', errors: [expectedError] },
   { code: '<label role="button" />;', errors: [expectedError] },
   { code: '<legend role="button" />;', errors: [expectedError] },
   { code: '<li role="button" />;', errors: [expectedError] },
@@ -400,9 +398,11 @@ const neverValid = [
   { code: '<pre role="button" />;', errors: [expectedError] },
   { code: '<progress role="button" />;', errors: [expectedError] },
   { code: '<ruby role="button" />;', errors: [expectedError] },
+  { code: '<strong role="button" />;', errors: [expectedError] },
+  { code: '<sub role="button" />;', errors: [expectedError] },
+  { code: '<sup role="button" />;', errors: [expectedError] },
   { code: '<table role="button" />;', errors: [expectedError] },
   { code: '<tbody role="button" />;', errors: [expectedError] },
-  { code: '<td role="button" />;', errors: [expectedError] },
   { code: '<tfoot role="button" />;', errors: [expectedError] },
   { code: '<thead role="button" />;', errors: [expectedError] },
   { code: '<time role="button" />;', errors: [expectedError] },
@@ -418,7 +418,6 @@ const neverValid = [
   { code: '<fieldset role="menuitem" />;', errors: [expectedError] },
   { code: '<figure role="menuitem" />;', errors: [expectedError] },
   { code: '<form role="menuitem" />;', errors: [expectedError] },
-  { code: '<frame role="menuitem" />;', errors: [expectedError] },
   { code: '<h1 role="menuitem" />;', errors: [expectedError] },
   { code: '<h2 role="menuitem" />;', errors: [expectedError] },
   { code: '<h3 role="menuitem" />;', errors: [expectedError] },
@@ -433,7 +432,6 @@ const neverValid = [
   { code: '<section role="button" aria-label="Aardvark" />;', errors: [expectedError] },
   { code: '<table role="menuitem" />;', errors: [expectedError] },
   { code: '<tbody role="menuitem" />;', errors: [expectedError] },
-  { code: '<td role="menuitem" />;', errors: [expectedError] },
   { code: '<tfoot role="menuitem" />;', errors: [expectedError] },
   { code: '<thead role="menuitem" />;', errors: [expectedError] },
   /* Custom components */
diff --git a/__tests__/src/rules/no-static-element-interactions-test.js b/__tests__/src/rules/no-static-element-interactions-test.js
index c4f5730d1..e9d581e4c 100644
--- a/__tests__/src/rules/no-static-element-interactions-test.js
+++ b/__tests__/src/rules/no-static-element-interactions-test.js
@@ -84,7 +84,6 @@ const alwaysValid = [
   { code: '<audio onClick={() => {}} />;' },
   { code: '<form onClick={() => {}} />;' },
   { code: '<form onSubmit={() => {}} />;' },
-  { code: '<link onClick={() => {}} href="#" />;' },
   /* HTML elements attributed with an interactive role */
   { code: '<div role="button" onClick={() => {}} />;' },
   { code: '<div role="checkbox" onClick={() => {}} />;' },
@@ -110,26 +109,28 @@ const alwaysValid = [
   { code: '<div role="presentation" onClick={() => {}} />;' },
   { code: '<div role="presentation" onKeyDown={() => {}} />;' },
   /* HTML elements with an inherent, non-interactive role */
+  { code: '<address onClick={() => {}} />;' },
   { code: '<article onClick={() => {}} />;' },
   { code: '<article onDblClick={() => void 0} />;' },
   { code: '<aside onClick={() => {}} />;' },
   { code: '<blockquote onClick={() => {}} />;' },
-  { code: '<body onClick={() => {}} />;' },
   { code: '<br onClick={() => {}} />;' },
   { code: '<canvas onClick={() => {}} />;' },
   { code: '<caption onClick={() => {}} />;' },
+  { code: '<code onClick={() => {}} />;' },
   { code: '<details onClick={() => {}} />;' },
   { code: '<dd onClick={() => {}} />;' },
+  { code: '<del onClick={() => {}} />;' },
   { code: '<dfn onClick={() => {}} />;' },
   { code: '<dir onClick={() => {}} />;' },
   { code: '<dl onClick={() => {}} />;' },
   { code: '<dt onClick={() => {}} />;' },
+  { code: '<em onClick={() => {}} />;' },
   { code: '<embed onClick={() => {}} />;' },
   { code: '<fieldset onClick={() => {}} />;' },
   { code: '<figcaption onClick={() => {}} />;' },
   { code: '<figure onClick={() => {}} />;' },
   { code: '<footer onClick={() => {}} />;' },
-  { code: '<frame onClick={() => {}} />;' },
   { code: '<h1 onClick={() => {}} />;' },
   { code: '<h2 onClick={() => {}} />;' },
   { code: '<h3 onClick={() => {}} />;' },
@@ -137,8 +138,10 @@ const alwaysValid = [
   { code: '<h5 onClick={() => {}} />;' },
   { code: '<h6 onClick={() => {}} />;' },
   { code: '<hr onClick={() => {}} />;' },
+  { code: '<html onClick={() => {}} />;' },
   { code: '<iframe onClick={() => {}} />;' },
   { code: '<img onClick={() => {}} />;' },
+  { code: '<ins onClick={() => {}} />;' },
   { code: '<label onClick={() => {}} />;' },
   { code: '<legend onClick={() => {}} />;' },
   { code: '<li onClick={() => {}} />;' },
@@ -157,6 +160,9 @@ const alwaysValid = [
   { code: '<ruby onClick={() => {}} />;' },
   { code: '<section onClick={() => {}} aria-label="Aa" />;' },
   { code: '<section onClick={() => {}} aria-labelledby="js_1" />;' },
+  { code: '<strong onClick={() => {}} />;' },
+  { code: '<sub onClick={() => {}} />;' },
+  { code: '<sup onClick={() => {}} />;' },
   { code: '<table onClick={() => {}} />;' },
   { code: '<tbody onClick={() => {}} />;' },
   { code: '<tfoot onClick={() => {}} />;' },
@@ -287,7 +293,6 @@ const neverValid = [
   { code: '<a tabIndex="0" onClick={() => void 0} />', errors: [expectedError] },
   { code: '<area onClick={() => {}} />;', errors: [expectedError] },
   { code: '<acronym onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<address onClick={() => {}} />;', errors: [expectedError] },
   { code: '<applet onClick={() => {}} />;', errors: [expectedError] },
   { code: '<b onClick={() => {}} />;', errors: [expectedError] },
   { code: '<base onClick={() => {}} />;', errors: [expectedError] },
@@ -295,26 +300,24 @@ const neverValid = [
   { code: '<bdo onClick={() => {}} />;', errors: [expectedError] },
   { code: '<big onClick={() => {}} />;', errors: [expectedError] },
   { code: '<blink onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<body onClick={() => {}} />;', errors: [expectedError] },
   { code: '<center onClick={() => {}} />;', errors: [expectedError] },
   { code: '<cite onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<code onClick={() => {}} />;', errors: [expectedError] },
   { code: '<col onClick={() => {}} />;', errors: [expectedError] },
   { code: '<colgroup onClick={() => {}} />;', errors: [expectedError] },
   { code: '<content onClick={() => {}} />;', errors: [expectedError] },
   { code: '<data onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<del onClick={() => {}} />;', errors: [expectedError] },
   { code: '<div onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<em onClick={() => {}} />;', errors: [expectedError] },
   { code: '<font onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<frame onClick={() => {}} />;', errors: [expectedError] },
   { code: '<frameset onClick={() => {}} />;', errors: [expectedError] },
   { code: '<head onClick={() => {}} />;', errors: [expectedError] },
   { code: '<header onClick={() => {}} />;', errors: [expectedError] },
   { code: '<hgroup onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<html onClick={() => {}} />;', errors: [expectedError] },
   { code: '<i onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<ins onClick={() => {}} />;', errors: [expectedError] },
   { code: '<kbd onClick={() => {}} />;', errors: [expectedError] },
   { code: '<keygen onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<link onClick={() => {}} href="#" />;', errors: [expectedError] },
   { code: '<map onClick={() => {}} />;', errors: [expectedError] },
   { code: '<meta onClick={() => {}} />;', errors: [expectedError] },
   { code: '<noembed onClick={() => {}} />;', errors: [expectedError] },
@@ -335,10 +338,7 @@ const neverValid = [
   { code: '<spacer onClick={() => {}} />;', errors: [expectedError] },
   { code: '<span onClick={() => {}} />;', errors: [expectedError] },
   { code: '<strike onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<strong onClick={() => {}} />;', errors: [expectedError] },
   { code: '<style onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<sub onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<sup onClick={() => {}} />;', errors: [expectedError] },
   { code: '<summary onClick={() => {}} />;', errors: [expectedError] },
   { code: '<title onClick={() => {}} />;', errors: [expectedError] },
   { code: '<track onClick={() => {}} />;', errors: [expectedError] },
diff --git a/__tests__/src/rules/prefer-tag-over-role-test.js b/__tests__/src/rules/prefer-tag-over-role-test.js
index 1b6b898fb..a130c53e8 100644
--- a/__tests__/src/rules/prefer-tag-over-role-test.js
+++ b/__tests__/src/rules/prefer-tag-over-role-test.js
@@ -38,7 +38,7 @@ ruleTester.run('element-role', rule, {
       errors: [
         expectedError(
           'link',
-          '<a href=...>, <area href=...>, or <link href=...>',
+          '<a href=...>, or <area href=...>',
         ),
       ],
     },
diff --git a/package.json b/package.json
index 82bf32e7b..89f7da2f9 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.22.10",
-    "aria-query": "=5.1.3",
+    "aria-query": "^5.3.0",
     "array-includes": "^3.1.6",
     "array.prototype.flatmap": "^1.3.1",
     "ast-types-flow": "^0.0.7",
diff --git a/src/util/isNonInteractiveElement.js b/src/util/isNonInteractiveElement.js
index 78aabaa53..85e1037a9 100644
--- a/src/util/isNonInteractiveElement.js
+++ b/src/util/isNonInteractiveElement.js
@@ -31,6 +31,10 @@ const nonInteractiveRoles = new Set(roleKeys
         // This role is meant to have no semantic value.
         // @see https://www.w3.org/TR/wai-aria-1.2/#generic
         && name !== 'generic'
+        // Whereas ARIA makes a distinction between cell and gridcell, the AXObject
+        // treats them both as CellRole and since gridcell is interactive, we consider
+        // cell interactive as well.
+        && name !== 'cell'
         && !role.superClass.some((classes) => includes(classes, 'widget'))
     );
   }).concat(