diff --git a/html-aam/roles-generic.html b/html-aam/roles-generic.html
index e6ff46b0662529..e64d88e3d010f1 100644
--- a/html-aam/roles-generic.html
+++ b/html-aam/roles-generic.html
@@ -26,7 +26,6 @@
 <!-- footer -> ./roles-contextual.html -->
 <!-- header -> ./roles-contextual.html -->
 <i data-testname="el-i" class="ex-generic">x</i>
-<li data-testname="el-li-orphaned" class="ex-generic">x</li><!-- todo: should orphaned roles be tested in a new ./roles-orphaned.html file? -->
 <pre data-testname="el-pre" class="ex-generic">x</pre>
 <q data-testname="el-q" class="ex-generic">x</q>
 <samp data-testname="el-samp" class="ex-generic">x</samp>
diff --git a/html-aam/roles-generic.tentative.html b/html-aam/roles-generic.tentative.html
new file mode 100644
index 00000000000000..09a39d2e635c5c
--- /dev/null
+++ b/html-aam/roles-generic.tentative.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html>
+<head>
+  <title>Tentative: HTML-AAM Generic Role Verification Tests</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+<li data-testname="el-li-orphaned" class="ex-generic">x</li><!-- todo: should orphaned roles be tested in a new ./roles-orphaned.html file? -->
+
+<script>
+AriaUtils.verifyGenericRolesBySelector(".ex-generic");
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/wai-aria/role/grid-roles.html b/wai-aria/role/grid-roles.html
index 2ca3705cf01a6d..c67119725869c0 100644
--- a/wai-aria/role/grid-roles.html
+++ b/wai-aria/role/grid-roles.html
@@ -43,22 +43,8 @@
     </div>
   </div>
 
-  <!--
-    CORE-AAM requires that, for elements with roles not contained in the
-    required context, user agents must ignore the role token and return the
-    computed role as if the ignored role token had not been included.
-    See https://w3c.github.io/core-aam/#roleMappingComputedRole
-  -->
-  <span role="row" data-testname="orphaned row outside the context of table" class="ex-generic">x</span>
-  <span role="rowgroup" data-testname="orphaned rowgroup outside the context of row" class="ex-generic">x</span>
-  <div role="gridcell" data-testname="orphaned div with gridcell role outside the context of row" class="ex-generic">x</div>
-  <button role="gridcell" data-testname="orphaned button with gridcell role outside the context of row" data-expectedrole="button" class="ex">x</button>
-  <div role="rowheader" data-testname="orphaned rowheader outside the context of row" class="ex-generic">x</div>
-  <div role="columnheader" data-testname="orphaned columnheader outside the context of row" class="ex-generic">x</div>
-
 <script>
 AriaUtils.verifyRolesBySelector(".ex");
-AriaUtils.verifyGenericRolesBySelector(".ex-generic");
 </script>
 
 </body>
diff --git a/wai-aria/role/grid-roles.tentative.html b/wai-aria/role/grid-roles.tentative.html
new file mode 100644
index 00000000000000..49d54195c90855
--- /dev/null
+++ b/wai-aria/role/grid-roles.tentative.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Tentative: Grid Role Verification Tests</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+    <script src="/resources/testdriver-actions.js"></script>
+    <script src="/wai-aria/scripts/aria-utils.js"></script>
+  </head>
+  <body>
+
+  <!--
+    CORE-AAM requires that, for elements with roles not contained in the
+    required context, user agents must ignore the role token and return the
+    computed role as if the ignored role token had not been included.
+    See https://w3c.github.io/core-aam/#roleMappingComputedRole
+  -->
+  <span role="row" data-testname="orphaned row outside the context of table" class="ex-generic">x</span>
+  <span role="rowgroup" data-testname="orphaned rowgroup outside the context of row" class="ex-generic">x</span>
+  <div role="gridcell" data-testname="orphaned div with gridcell role outside the context of row" class="ex-generic">x</div>
+  <button role="gridcell" data-testname="orphaned button with gridcell role outside the context of row" data-expectedrole="button" class="ex">x</button>
+  <div role="rowheader" data-testname="orphaned rowheader outside the context of row" class="ex-generic">x</div>
+  <div role="columnheader" data-testname="orphaned columnheader outside the context of row" class="ex-generic">x</div>
+
+<script>
+AriaUtils.verifyRolesBySelector(".ex");
+AriaUtils.verifyGenericRolesBySelector(".ex-generic");
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/wai-aria/role/list-roles.html b/wai-aria/role/list-roles.html
index 3fd3bfa0e6982d..da097ce67e8932 100644
--- a/wai-aria/role/list-roles.html
+++ b/wai-aria/role/list-roles.html
@@ -18,18 +18,8 @@
   <div role="listitem" data-testname="last simple listitem" data-expectedrole="listitem" class="ex">x</div>
 </div>
 
