diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs
index 7b26fb8bbee5..3386e302422e 100644
--- a/components/script/dom/htmllinkelement.rs
+++ b/components/script/dom/htmllinkelement.rs
@@ -18,7 +18,7 @@ use dom::element::{AttributeMutation, Element, ElementCreator};
 use dom::element::{cors_setting_for_element, reflect_cross_origin_attribute, set_cross_origin_attribute};
 use dom::globalscope::GlobalScope;
 use dom::htmlelement::HTMLElement;
-use dom::node::{Node, document_from_node, window_from_node};
+use dom::node::{Node, UnbindContext, document_from_node, window_from_node};
 use dom::stylesheet::StyleSheet as DOMStyleSheet;
 use dom::virtualmethods::VirtualMethods;
 use html5ever_atoms::LocalName;
@@ -213,6 +213,15 @@ impl VirtualMethods for HTMLLinkElement {
             }
         }
     }
+
+    fn unbind_from_tree(&self, context: &UnbindContext) {
+        if let Some(ref s) = self.super_type() {
+            s.unbind_from_tree(context);
+        }
+
+        let document = document_from_node(self);
+        document.invalidate_stylesheets();
+    }
 }
 
 
diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs
index 7401c67aa950..285c8af3087b 100644
--- a/components/script/dom/htmlstyleelement.rs
+++ b/components/script/dom/htmlstyleelement.rs
@@ -15,7 +15,7 @@ use dom::document::Document;
 use dom::element::{Element, ElementCreator};
 use dom::eventtarget::EventTarget;
 use dom::htmlelement::HTMLElement;
-use dom::node::{ChildrenMutation, Node, document_from_node, window_from_node};
+use dom::node::{ChildrenMutation, Node, UnbindContext, document_from_node, window_from_node};
 use dom::stylesheet::StyleSheet as DOMStyleSheet;
 use dom::virtualmethods::VirtualMethods;
 use html5ever_atoms::LocalName;
@@ -161,6 +161,15 @@ impl VirtualMethods for HTMLStyleElement {
             self.parse_own_css();
         }
     }
+
+    fn unbind_from_tree(&self, context: &UnbindContext) {
+        if let Some(ref s) = self.super_type() {
+            s.unbind_from_tree(context);
+        }
+
+        let doc = document_from_node(self);
+        doc.invalidate_stylesheets();
+    }
 }
 
 impl StylesheetOwner for HTMLStyleElement {
diff --git a/tests/wpt/metadata/subresource-integrity/subresource-integrity.sub.html.ini b/tests/wpt/metadata/subresource-integrity/subresource-integrity.sub.html.ini
index 127ce07edb57..ada4d5500440 100644
--- a/tests/wpt/metadata/subresource-integrity/subresource-integrity.sub.html.ini
+++ b/tests/wpt/metadata/subresource-integrity/subresource-integrity.sub.html.ini
@@ -3,25 +3,3 @@
   expected: OK
   [Style: Same-origin with correct sha256 and sha512 hash, rel='alternate stylesheet' enabled]
     expected: FAIL
-
-  [Style: Same-origin with incorrect hash.]
-    expected: FAIL
-
-  [Style: Same-origin with sha256 match, sha512 mismatch]
-    expected: FAIL
-
-  [Style: <crossorigin='anonymous'> with CORS-ineligible resource]
-    expected: FAIL
-
-  [Style: Cross-origin, not CORS request, with correct hash]
-    expected: FAIL
-
-  [Style: Cross-origin, not CORS request, with hash mismatch]
-    expected: FAIL
-
-  [Style: <crossorigin='use-credentials'> with incorrect hash CORS-eligible]
-    expected: FAIL
-
-  [Style: <crossorigin='anonymous'> with incorrect hash, ACAO: *]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 98dbd60fcbb8..d396c4d01300 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -6462,6 +6462,42 @@
             "url": "/_mozilla/mozilla/iframe/resize_after_load.html"
           }
         ],
