From 12666dc871dd5ed935367a6a0fb42af97f5fb51b Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 27 Sep 2022 13:15:40 +0200
Subject: [PATCH 1/3] fix(td-headers-attr): ignore table elements with their
 role changed

---
 lib/checks/tables/td-headers-attr-evaluate.js |   3 +-
 lib/rules/table-or-grid-role-matches.js       |   6 +
 lib/rules/td-headers-attr.json                |   1 +
 test/checks/tables/td-headers-attr.js         | 148 +++++++++---------
 .../td-headers-attr/td-headers-attr.html      |  45 ++++++
 .../td-headers-attr/td-headers-attr.json      |   6 +
 .../table-or-grid-role-matches.js             |  51 ++++++
 7 files changed, 186 insertions(+), 74 deletions(-)
 create mode 100644 lib/rules/table-or-grid-role-matches.js
 create mode 100644 test/integration/rules/td-headers-attr/td-headers-attr.html
 create mode 100644 test/integration/rules/td-headers-attr/td-headers-attr.json
 create mode 100644 test/rule-matches/table-or-grid-role-matches.js

diff --git a/lib/checks/tables/td-headers-attr-evaluate.js b/lib/checks/tables/td-headers-attr-evaluate.js
index e781330794..caef8f9a3a 100644
--- a/lib/checks/tables/td-headers-attr-evaluate.js
+++ b/lib/checks/tables/td-headers-attr-evaluate.js
@@ -1,4 +1,5 @@
 import { tokenList } from '../../core/utils';
