diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 49bc12d3ae7..b62777710de 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -562,8 +562,7 @@ impl Element {
             }
 
             // Step 4.3.1. Remove all of currentShadowRoot’s children, in tree order.
-            let node = self.upcast::<Node>();
-            for child in node.children() {
+            for child in current_shadow_root.upcast::<Node>().children() {
                 child.remove_self();
             }
 
diff --git a/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-attachment.html.ini b/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-attachment.html.ini
deleted file mode 100644
index 117b3f75b0e..00000000000
--- a/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-attachment.html.ini
+++ /dev/null
@@ -1,102 +0,0 @@
-[declarative-shadow-dom-attachment.html]
-  [Declarative Shadow DOM as a child of <article>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <aside>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <blockquote>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <div>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <footer>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h1>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h2>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h3>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h4>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h5>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h6>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <header>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <main>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <nav>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <p>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <section>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <span>, with mode=open, delegatesFocus=false. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <article>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <aside>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <blockquote>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <div>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <footer>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h1>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h2>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h3>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h4>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h5>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h6>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <header>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <main>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <nav>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <p>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <section>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <span>, with mode=open, delegatesFocus=true. Should be safelisted.]
-    expected: FAIL
diff --git a/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-repeats.html.ini b/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-repeats.html.ini
index 63a42a6bfad..4fad73d8d8c 100644
--- a/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-repeats.html.ini
+++ b/tests/wpt/meta/shadow-dom/declarative/declarative-shadow-dom-repeats.html.ini
@@ -1,6 +1,3 @@
 [declarative-shadow-dom-repeats.html]
-  [Calling attachShadow() on declarative shadow root must match mode]
-    expected: FAIL
-
   [Calling attachShadow() on declarative shadow root must match all parameters]
     expected: FAIL