diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index eab06c5c19d4..37a39580e253 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -2042,7 +2042,10 @@ impl ElementMethods for Element {
     /// https://w3c.github.io/DOM-Parsing/#widl-Element-innerHTML
     fn GetInnerHTML(&self) -> Fallible<DOMString> {
         // XXX TODO: XML case
-        self.serialize(ChildrenOnly)
+        let qname = QualName::new(self.prefix().clone(),
+                                  self.namespace().clone(),
+                                  self.local_name().clone());
+        self.serialize(ChildrenOnly(Some(qname)))
     }
 
     /// https://w3c.github.io/DOM-Parsing/#widl-Element-innerHTML
diff --git a/components/script/dom/servoparser/html.rs b/components/script/dom/servoparser/html.rs
index 4621faacf545..7fcdad2cbc47 100644
--- a/components/script/dom/servoparser/html.rs
+++ b/components/script/dom/servoparser/html.rs
@@ -21,7 +21,7 @@ use html5ever::QualName;
 use html5ever::buffer_queue::BufferQueue;
 use html5ever::serialize::{AttrRef, Serialize, Serializer};
 use html5ever::serialize::TraversalScope;
-use html5ever::serialize::TraversalScope::ChildrenOnly;
+use html5ever::serialize::TraversalScope::IncludeNode;
 use html5ever::tokenizer::{Tokenizer as HtmlTokenizer, TokenizerOpts, TokenizerResult};
 use html5ever::tree_builder::{Tracer as HtmlTracer, TreeBuilder, TreeBuilderOpts};
 use js::jsapi::JSTracer;
@@ -202,7 +202,7 @@ impl<'a> Serialize for &'a Node {
         let node = *self;
 
 
-        let iter = SerializationIterator::new(node, traversal_scope == ChildrenOnly);
+        let iter = SerializationIterator::new(node, traversal_scope != IncludeNode);
 
         for cmd in iter {
             match cmd {
diff --git a/tests/wpt/metadata/html/syntax/serializing-html-fragments/serializing.html.ini b/tests/wpt/metadata/html/syntax/serializing-html-fragments/serializing.html.ini
index ce7d1a63f3f5..3aa97242608a 100644
--- a/tests/wpt/metadata/html/syntax/serializing-html-fragments/serializing.html.ini
+++ b/tests/wpt/metadata/html/syntax/serializing-html-fragments/serializing.html.ini
@@ -6,33 +6,6 @@
   [outerHTML Attribute in non-standard namespace]
     expected: FAIL
 
-  [innerHTML <pre> non-context starting with U+000A]
-    expected: FAIL
-
-  [innerHTML <textarea> non-context starting with U+000A]
-    expected: FAIL
-
-  [innerHTML <listing> non-context starting with U+000A]
-    expected: FAIL
-
-  [outerHTML <pre> context starting with U+000A]
-    expected: FAIL
-
-  [outerHTML <textarea> context starting with U+000A]
-    expected: FAIL
-
-  [outerHTML <listing> context starting with U+000A]
-    expected: FAIL
-
-  [outerHTML <pre> non-context starting with U+000A]
-    expected: FAIL
-
-  [outerHTML <textarea> non-context starting with U+000A]
-    expected: FAIL
-
-  [outerHTML <listing> non-context starting with U+000A]
-    expected: FAIL
-
   [innerHTML Void context node area]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/serializing.html b/tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/serializing.html
index 6b7e678a355e..037c44699e2a 100644
--- a/tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/serializing.html
+++ b/tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/serializing.html
@@ -25,6 +25,7 @@
 <span>&quot;</span>
 <span><style><&></style></span>
 <span><script type="test"><&></script></span>
+<script type="test"><&></script>
 <span><xmp><&></xmp></span>
 <span><iframe><&></iframe></span>
 <span><noembed><&></noembed></span>
@@ -37,7 +38,7 @@
 <!-- TODO: template element -->
 <script>
 
-var test_data = document.getElementById("test").getElementsByTagName("span");
+var test_data = document.getElementById("test").children;
 var expected = [
 ["", "<span></span>"],
 ["<a></a>", "<span><a></a></span>"],
@@ -58,6 +59,7 @@
 ["\"", "<span>\"</span>"],
 ["<style><&></style>", "<span><style><&></style></span>"],
 ["<script type=\"test\"><&><\/script>", "<span><script type=\"test\"><&><\/script></span>"],
+["<&>", "<script type=\"test\"><&><\/script>"],
 ["<xmp><&></xmp>", "<span><xmp><&></xmp></span>"],
 ["<iframe><&></iframe>", "<span><iframe><&></iframe></span>"],
 ["<noembed><&></noembed>", "<span><noembed><&></noembed></span>"],