+import { isVisibleForScreenreader } from '../../commons/dom';
 
 function tdHeadersAttrEvaluate(node) {
   const cells = [];
@@ -24,7 +25,7 @@ function tdHeadersAttrEvaluate(node) {
     let isSelf = false;
     let notOfTable = false;
 
-    if (!cell.hasAttribute('headers')) {
+    if (!cell.hasAttribute('headers') || !isVisibleForScreenreader(cell)) {
       return;
     }
 
diff --git a/lib/rules/table-or-grid-role-matches.js b/lib/rules/table-or-grid-role-matches.js
new file mode 100644
index 0000000000..1443b0acdf
--- /dev/null
+++ b/lib/rules/table-or-grid-role-matches.js
@@ -0,0 +1,6 @@
+import { getRole } from '../commons/aria';
+
+export default function tableOrGridRoleMatches(_, vNode) {
+  const role = getRole(vNode);
+  return ['treegrid', 'grid', 'table'].includes(role);
+}
diff --git a/lib/rules/td-headers-attr.json b/lib/rules/td-headers-attr.json
index b3104d0f7c..141c4a0933 100644
--- a/lib/rules/td-headers-attr.json
+++ b/lib/rules/td-headers-attr.json
@@ -1,6 +1,7 @@
 {
   "id": "td-headers-attr",
   "selector": "table",
+  "matches": "table-or-grid-role-matches",
   "tags": ["cat.tables", "wcag2a", "wcag131", "section508", "section508.22.g"],
   "actIds": ["a25f45"],
   "metadata": {
diff --git a/test/checks/tables/td-headers-attr.js b/test/checks/tables/td-headers-attr.js
index f9ba57dd84..83db2b936a 100644
--- a/test/checks/tables/td-headers-attr.js
+++ b/test/checks/tables/td-headers-attr.js
@@ -1,124 +1,126 @@
-describe('td-headers-attr', function() {
+describe('td-headers-attr', function () {
   'use strict';
 
   var fixture = document.getElementById('fixture');
   var checkContext = axe.testUtils.MockCheckContext();
+  var fixtureSetup = axe.testUtils.fixtureSetup;
+  var check = axe.testUtils.getCheckEvaluate('td-headers-attr');
 
-  afterEach(function() {
-    fixture.innerHTML = '';
+  afterEach(function () {
     checkContext.reset();
   });
 
-  it('returns true no headers attribute is present', function() {
-    fixture.innerHTML =
+  it('returns true no headers attribute is present', function () {
+    fixtureSetup(
       '<table>' +
-      '  <tr> <th>hi</th> <td>hello</td> </tr>' +
-      '  <tr> <th>hi</th> <td>hello</td> </tr>' +
-      '</table>';
+        '  <tr> <th>hi</th> <td>hello</td> </tr>' +
+        '  <tr> <th>hi</th> <td>hello</td> </tr>' +
+        '</table>'
+    );
 
     var node = fixture.querySelector('table');
-    assert.isTrue(
-      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
-    );
+    assert.isTrue(check.call(checkContext, node));
   });
 
-  it('returns true if a valid header is present', function() {
-    fixture.innerHTML =
+  it('returns true if a valid header is present', function () {
+    fixtureSetup(
       '<table>' +
-      '  <tr> <th id="hi">hello</th> </tr>' +
-      '  <tr> <td headers="hi">goodbye</td> </tr>' +
-      '</table>';
+        '  <tr> <th id="hi">hello</th> </tr>' +
+        '  <tr> <td headers="hi">goodbye</td> </tr>' +
+        '</table>'
+    );
 
     var node = fixture.querySelector('table');
-    assert.isTrue(
-      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
-    );
+    assert.isTrue(check.call(checkContext, node));
   });
 
-  it('returns true if multiple valid headers are present', function() {
-    fixture.innerHTML =
+  it('returns true if multiple valid headers are present', function () {
+    fixtureSetup(
       '<table>' +
-      '  <tr> <th id="hi1">hello</th> <th id="hi2">hello</th> </tr>' +
-      '  <tr> <td headers="hi1 \t\n hi2">goodbye</td> </tr>' +
-      '</table>';
+        '  <tr> <th id="hi1">hello</th> <th id="hi2">hello</th> </tr>' +
+        '  <tr> <td headers="hi1 \t\n hi2">goodbye</td> </tr>' +
+        '</table>'
+    );
 
     var node = fixture.querySelector('table');
-    assert.isTrue(
-      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
-    );
+    assert.isTrue(check.call(checkContext, node));
   });
 
-  it('returns true with an empty header', function() {
-    fixture.innerHTML =
+  it('returns true with an empty header', function () {
+    fixtureSetup(
       '<table>' +
-      '  <tr> <th id="hi1"></th> </tr>' +
-      '  <tr> <td headers="hi1">goodbye</td> </tr>' +
-      '</table>';
+        '  <tr> <th id="hi1"></th> </tr>' +
+        '  <tr> <td headers="hi1">goodbye</td> </tr>' +
+        '</table>'
+    );
 
     var node = fixture.querySelector('table');
-    assert.isTrue(
-      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
-    );
+    assert.isTrue(check.call(checkContext, node));
   });
 
-  it('returns undefined if headers is empty', function() {
-    fixture.innerHTML =
+  it('returns undefined if headers is empty', function () {
+    fixtureSetup(
       '<table>' +
-      '  <tr> <th id="hi"> </th> </tr>' +
-      '  <tr> <td headers="">goodbye</td> </tr>' +
-      '</table>';
+        '  <tr> <th id="hi"> </th> </tr>' +
+        '  <tr> <td headers="">goodbye</td> </tr>' +
+        '</table>'
+    );
 
     var node = fixture.querySelector('table');
-    assert.isUndefined(
-      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
-    );
+    assert.isUndefined(check.call(checkContext, node));
   });
 
-  it('returns false if the header is a table cell', function() {
+  it('returns false if the header is a table cell', function () {
     var node;
 
-    fixture.innerHTML =
+    fixtureSetup(
       '<table>' +
-      '  <tr> <th> <span id="hi">hello</span> </th> </tr>' +
-      '  <tr> <td headers="h1">goodbye</td> </tr>' +
-      '</table>';
-    node = fixture.querySelector('table');
-    assert.isFalse(
-      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
+        '  <tr> <th> <span id="hi">hello</span> </th> </tr>' +
+        '  <tr> <td headers="h1">goodbye</td> </tr>' +
+        '</table>'
     );
+    node = fixture.querySelector('table');
+    assert.isFalse(check.call(checkContext, node));
 
-    fixture.innerHTML =
+    fixtureSetup(
       '<span id="hi">hello</span>' +
-      '<table>' +
-      '  <tr> <th></th> </tr>' +
-      '  <tr> <td headers="h1">goodbye</td> </tr>' +
-      '</table>';
-    node = fixture.querySelector('table');
-    assert.isFalse(
-      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
+        '<table>' +
+        '  <tr> <th></th> </tr>' +
+        '  <tr> <td headers="h1">goodbye</td> </tr>' +
+        '</table>'
     );
+    node = fixture.querySelector('table');
+    assert.isFalse(check.call(checkContext, node));
 
-    fixture.innerHTML =
+    fixtureSetup(
       '<table id="hi">' +
-      '  <tr> <th>hello</th> </tr>' +
-      '  <tr> <td headers="h1">goodbye</td> </tr>' +
-      '</table>';
-    node = fixture.querySelector('table');
-    assert.isFalse(
-      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
+        '  <tr> <th>hello</th> </tr>' +
+        '  <tr> <td headers="h1">goodbye</td> </tr>' +
+        '</table>'
     );
+    node = fixture.querySelector('table');
+    assert.isFalse(check.call(checkContext, node));
   });
 
-  it('returns false if the header refers to the same cell', function() {
-    fixture.innerHTML =
+  it('returns false if the header refers to the same cell', function () {
+    fixtureSetup(
       '<table id="hi">' +
-      '  <tr> <th>hello</th> </tr>' +
-      '  <tr> <td id="bye" headers="bye">goodbye</td> </tr>' +
-      '</table>';
+        '  <tr> <th>hello</th> </tr>' +
+        '  <tr> <td id="bye" headers="bye">goodbye</td> </tr>' +
+        '</table>'
+    );
 
     var node = fixture.querySelector('table');
-    assert.isFalse(
-      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
+    assert.isFalse(check.call(checkContext, node));
+  });
+
+  it('returns true if td[headers] is hidden', function () {
+    fixtureSetup(
+      '<table>' +
+        '  <tr> <th>Hello</th> <td headers="h1" hidden>goodbye</td> </tr>' +
+        '</table>'
     );
+    var node = fixture.querySelector('table');
+    assert.isTrue(check.call(checkContext, node));
   });
 });
diff --git a/test/integration/rules/td-headers-attr/td-headers-attr.html b/test/integration/rules/td-headers-attr/td-headers-attr.html
new file mode 100644
index 0000000000..64fc6cb33c
--- /dev/null
+++ b/test/integration/rules/td-headers-attr/td-headers-attr.html
@@ -0,0 +1,45 @@
+<table id="pass1">
+  <th>Hello</th>
+  <td>World</td>
+</table>
+
+<table id="pass2" role="grid">
+  <th id="p2h">Hello</th>
+  <td headers="p2h">World</td>
+</table>
+
+<table id="pass3" role="treegrid">
+  <th id="p3h1">Hello</th>
+  <th id="p3h2">Hello</th>
+  <td headers="p3h1 p3h2">World</td>
+</table>
+
+<table id="pass4" role="treegrid">
+  <th id="p4h">Hello</th>
+  <td id="self" headers="self" hidden>World</td>
+</table>
+
+<table id="fail1">
+  <th id="f1h1">Hello</th>
+  <td headers="f1h1 non-existing">World</td>
+</table>
+
+<table id="fail2" role="table">
+  <td id="self" headers="self">World</td>
+</table>
+
+<table id="fail3" role="none" tabindex="0">
+  <td id="self" headers="self">World</td>
+</table>
+
+<table id="inapplicable1" role="none">
+  <td id="self" headers="self">World</td>
+</table>
+
+<table id="inapplicable2" role="presentation">
+  <td id="self" headers="self">World</td>
+</table>
+
+<table id="inapplicable3" role="region">
+  <td id="self" headers="self">World</td>
+</table>
diff --git a/test/integration/rules/td-headers-attr/td-headers-attr.json b/test/integration/rules/td-headers-attr/td-headers-attr.json
new file mode 100644
index 0000000000..e687869b6b
--- /dev/null
+++ b/test/integration/rules/td-headers-attr/td-headers-attr.json
@@ -0,0 +1,6 @@
+{
+  "description": "td-headers-attr test",
+  "rule": "td-headers-attr",
+  "violations": [["#fail1"], ["#fail2"], ["#fail3"]],
+  "passes": [["#pass1"], ["#pass2"], ["#pass3"], ["#pass4"]]
+}
diff --git a/test/rule-matches/table-or-grid-role-matches.js b/test/rule-matches/table-or-grid-role-matches.js
new file mode 100644
index 0000000000..9d196ec3f1
--- /dev/null
+++ b/test/rule-matches/table-or-grid-role-matches.js
@@ -0,0 +1,51 @@
+describe('table-or-grid-role-matches', () => {
+  const { queryFixture } = axe.testUtils;
+  const rule = axe.utils.getRule('td-headers-attr');
+
+  it(`returns true for tables without role`, () => {
+    const vNode = queryFixture(`<table id="target">
+        <th id="h">foo</th> <td headers="h">bar</td>
+      </table>`);
+    assert.isTrue(rule.matches(vNode.actualNode, vNode));
+  });
+
+  ['table', 'grid', 'treegrid'].forEach(role => {
+    it(`returns true for tables with role=${role}`, () => {
+      const vNode = queryFixture(`<table id="target" role="${role}">
+          <th id="h">foo</th> <td headers="h">bar</td>
+        </table>`);
+      assert.isTrue(rule.matches(vNode.actualNode, vNode));
+    });
+  });
+
+  ['region', 'presentation', 'none'].forEach(role => {
+    it(`returns false for tables with role=${role}`, () => {
+      const vNode = queryFixture(`<table id="target" role="${role}">
+          <th id="h">foo</th> <td headers="h">bar</td>
+        </table>`);
+      assert.isFalse(rule.matches(vNode.actualNode, vNode));
+    });
+  });
+
+  it(`returns true for tables with an invalid role`, () => {
+    const vNode = queryFixture(`<table id="target" role="invalid-aria-role">
+        <th id="h">foo</th> <td headers="h">bar</td>
+      </table>`);
+    assert.isTrue(rule.matches(vNode.actualNode, vNode));
+  });
+
+  it(`returns true for focusable tables with role=none`, () => {
+    const vNode = queryFixture(`<table id="target" role="none" tabindex="0">
+        <th id="h">foo</th> <td headers="h">bar</td>
+      </table>`);
+    assert.isTrue(rule.matches(vNode.actualNode, vNode));
+  });
+
+  it(`returns true for tables with role=none but with a global ARIA attribute`, () => {
+    const vNode =
+      queryFixture(`<table id="target" role="none" aria-live="assertive">
+        <th id="h">foo</th> <td headers="h">bar</td>
+      </table>`);
+    assert.isTrue(rule.matches(vNode.actualNode, vNode));
+  });
+});

From 22407d5a89cd7835f505f4ba3f8f53c557e218ad Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Tue, 27 Sep 2022 13:19:15 +0200
Subject: [PATCH 2/3] add aria-hidden test

---
 test/checks/tables/td-headers-attr.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/checks/tables/td-headers-attr.js b/test/checks/tables/td-headers-attr.js
index 83db2b936a..4fe08bc0b6 100644
--- a/test/checks/tables/td-headers-attr.js
+++ b/test/checks/tables/td-headers-attr.js
@@ -123,4 +123,14 @@ describe('td-headers-attr', function () {
     var node = fixture.querySelector('table');
     assert.isTrue(check.call(checkContext, node));
   });
+
+  it('returns true if td[headers] has aria-hidden=true', function () {
+    fixtureSetup(
+      '<table>' +
+        '  <tr> <th>Hello</th> <td headers="h1" aria-hidden="true">goodbye</td> </tr>' +
+        '</table>'
+    );
+    var node = fixture.querySelector('table');
+    assert.isTrue(check.call(checkContext, node));
+  });
 });

From 4f6fe8ea9001c4c04fc9ac80331bdc58e0d65546 Mon Sep 17 00:00:00 2001
From: Wilco Fiers <wilco.fiers@deque.com>
Date: Wed, 28 Sep 2022 11:20:39 +0200
Subject: [PATCH 3/3] revert hidden cell code

---
 lib/checks/tables/td-headers-attr-evaluate.js |   3 +-
 test/checks/tables/td-headers-attr.js         | 140 ++++++++----------
 .../td-headers-attr/td-headers-attr.html      |   5 -
 .../td-headers-attr/td-headers-attr.json      |   2 +-
 4 files changed, 66 insertions(+), 84 deletions(-)

diff --git a/lib/checks/tables/td-headers-attr-evaluate.js b/lib/checks/tables/td-headers-attr-evaluate.js
index caef8f9a3a..e781330794 100644
--- a/lib/checks/tables/td-headers-attr-evaluate.js
+++ b/lib/checks/tables/td-headers-attr-evaluate.js
@@ -1,5 +1,4 @@
 import { tokenList } from '../../core/utils';
-import { isVisibleForScreenreader } from '../../commons/dom';
 
 function tdHeadersAttrEvaluate(node) {
   const cells = [];
@@ -25,7 +24,7 @@ function tdHeadersAttrEvaluate(node) {
     let isSelf = false;
     let notOfTable = false;
 
-    if (!cell.hasAttribute('headers') || !isVisibleForScreenreader(cell)) {
+    if (!cell.hasAttribute('headers')) {
       return;
     }
 
diff --git a/test/checks/tables/td-headers-attr.js b/test/checks/tables/td-headers-attr.js
index 4fe08bc0b6..8df3cc03e3 100644
--- a/test/checks/tables/td-headers-attr.js
+++ b/test/checks/tables/td-headers-attr.js
@@ -3,134 +3,122 @@ describe('td-headers-attr', function () {
 
   var fixture = document.getElementById('fixture');
   var checkContext = axe.testUtils.MockCheckContext();
-  var fixtureSetup = axe.testUtils.fixtureSetup;
-  var check = axe.testUtils.getCheckEvaluate('td-headers-attr');
 
   afterEach(function () {
+    fixture.innerHTML = '';
     checkContext.reset();
   });
 
   it('returns true no headers attribute is present', function () {
-    fixtureSetup(
+    fixture.innerHTML =
       '<table>' +
-        '  <tr> <th>hi</th> <td>hello</td> </tr>' +
-        '  <tr> <th>hi</th> <td>hello</td> </tr>' +
-        '</table>'
-    );
+      '  <tr> <th>hi</th> <td>hello</td> </tr>' +
+      '  <tr> <th>hi</th> <td>hello</td> </tr>' +
+      '</table>';
 
     var node = fixture.querySelector('table');
-    assert.isTrue(check.call(checkContext, node));
+    assert.isTrue(
+      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
+    );
   });
 
   it('returns true if a valid header is present', function () {
-    fixtureSetup(
+    fixture.innerHTML =
       '<table>' +
-        '  <tr> <th id="hi">hello</th> </tr>' +
-        '  <tr> <td headers="hi">goodbye</td> </tr>' +
-        '</table>'
-    );
+      '  <tr> <th id="hi">hello</th> </tr>' +
+      '  <tr> <td headers="hi">goodbye</td> </tr>' +
+      '</table>';
 
     var node = fixture.querySelector('table');
-    assert.isTrue(check.call(checkContext, node));
+    assert.isTrue(
+      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
+    );
   });
 
   it('returns true if multiple valid headers are present', function () {
-    fixtureSetup(
+    fixture.innerHTML =
       '<table>' +
-        '  <tr> <th id="hi1">hello</th> <th id="hi2">hello</th> </tr>' +
-        '  <tr> <td headers="hi1 \t\n hi2">goodbye</td> </tr>' +
-        '</table>'
-    );
+      '  <tr> <th id="hi1">hello</th> <th id="hi2">hello</th> </tr>' +
+      '  <tr> <td headers="hi1 \t\n hi2">goodbye</td> </tr>' +
+      '</table>';
 
     var node = fixture.querySelector('table');
-    assert.isTrue(check.call(checkContext, node));
+    assert.isTrue(
+      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
+    );
   });
 
   it('returns true with an empty header', function () {
-    fixtureSetup(
+    fixture.innerHTML =
       '<table>' +
-        '  <tr> <th id="hi1"></th> </tr>' +
-        '  <tr> <td headers="hi1">goodbye</td> </tr>' +
-        '</table>'
-    );
+      '  <tr> <th id="hi1"></th> </tr>' +
+      '  <tr> <td headers="hi1">goodbye</td> </tr>' +
+      '</table>';
 
     var node = fixture.querySelector('table');
-    assert.isTrue(check.call(checkContext, node));
+    assert.isTrue(
+      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
+    );
   });
 
   it('returns undefined if headers is empty', function () {
-    fixtureSetup(
+    fixture.innerHTML =
       '<table>' +
-        '  <tr> <th id="hi"> </th> </tr>' +
-        '  <tr> <td headers="">goodbye</td> </tr>' +
-        '</table>'
-    );
+      '  <tr> <th id="hi"> </th> </tr>' +
+      '  <tr> <td headers="">goodbye</td> </tr>' +
+      '</table>';
 
     var node = fixture.querySelector('table');
-    assert.isUndefined(check.call(checkContext, node));
+    assert.isUndefined(
+      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
+    );
   });
 
   it('returns false if the header is a table cell', function () {
     var node;
 
-    fixtureSetup(
+    fixture.innerHTML =
       '<table>' +
-        '  <tr> <th> <span id="hi">hello</span> </th> </tr>' +
-        '  <tr> <td headers="h1">goodbye</td> </tr>' +
-        '</table>'
-    );
+      '  <tr> <th> <span id="hi">hello</span> </th> </tr>' +
+      '  <tr> <td headers="h1">goodbye</td> </tr>' +
+      '</table>';
     node = fixture.querySelector('table');
-    assert.isFalse(check.call(checkContext, node));
+    assert.isFalse(
+      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
+    );
 
-    fixtureSetup(
+    fixture.innerHTML =
       '<span id="hi">hello</span>' +
-        '<table>' +
-        '  <tr> <th></th> </tr>' +
-        '  <tr> <td headers="h1">goodbye</td> </tr>' +
-        '</table>'
-    );
+      '<table>' +
+      '  <tr> <th></th> </tr>' +
+      '  <tr> <td headers="h1">goodbye</td> </tr>' +
+      '</table>';
     node = fixture.querySelector('table');
-    assert.isFalse(check.call(checkContext, node));
+    assert.isFalse(
+      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
+    );
 
-    fixtureSetup(
+    fixture.innerHTML =
       '<table id="hi">' +
-        '  <tr> <th>hello</th> </tr>' +
-        '  <tr> <td headers="h1">goodbye</td> </tr>' +
-        '</table>'
-    );
+      '  <tr> <th>hello</th> </tr>' +
+      '  <tr> <td headers="h1">goodbye</td> </tr>' +
+      '</table>';
     node = fixture.querySelector('table');
-    assert.isFalse(check.call(checkContext, node));
+    assert.isFalse(
+      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
+    );
   });
 
   it('returns false if the header refers to the same cell', function () {
-    fixtureSetup(
+    fixture.innerHTML =
       '<table id="hi">' +
-        '  <tr> <th>hello</th> </tr>' +
-        '  <tr> <td id="bye" headers="bye">goodbye</td> </tr>' +
-        '</table>'
-    );
+      '  <tr> <th>hello</th> </tr>' +
+      '  <tr> <td id="bye" headers="bye">goodbye</td> </tr>' +
+      '</table>';
 
     var node = fixture.querySelector('table');
-    assert.isFalse(check.call(checkContext, node));
-  });
-
-  it('returns true if td[headers] is hidden', function () {
-    fixtureSetup(
-      '<table>' +
-        '  <tr> <th>Hello</th> <td headers="h1" hidden>goodbye</td> </tr>' +
-        '</table>'
+    assert.isFalse(
+      axe.testUtils.getCheckEvaluate('td-headers-attr').call(checkContext, node)
     );
-    var node = fixture.querySelector('table');
-    assert.isTrue(check.call(checkContext, node));
-  });
-
-  it('returns true if td[headers] has aria-hidden=true', function () {
-    fixtureSetup(
-      '<table>' +
-        '  <tr> <th>Hello</th> <td headers="h1" aria-hidden="true">goodbye</td> </tr>' +
-        '</table>'
-    );
-    var node = fixture.querySelector('table');
-    assert.isTrue(check.call(checkContext, node));
   });
 });
diff --git a/test/integration/rules/td-headers-attr/td-headers-attr.html b/test/integration/rules/td-headers-attr/td-headers-attr.html
index 64fc6cb33c..c0afe4060a 100644
--- a/test/integration/rules/td-headers-attr/td-headers-attr.html
+++ b/test/integration/rules/td-headers-attr/td-headers-attr.html
@@ -14,11 +14,6 @@
   <td headers="p3h1 p3h2">World</td>
 </table>
 
-<table id="pass4" role="treegrid">
-  <th id="p4h">Hello</th>
-  <td id="self" headers="self" hidden>World</td>
-</table>
-
 <table id="fail1">
   <th id="f1h1">Hello</th>
   <td headers="f1h1 non-existing">World</td>
diff --git a/test/integration/rules/td-headers-attr/td-headers-attr.json b/test/integration/rules/td-headers-attr/td-headers-attr.json
index e687869b6b..cda7bf99cb 100644
--- a/test/integration/rules/td-headers-attr/td-headers-attr.json
+++ b/test/integration/rules/td-headers-attr/td-headers-attr.json
@@ -2,5 +2,5 @@
   "description": "td-headers-attr test",
   "rule": "td-headers-attr",
   "violations": [["#fail1"], ["#fail2"], ["#fail3"]],
-  "passes": [["#pass1"], ["#pass2"], ["#pass3"], ["#pass4"]]
+  "passes": [["#pass1"], ["#pass2"], ["#pass3"]]
 }