-<!--
-  CORE-AAM requires that, for elements with roles not contained in the
-  required context, user agents must ignore the role token and return the
-  computed role as if the ignored role token had not been included.
-  See https://w3c.github.io/core-aam/#roleMappingComputedRole
--->
-<div role="listitem" data-testname="orphan div with listitem role" class="ex-generic">x</div>
-<p role="listitem" data-testname="orphan p with listitem role" data-expectedrole="paragraph" class="ex">x</p>
-
 <script>
 AriaUtils.verifyRolesBySelector(".ex");
-AriaUtils.verifyGenericRolesBySelector(".ex-generic");
 </script>
 
 </body>
diff --git a/wai-aria/role/list-roles.tentative.html b/wai-aria/role/list-roles.tentative.html
new file mode 100644
index 00000000000000..3106424ac3668e
--- /dev/null
+++ b/wai-aria/role/list-roles.tentative.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html>
+<head>
+  <title>Tentative: List-related Role Verification Tests</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+<!--
+  CORE-AAM requires that, for elements with roles not contained in the
+  required context, user agents must ignore the role token and return the
+  computed role as if the ignored role token had not been included.
+  See https://w3c.github.io/core-aam/#roleMappingComputedRole
+-->
+<div role="listitem" data-testname="orphan div with listitem role" class="ex-generic">x</div>
+<p role="listitem" data-testname="orphan p with listitem role" data-expectedrole="paragraph" class="ex">x</p>
+
+<script>
+AriaUtils.verifyRolesBySelector(".ex");
+AriaUtils.verifyGenericRolesBySelector(".ex-generic");
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/wai-aria/role/listbox-roles.html b/wai-aria/role/listbox-roles.html
index 3d26f04d51a343..100ef6bca72e6d 100644
--- a/wai-aria/role/listbox-roles.html
+++ b/wai-aria/role/listbox-roles.html
@@ -31,16 +31,6 @@
     </li>
 </ul>
 
-<!--
-  CORE-AAM requires that, for elements with roles not contained in the
-  required context, user agents must ignore the role token and return the
-  computed role as if the ignored role token had not been included.
-  See https://w3c.github.io/core-aam/#roleMappingComputedRole
--->
-<nav role="option" data-testname="orphaned option outside the context of listbox" data-expectedrole="navigation"
-     class="ex">x
-</nav>
-
 <script>
     AriaUtils.verifyRolesBySelector(".ex");
 </script>
diff --git a/wai-aria/role/listbox-roles.tentative.html b/wai-aria/role/listbox-roles.tentative.html
new file mode 100644
index 00000000000000..e32c565aa9aa17
--- /dev/null
+++ b/wai-aria/role/listbox-roles.tentative.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html>
+<head>
+    <title>Tentative: Listbox-related Role Verification Tests</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+    <script src="/resources/testdriver-actions.js"></script>
+    <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+<!--
+  CORE-AAM requires that, for elements with roles not contained in the
+  required context, user agents must ignore the role token and return the
+  computed role as if the ignored role token had not been included.
+  See https://w3c.github.io/core-aam/#roleMappingComputedRole
+-->
+<nav role="option" data-testname="orphaned option outside the context of listbox" data-expectedrole="navigation"
+     class="ex">x
+</nav>
+
+<script>
+    AriaUtils.verifyRolesBySelector(".ex");
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/wai-aria/role/menu-roles.html b/wai-aria/role/menu-roles.html
index fed15769ab8b11..edb5cce5021c6a 100644
--- a/wai-aria/role/menu-roles.html
+++ b/wai-aria/role/menu-roles.html
@@ -55,34 +55,8 @@
     </div>
 </div>
 
