diff --git a/html-aam/fragile/area-role.html b/html-aam/fragile/area-role.html
index 9b6ded56860631..3ed17f8b3b8765 100644
--- a/html-aam/fragile/area-role.html
+++ b/html-aam/fragile/area-role.html
@@ -13,12 +13,13 @@
 
 <map name="areamap">
     <area shape="rect" coords="0,0,15,15" href="#" alt="x" data-testname="el-area" data-expectedrole="link" class="ex">
-    <area shape="rect" coords="15,15,31,31" alt="x" data-testname="el-area-no-href" data-expectedrole="generic" class="ex">
+    <area shape="rect" coords="15,15,31,31" alt="x" data-testname="el-area-no-href" class="ex-generic">
 </map>
 <img usemap="#areamap" src="#" style="width: 32px; height: 32px;" alt="x">
 
 <script>
 AriaUtils.verifyRolesBySelector(".ex");
+AriaUtils.verifyGenericRolesBySelector(".ex-generic");
 </script>
 
 </body>
diff --git a/html-aam/roles.html b/html-aam/roles.html
index 4b24743c8d520c..2ffda4d4845059 100644
--- a/html-aam/roles.html
+++ b/html-aam/roles.html
@@ -88,8 +88,8 @@ <h6 data-testname="el-h6" data-expectedrole="heading" class="ex">x</h6>
 <img src="#" alt="x" data-testname="el-img" data-expectedrole="image" class="ex">
 
 <!-- Implementations might also be valid if ignored rather than returning 'none' for the following images. -->
-<img src="#" alt data-testname="el-img-alt-no-value" data-expectedrole="none" class="ex">
-<img src="#" alt="" data-testname="el-img-empty-alt" data-expectedrole="none" class="ex">
+<img src="#" alt data-testname="el-img-alt-no-value" class="ex-generic">
+<img src="#" alt="" data-testname="el-img-empty-alt" class="ex-generic">
 
 <input type="button" value="x" data-testname="el-input-button" data-expectedrole="button" class="ex">
 <input type="checkbox" data-testname="el-input-checkbox" data-expectedrole="checkbox" class="ex">
@@ -199,6 +199,7 @@ <h6 data-testname="el-h6" data-expectedrole="heading" class="ex">x</h6>
 
 <script>
 AriaUtils.verifyRolesBySelector(".ex");
+AriaUtils.verifyGenericRolesBySelector(".ex-generic");
 </script>
 
 </body>
diff --git a/wai-aria/role/grid-roles.html b/wai-aria/role/grid-roles.html
index d26af5d76fda6d..04fb72d909b832 100644
--- a/wai-aria/role/grid-roles.html
+++ b/wai-aria/role/grid-roles.html
@@ -41,12 +41,13 @@
     </div>
   </div>
 
-  <div role="gridcell" data-testname="orphaned gridcell outside the context of row" data-expectedrole="none" class="ex">x</div>
-  <div role="rowheader" data-testname="orphaned rowheader outside the context of row" data-expectedrole="none" class="ex">x</div>
-  <div role="columnheader" data-testname="orphaned columnheader outside the context of row" data-expectedrole="none" class="ex">x</div>
+  <div role="gridcell" data-testname="orphaned gridcell outside the context of row" class="ex-generic">x</div>
+  <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/role_none_conflict_resolution.html b/wai-aria/role/role_none_conflict_resolution.html
index efb247fc77cfe2..9e2ee6ccfe59ce 100644
--- a/wai-aria/role/role_none_conflict_resolution.html
+++ b/wai-aria/role/role_none_conflict_resolution.html
@@ -18,19 +18,20 @@ <h1 role="none" data-testname="heading role none with global attr aria-label" da
 
 <!-- none with label(global) on paragraph -->
 <p role="none" data-testname="p role none with global attr aria-label (prohibited role)" data-expectedrole="paragraph" aria-label="x" class="ex">x</p>
-<p role="none" data-testname="p role none without global attr aria-label (prohibited role)" data-expectedrole="none" class="ex">x</p>
+<p role="none" data-testname="p role none without global attr aria-label (prohibited role)" class="ex-generic">x</p>
 
 <!-- none with focusable header -->
 <h1 role="none" data-testname="focusable heading role none with tabindex=0" data-expectedrole="heading" tabindex="0" class="ex">x</h1>
 <h1 role="none" data-testname="focusable heading role none with tabindex=-1" data-expectedrole="heading" tabindex="-1" class="ex">x</h1>
-<h1 role="none" data-testname="non-focusable heading role none" data-expectedrole="none" class="ex">x</h1>
+<h1 role="none" data-testname="non-focusable heading role none" class="ex-generic">x</h1>
 
 <!-- none with non-global-->
-<h1 role="none" data-testname="none with non-global" data-expectedrole="none" class="ex" aria-level="2"> Sample Content </h1>
+<h1 role="none" data-testname="none with non-global" class="ex-generic" aria-level="2"> Sample Content </h1>
 
 
 <script>
 AriaUtils.verifyRolesBySelector(".ex");
+AriaUtils.verifyGenericRolesBySelector(".ex-generic");
 </script>
 
 </body>
diff --git a/wai-aria/role/synonym-roles.html b/wai-aria/role/synonym-roles.html
index 06a6a776f45bb1..f9d3d7d0a9a995 100644
--- a/wai-aria/role/synonym-roles.html
+++ b/wai-aria/role/synonym-roles.html
@@ -15,8 +15,8 @@
 
 <!-- spec resolution https://github.com/w3c/core-aam/issues/166 -->
 
-<div role="none" id="none" data-expectedrole="none" data-testname="none role == computedrole none" class="ex">x</div><!-- preferred -->
-<div role="presentation" id="presentation" data-expectedrole="none" data-testname="synonym presentation role == computedrole none" class="ex">x</div><!-- synonym -->
+<div role="none" id="none" data-testname="none role == computedrole none" class="ex-generic">x</div><!-- preferred -->
+<div role="presentation" id="presentation" data-testname="synonym presentation role == computedrole none" class="ex-generic">x</div><!-- synonym -->
 
 <div role="image" id="image" data-expectedrole="image" data-testname="image role == computedrole image" class="ex">x</div><!-- preferred -->
 <div role="img" id="img" data-expectedrole="image" data-testname="synonym img role == computedrole image" class="ex">x</div><!-- synonym -->
@@ -28,6 +28,7 @@
 
 <script>
 AriaUtils.verifyRolesBySelector(".ex");
+AriaUtils.verifyGenericRolesBySelector(".ex-generic");
 </script>
 </body>
 </html>
\ No newline at end of file