--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -572734,17 +572734,17 @@
    "7c37c98eb39d994a89314c45c216bcb27b51f2d1",
    "support"
   ],
   "interfaces/hr-time.idl": [
    "db4f313176e4fdfb8efd78545079da42cbb0729b",
    "support"
   ],
   "interfaces/html.idl": [
-   "b2b35732b54cbe3406493a6c121363eccceb4f5c",
+   "7b9b8b054ad2848e7c5983e46222fbdf8b3b8da8",
    "support"
   ],
   "interfaces/keyboard-lock.idl": [
    "7188a9233db3acc741650d46156e16e9e7a132fa",
    "support"
   ],
   "interfaces/magnetometer.idl": [
    "ffac480912edba82886fef6d5368092d237a0c7f",

--- a/testing/web-platform/tests/interfaces/html.idl
+++ b/testing/web-platform/tests/interfaces/html.idl
@@ -92,24 +92,20 @@ Document includes DocumentAndElementEven
 [Exposed=Window,
  HTMLConstructor]
 interface HTMLElement : Element {
   // metadata attributes
   [CEReactions] attribute DOMString title;
   [CEReactions] attribute DOMString lang;
   [CEReactions] attribute boolean translate;
   [CEReactions] attribute DOMString dir;
-  [SameObject] readonly attribute DOMStringMap dataset;
 
   // user interaction
   [CEReactions] attribute boolean hidden;
   void click();
-  [CEReactions] attribute long tabIndex;
-  void focus(optional FocusOptions options);
-  void blur();
   [CEReactions] attribute DOMString accessKey;
   readonly attribute DOMString accessKeyLabel;
   [CEReactions] attribute boolean draggable;
   [CEReactions] attribute boolean spellcheck;
 
   [CEReactions] attribute [TreatNullAs=EmptyString] DOMString innerText;
 };
 
@@ -119,16 +115,27 @@ dictionary FocusOptions {
 
 HTMLElement includes GlobalEventHandlers;
 HTMLElement includes DocumentAndElementEventHandlers;
 HTMLElement includes ElementContentEditable;
 
 // Note: intentionally not [HTMLConstructor]
 interface HTMLUnknownElement : HTMLElement { };
 
+interface mixin HTMLOrSVGElement {
+  [SameObject] readonly attribute DOMStringMap dataset;
+  attribute DOMString nonce;
+
+  [CEReactions] attribute long tabIndex;
+  void focus(optional FocusOptions options);
+  void blur();
+};
+HTMLElement includes HTMLOrSVGElement;
+SVGElement includes HTMLOrSVGElement;
+
 [Exposed=Window,
  OverrideBuiltins]
 interface DOMStringMap {
   getter DOMString (DOMString name);
   [CEReactions] setter void (DOMString name, DOMString value);
   [CEReactions] deleter void (DOMString name);
 };
 
@@ -159,26 +166,21 @@ interface HTMLBaseElement : HTMLElement 
  HTMLConstructor]
 interface HTMLLinkElement : HTMLElement {
   [CEReactions] attribute USVString href;
   [CEReactions] attribute DOMString? crossOrigin;
   [CEReactions] attribute DOMString rel;
   [CEReactions] attribute DOMString as; // (default "")
   [SameObject, PutForwards=value] readonly attribute DOMTokenList relList;
   [CEReactions] attribute DOMString media;
-  [CEReactions] attribute DOMString nonce;
   [CEReactions] attribute DOMString integrity;
   [CEReactions] attribute DOMString hreflang;
   [CEReactions] attribute DOMString type;
   [SameObject, PutForwards=value] readonly attribute DOMTokenList sizes;
   [CEReactions] attribute DOMString referrerPolicy;
-  [CEReactions] attribute DOMString workerType;
-  [CEReactions] attribute DOMString updateViaCache;
-
-  // also has obsolete members
 };
 HTMLLinkElement includes LinkStyle;
 
 [Exposed=Window,
  HTMLConstructor]
 interface HTMLMetaElement : HTMLElement {
   [CEReactions] attribute DOMString name;
   [CEReactions] attribute DOMString httpEquiv;
@@ -186,18 +188,16 @@ interface HTMLMetaElement : HTMLElement 
 
   // also has obsolete members
 };
 
 [Exposed=Window,
  HTMLConstructor]
 interface HTMLStyleElement : HTMLElement {
   [CEReactions] attribute DOMString media;
-  [CEReactions] attribute DOMString nonce;
-  [CEReactions] attribute DOMString type;
 };
 HTMLStyleElement includes LinkStyle;
 
 [Exposed=Window,
  HTMLConstructor]
 interface HTMLBodyElement : HTMLElement {
   // also has obsolete members
 };
@@ -1103,21 +1103,18 @@ interface HTMLDialogElement : HTMLElemen
 interface HTMLScriptElement : HTMLElement {
   [CEReactions] attribute USVString src;
   [CEReactions] attribute DOMString type;
   [CEReactions] attribute boolean noModule;
   [CEReactions] attribute boolean async;
   [CEReactions] attribute boolean defer;
   [CEReactions] attribute DOMString? crossOrigin;
   [CEReactions] attribute DOMString text;
-  [CEReactions] attribute DOMString nonce;
   [CEReactions] attribute DOMString integrity;
 
-
-  // also has obsolete members
 };
 
 [Exposed=Window,
  HTMLConstructor]
 interface HTMLTemplateElement : HTMLElement {
   readonly attribute DocumentFragment content;
 };
 
@@ -2374,16 +2371,20 @@ partial interface HTMLParamElement {
   [CEReactions] attribute DOMString type;
   [CEReactions] attribute DOMString valueType;
 };
 
 partial interface HTMLPreElement {
   [CEReactions] attribute long width;
 };
 
+partial interface HTMLStyleElement {
+  [CEReactions] attribute DOMString type;
+};
+
 partial interface HTMLScriptElement {
   [CEReactions] attribute DOMString charset;
   [CEReactions] attribute DOMString event;
   [CEReactions] attribute DOMString htmlFor;
 };
 
 partial interface HTMLTableElement {
   [CEReactions] attribute DOMString align;