-<!--
-  CORE-AAM requires that, for elements with roles not contained in the
-  required context, user agents must ignore the role token and return the
-  computed role as if the ignored role token had not been included.
-  See https://w3c.github.io/core-aam/#roleMappingComputedRole
--->
-<nav role="menuitem" data-testname="orphaned menuitem outside the context of menu/menubar" data-expectedrole="navigation"
-     class="ex">x
-</nav>
-<nav role="menuitemradio" data-testname="orphaned menuitemradio outside the context of menu/menubar" data-expectedrole="navigation"
-     class="ex">x
-</nav>
-<nav role="menuitemcheckbox" data-testname="orphaned menuitemcheckbox outside the context of menu/menubar" data-expectedrole="navigation"
-     class="ex">x
-</nav>
-
-<button role="menuitem" data-testname="orphan button with menuitem role" data-expectedrole="button" class="ex">x</button>
-<div role="menuitem" data-testname="orphan div with menuitem role" class="ex-generic">x</div>
-
-<button role="menuitemcheckbox" data-testname="orphan button with menuitemcheckbox role" data-expectedrole="button" class="ex">x</button>
-<div role="menuitemcheckbox" data-testname="orphan div with menuitemcheckbox role" class="ex-generic">x</div>
-
-<button role="menuitemradio" data-testname="orphan button with menuitemradio role" data-expectedrole="button" class="ex">x</button>
-<div role="menuitemradio" data-testname="orphan div with menuitemradio role" class="ex-generic">x</div>
-
 <script>
     AriaUtils.verifyRolesBySelector(".ex");
-    AriaUtils.verifyGenericRolesBySelector(".ex-generic");
 </script>
 
 </body>
diff --git a/wai-aria/role/menu-roles.tentative.html b/wai-aria/role/menu-roles.tentative.html
new file mode 100644
index 00000000000000..98e032e16e0d84
--- /dev/null
+++ b/wai-aria/role/menu-roles.tentative.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<html>
+<head>
+    <title>Tentative: Menu-related Role Verification Tests</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+    <script src="/resources/testdriver-actions.js"></script>
+    <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+<!--
+  CORE-AAM requires that, for elements with roles not contained in the
+  required context, user agents must ignore the role token and return the
+  computed role as if the ignored role token had not been included.
+  See https://w3c.github.io/core-aam/#roleMappingComputedRole
+-->
+<nav role="menuitem" data-testname="orphaned menuitem outside the context of menu/menubar" data-expectedrole="navigation"
+     class="ex">x
+</nav>
+<nav role="menuitemradio" data-testname="orphaned menuitemradio outside the context of menu/menubar" data-expectedrole="navigation"
+     class="ex">x
+</nav>
+<nav role="menuitemcheckbox" data-testname="orphaned menuitemcheckbox outside the context of menu/menubar" data-expectedrole="navigation"
+     class="ex">x
+</nav>
+
+<button role="menuitem" data-testname="orphan button with menuitem role" data-expectedrole="button" class="ex">x</button>
+<div role="menuitem" data-testname="orphan div with menuitem role" class="ex-generic">x</div>
+
+<button role="menuitemcheckbox" data-testname="orphan button with menuitemcheckbox role" data-expectedrole="button" class="ex">x</button>
+<div role="menuitemcheckbox" data-testname="orphan div with menuitemcheckbox role" class="ex-generic">x</div>
+
+<button role="menuitemradio" data-testname="orphan button with menuitemradio role" data-expectedrole="button" class="ex">x</button>
+<div role="menuitemradio" data-testname="orphan div with menuitemradio role" class="ex-generic">x</div>
+
+<script>
+    AriaUtils.verifyRolesBySelector(".ex");
+    AriaUtils.verifyGenericRolesBySelector(".ex-generic");
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/wai-aria/role/tab-roles.html b/wai-aria/role/tab-roles.html
index 6561614dd815a2..f84504e0b45c8c 100644
--- a/wai-aria/role/tab-roles.html
+++ b/wai-aria/role/tab-roles.html
@@ -82,18 +82,8 @@
     <div role="tabpanel" data-testname="role is tabpanel as sibling to ul with child role none li elements" data-expectedrole="tabpanel" class="ex">Tab one's stuff</div>
     <div role="tabpanel" data-testname="role is tabpanel as sibling to ul with child role none li elements (duplicate)" data-expectedrole="tabpanel" class="ex">Tab two's stuff</div>
 
-<!--
-  CORE-AAM requires that, for elements with roles not contained in the
-  required context, user agents must ignore the role token and return the
-  computed role as if the ignored role token had not been included.
-  See https://w3c.github.io/core-aam/#roleMappingComputedRole
--->
-<button role="tab" data-testname="orphan button with tab role" data-expectedrole="button" class="ex">x</button>
-<span role="tab" data-testname="orphan span with tab role" class="ex-generic">x</span>
-
 <script>
     AriaUtils.verifyRolesBySelector(".ex");