+        "mozilla/remove_link_styles.html": [
+          {
+            "path": "mozilla/remove_link_styles.html",
+            "references": [
+              [
+                "/_mozilla/mozilla/remove_link_styles_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/mozilla/remove_link_styles.html"
+          }
+        ],
+        "mozilla/remove_style_styles.html": [
+          {
+            "path": "mozilla/remove_style_styles.html",
+            "references": [
+              [
+                "/_mozilla/mozilla/remove_style_styles_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/mozilla/remove_style_styles.html"
+          }
+        ],
+        "mozilla/reparse_style_elements.html": [
+          {
+            "path": "mozilla/reparse_style_elements.html",
+            "references": [
+              [
+                "/_mozilla/mozilla/reparse_style_elements_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/mozilla/reparse_style_elements.html"
+          }
+        ],
         "mozilla/restyle-out-of-document.html": [
           {
             "path": "mozilla/restyle-out-of-document.html",
@@ -21840,6 +21876,42 @@
           "url": "/_mozilla/mozilla/iframe/resize_after_load.html"
         }
       ],
+      "mozilla/remove_link_styles.html": [
+        {
+          "path": "mozilla/remove_link_styles.html",
+          "references": [
+            [
+              "/_mozilla/mozilla/remove_link_styles_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/mozilla/remove_link_styles.html"
+        }
+      ],
+      "mozilla/remove_style_styles.html": [
+        {
+          "path": "mozilla/remove_style_styles.html",
+          "references": [
+            [
+              "/_mozilla/mozilla/remove_style_styles_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/mozilla/remove_style_styles.html"
+        }
+      ],
+      "mozilla/reparse_style_elements.html": [
+        {
+          "path": "mozilla/reparse_style_elements.html",
+          "references": [
+            [
+              "/_mozilla/mozilla/reparse_style_elements_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/mozilla/reparse_style_elements.html"
+        }
+      ],
       "mozilla/restyle-out-of-document.html": [
         {
           "path": "mozilla/restyle-out-of-document.html",
diff --git a/tests/wpt/mozilla/tests/mozilla/remove_link_styles.css b/tests/wpt/mozilla/tests/mozilla/remove_link_styles.css
new file mode 100644
index 000000000000..1984cf7df216
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/remove_link_styles.css
@@ -0,0 +1,4 @@
+body {
+    background-color: red;
+    color: white !important;
+}
diff --git a/tests/wpt/mozilla/tests/mozilla/remove_link_styles.html b/tests/wpt/mozilla/tests/mozilla/remove_link_styles.html
new file mode 100644
index 000000000000..6a1e592d0961
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/remove_link_styles.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Removing link tag should remove associated styles</title>
+<link rel="stylesheet" type="text/css" href="remove_link_styles.css">
+<link rel="match" href="remove_link_styles_ref.html">
+<body>
+    <style>
+        body {
+            color: green;
+        }
+    </style>
+
+    This text should be green and the background should not be red.
+
+    <script>
+        var l = document.querySelector('link[rel="stylesheet"]');
+        l.parentNode.removeChild(l);
+    </script>
+</body>
diff --git a/tests/wpt/mozilla/tests/mozilla/remove_link_styles_ref.html b/tests/wpt/mozilla/tests/mozilla/remove_link_styles_ref.html
new file mode 100644
index 000000000000..e9fd0816b9b2
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/remove_link_styles_ref.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<meta charset="utf-8">
+<body>
+    <style>
+        body {
+            color: green;
+        }
+    </style>
+
+    This text should be green and the background should not be red.
+</body>
diff --git a/tests/wpt/mozilla/tests/mozilla/remove_style_styles.html b/tests/wpt/mozilla/tests/mozilla/remove_style_styles.html
new file mode 100644
index 000000000000..f8a94bb73508
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/remove_style_styles.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Removing style element should remove all associated styles</title>
+<link rel="match" href="remove_style_styles_ref.html">
+<body>
+    <style>
+        body {
+            background-color: red;
+        }
+    </style>
+
+    This text should be black and the background should not be red.
+
+    <script>
+        // Force restyling
+        window.getComputedStyle(document.body);
+        var s = document.querySelector('style');
+        s.parentNode.removeChild(s);
+    </script>
+</body>
diff --git a/tests/wpt/mozilla/tests/mozilla/remove_style_styles_ref.html b/tests/wpt/mozilla/tests/mozilla/remove_style_styles_ref.html
new file mode 100644
index 000000000000..d562e1272035
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/remove_style_styles_ref.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<meta charset="utf-8">
+<body>
+    This text should be black and the background should not be red.
+</body>
diff --git a/tests/wpt/mozilla/tests/mozilla/reparse_style_elements.html b/tests/wpt/mozilla/tests/mozilla/reparse_style_elements.html
new file mode 100644
index 000000000000..e54f5a28d131
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/reparse_style_elements.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Style elements should be reparsed on change</title>
+<link rel="match" href="reparse_style_elements_ref.html">
+<body>
+    <style>
+        body {
+            background-color: red;
+        }
+    </style>
+
+    This text should be green and the background should not be red.
+
+    <script>
+        var s = document.querySelector('body > style');
+        s.textContent = 'body { color: green; }';
+    </script>
+</body>
diff --git a/tests/wpt/mozilla/tests/mozilla/reparse_style_elements_ref.html b/tests/wpt/mozilla/tests/mozilla/reparse_style_elements_ref.html
new file mode 100644
index 000000000000..e9fd0816b9b2
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/reparse_style_elements_ref.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<meta charset="utf-8">
+<body>
+    <style>
+        body {
+            color: green;
+        }
+    </style>
+
+    This text should be green and the background should not be red.
+</body>