-    AriaUtils.verifyGenericRolesBySelector(".ex-generic");
 </script>
 
 </body>
diff --git a/wai-aria/role/tab-roles.tentative.html b/wai-aria/role/tab-roles.tentative.html
new file mode 100644
index 00000000000000..17dd85f6c598f7
--- /dev/null
+++ b/wai-aria/role/tab-roles.tentative.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html>
+<head>
+    <title>Tentative: Tab-related Role Verification Tests</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+    <script src="/resources/testdriver-actions.js"></script>
+    <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+<!--
+  CORE-AAM requires that, for elements with roles not contained in the
+  required context, user agents must ignore the role token and return the
+  computed role as if the ignored role token had not been included.
+  See https://w3c.github.io/core-aam/#roleMappingComputedRole
+-->
+<button role="tab" data-testname="orphan button with tab role" data-expectedrole="button" class="ex">x</button>
+<span role="tab" data-testname="orphan span with tab role" class="ex-generic">x</span>
+
+<script>
+    AriaUtils.verifyRolesBySelector(".ex");
+    AriaUtils.verifyGenericRolesBySelector(".ex-generic");
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/wai-aria/role/table-roles.html b/wai-aria/role/table-roles.html
index 6ffb94218d6174..c43533fc77aa1e 100644
--- a/wai-aria/role/table-roles.html
+++ b/wai-aria/role/table-roles.html
@@ -79,8 +79,6 @@
         </div>
     </div>
 
-    <!-- columnheader, orphaned -> ./grid-roles.html -->
-
     <!-- row -->
     <div role="table">
         <div role="rowgroup">
@@ -95,8 +93,6 @@
         </div>
     </div>
 
-    <!-- row, orphaned -> ./grid-roles.html -->
-
     <!-- rowgroup -->
     <div role="table">
         <div role="rowgroup" data-testname="div role is rowgroup (in div with table role)" data-expectedrole="rowgroup" class="ex">
@@ -113,8 +109,6 @@
         </div>
     </div>
 
-    <!-- rowgroup, orphaned -> ./grid-roles.html -->
-
     <!-- rowheader -->
     <div role="table">
         <div role="rowgroup">
@@ -134,8 +128,6 @@
         </div>
       </div>
 
-    <!-- rowheader, orphaned -> ./grid-roles.html -->
-
     <!-- table -->
     <div role="table" data-testname="div role is table" data-expectedrole="table" class="ex">
         <div role="row">
diff --git a/wai-aria/role/tree-roles.html b/wai-aria/role/tree-roles.html
index 5d179fbcbf2811..cc56b3a56bd64e 100644
--- a/wai-aria/role/tree-roles.html
+++ b/wai-aria/role/tree-roles.html
@@ -102,15 +102,6 @@
   </tbody>
 </table>
 
-<!--
-  CORE-AAM requires that, for elements with roles not contained in the
-  required context, user agents must ignore the role token and return the
-  computed role as if the ignored role token had not been included.
-  See https://w3c.github.io/core-aam/#roleMappingComputedRole
--->
-<nav role="treeitem" data-testname="orphaned treeitem outside the context of tree" data-expectedrole="navigation" class="ex">x</nav>
-<button role="treeitem" data-testname="orphaned button with treeitem role outside tree context" data-expectedrole="button" class="ex">x</button>
-
 <script>
   AriaUtils.verifyRolesBySelector(".ex");
 
diff --git a/wai-aria/role/tree-roles.tentative.html b/wai-aria/role/tree-roles.tentative.html
new file mode 100644
index 00000000000000..4c6d56ba298e7d
--- /dev/null
+++ b/wai-aria/role/tree-roles.tentative.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<html>
+<head>
+  <title>Tentative: Tree related Role Verification Tests</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+<!--
+  CORE-AAM requires that, for elements with roles not contained in the
+  required context, user agents must ignore the role token and return the
+  computed role as if the ignored role token had not been included.
+  See https://w3c.github.io/core-aam/#roleMappingComputedRole
+-->
+<nav role="treeitem" data-testname="orphaned treeitem outside the context of tree" data-expectedrole="navigation" class="ex">x</nav>
+<button role="treeitem" data-testname="orphaned button with treeitem role outside tree context" data-expectedrole="button" class="ex">x</button>
+
+<script>
+  AriaUtils.verifyRolesBySelector(".ex");
+</script>
+
+</body>
+</html>
\ No newline at end of file
