--- a/testing/web-platform/meta/2dcontext/transformations/canvas_transformations_reset_001.html.ini
+++ b/testing/web-platform/meta/2dcontext/transformations/canvas_transformations_reset_001.html.ini
@@ -1,3 +1,3 @@
 [canvas_transformations_reset_001.html]
   type: reftest
-  expected: ERROR
+  expected: FAIL

--- a/testing/web-platform/meta/editing/run/delete.html.ini
+++ b/testing/web-platform/meta/editing/run/delete.html.ini
@@ -1,10 +1,17 @@
 [delete.html]
   type: testharness
+  expected:
+    if not debug and e10s and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): TIMEOUT
+    if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
+    if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and e10s and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
   [[["stylewithcss","true"\],["delete",""\]\] "foo<span style=display:none>bar</span>[\]baz" compare innerHTML]
     expected: FAIL
 
   [[["stylewithcss","false"\],["delete",""\]\] "foo<span style=display:none>bar</span>[\]baz" compare innerHTML]
     expected: FAIL
 
   [[["delete",""\]\] "foo<script>bar</script>[\]baz" compare innerHTML]
     expected: FAIL

--- a/testing/web-platform/meta/editing/run/forwarddelete.html.ini
+++ b/testing/web-platform/meta/editing/run/forwarddelete.html.ini
@@ -1,10 +1,17 @@
 [forwarddelete.html]
   type: testharness
+  expected:
+    if not debug and e10s and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): TIMEOUT
+    if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
+    if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and e10s and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
   [[["forwarddelete",""\]\] "foo[\]": execCommand("forwarddelete", false, "") return value]
     expected: FAIL
 
   [[["forwarddelete",""\]\] "<span>foo[\]</span>": execCommand("forwarddelete", false, "") return value]
     expected: FAIL
 
   [[["forwarddelete",""\]\] "<p>foo[\]</p>": execCommand("forwarddelete", false, "") return value]
     expected: FAIL

--- a/testing/web-platform/meta/html/editing/focus/focus-management/focus-events.html.ini
+++ b/testing/web-platform/meta/html/editing/focus/focus-management/focus-events.html.ini
@@ -1,13 +1,13 @@
 [focus-events.html]
   type: testharness
   disabled:
     if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1090628
-    if e10s and os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1203917
+    if e10s and (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1203917
   expected:
     if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
   [focusing on a focusable element fires a focus event at the element]
     expected:
       if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): NOTRUN
       if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): NOTRUN
       FAIL

--- a/testing/web-platform/meta/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/testing/web-platform/meta/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,20 +1,34 @@
 [select-event.html]
   type: testharness
+  expected:
+    if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
   [select() on textarea queues select event]
-    expected: FAIL
+    expected:
+      if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+      FAIL
 
   [select() on input type text queues select event]
-    expected: FAIL
+    expected:
+      if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+      FAIL
 
   [select() on input type search queues select event]
-    expected: FAIL
+    expected:
+      if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+      FAIL
 
   [select() on input type tel queues select event]
-    expected: FAIL
+    expected:
+      if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+      FAIL
 
   [select() on input type url queues select event]
-    expected: FAIL
+    expected:
+      if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+      FAIL
 
   [select() on input type password queues select event]
-    expected: FAIL
+    expected:
+      if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+      FAIL
 

--- a/testing/web-platform/meta/html/semantics/forms/textfieldselection/textfieldselection-setSelectionRange.html.ini
+++ b/testing/web-platform/meta/html/semantics/forms/textfieldselection/textfieldselection-setSelectionRange.html.ini
@@ -19,26 +19,8 @@
     expected: FAIL
 
   [textarea direction of setSelectionRange(0,1,"BACKWARD")]
     expected: FAIL
 
   [textarea direction of setSelectionRange(0,1)]
     expected: FAIL
 
-  [textarea setSelectionRange("string",1)]
-    expected: FAIL
-
-  [textarea setSelectionRange([\],1)]
-    expected: FAIL
-
-  [textarea setSelectionRange({},1)]
-    expected: FAIL
-
-  [textarea setSelectionRange(NaN,1)]
-    expected: FAIL
-
-  [textarea setSelectionRange(null,1)]
-    expected: FAIL
-
-  [textarea setSelectionRange(undefined,1)]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-template-element/template-element/template-descendant-frameset.html.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[template-descendant-frameset.html]
-  type: testharness
-  [Template element as a descendant of the frameset element. Test loading from a file]
-    expected: FAIL
-
-  [Template element as a descendant of the frameset element. Test template element is assigned to frameset's innerHTML)]
-    expected: FAIL
-
-  [Template element as a descendant of the frameset element. Test template element appended to frameset by appendChild()]
-    expected: FAIL
-

--- a/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -3,10 +3,9 @@
   disabled:
     if debug and (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1184351
   [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: picture-tag\n                                 expectation: blocked]
     expected:
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
 

--- a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-match.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-match.https.html.ini
@@ -1,7 +1,54 @@
 [cache-match.https.html]
   type: testharness
   prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.interception.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
   [Cache.match and Cache.matchAll]
-    expected: FAIL
     bug: https://github.com/w3c/web-platform-tests/issues/2098
 
+  [Cache.matchAll with URL]
+    expected: FAIL
+
+  [Cache.match with URL]
+    expected: FAIL
+
+  [Cache.matchAll with Request]
+    expected: FAIL
+
+  [Cache.match with Request]
+    expected: FAIL
+
+  [Cache.matchAll with new Request]
+    expected: FAIL
+
+  [Cache.match with new Request]
+    expected: FAIL
+
+  [Cache.matchAll with ignoreSearch option (request with no search parameters)]
+    expected: FAIL
+
+  [Cache.match with ignoreSearch option (request with no search parameters)]
+    expected: FAIL
+
+  [Cache.matchAll with ignoreSearch option (request with search parameter)]
+    expected: FAIL
+
+  [Cache.match with ignoreSearch option (request with search parameter)]
+    expected: FAIL
+
+  [Cache.matchAll with URL containing fragment]
+    expected: FAIL
+
+  [Cache.match with URL containing fragment]
+    expected: FAIL
+
+  [Cache.matchAll with responses containing "Vary" header]
+    expected: FAIL
+
+  [Cache.match with responses containing "Vary" header]
+    expected: FAIL
+
+  [Cache.matchAll with "ignoreVary" parameter]
+    expected: FAIL
+
+  [Cache.match with Request and Response objects with different URLs]
+    expected: FAIL
+

--- a/testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini
@@ -1,5 +1,52 @@
 [cache-match.https.html]
   type: testharness
   prefs: [dom.caches.enabled:true]
-  expected: ERROR
   bug: https://github.com/w3c/web-platform-tests/issues/2098
+  [Cache.matchAll with URL]
+    expected: FAIL
+
+  [Cache.match with URL]
+    expected: FAIL
+
+  [Cache.matchAll with Request]
+    expected: FAIL
+
+  [Cache.match with Request]
+    expected: FAIL
+
+  [Cache.matchAll with new Request]
+    expected: FAIL
+
+  [Cache.match with new Request]
+    expected: FAIL
+
+  [Cache.matchAll with ignoreSearch option (request with no search parameters)]
+    expected: FAIL
+
+  [Cache.match with ignoreSearch option (request with no search parameters)]
+    expected: FAIL
+
+  [Cache.matchAll with ignoreSearch option (request with search parameter)]
+    expected: FAIL
+
+  [Cache.match with ignoreSearch option (request with search parameter)]
+    expected: FAIL
+
+  [Cache.matchAll with URL containing fragment]
+    expected: FAIL
+
+  [Cache.match with URL containing fragment]
+    expected: FAIL
+
+  [Cache.matchAll with responses containing "Vary" header]
+    expected: FAIL
+
+  [Cache.match with responses containing "Vary" header]
+    expected: FAIL
+
+  [Cache.matchAll with "ignoreVary" parameter]
+    expected: FAIL
+
+  [Cache.match with Request and Response objects with different URLs]
+    expected: FAIL
+

--- a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini
@@ -1,5 +1,52 @@
 [cache-match.https.html]
   type: testharness
   prefs: [dom.caches.enabled:true]
-  expected: ERROR
   bug: https://github.com/w3c/web-platform-tests/issues/2098
+  [Cache.matchAll with URL]
+    expected: FAIL
+
+  [Cache.match with URL]
+    expected: FAIL
+
+  [Cache.matchAll with Request]
+    expected: FAIL
+
+  [Cache.match with Request]
+    expected: FAIL
+
+  [Cache.matchAll with new Request]
+    expected: FAIL
+
+  [Cache.match with new Request]
+    expected: FAIL
+
+  [Cache.matchAll with ignoreSearch option (request with no search parameters)]
+    expected: FAIL
+
+  [Cache.match with ignoreSearch option (request with no search parameters)]
+    expected: FAIL
+
+  [Cache.matchAll with ignoreSearch option (request with search parameter)]
+    expected: FAIL
+
+  [Cache.match with ignoreSearch option (request with search parameter)]
+    expected: FAIL
+
+  [Cache.matchAll with URL containing fragment]
+    expected: FAIL
+
+  [Cache.match with URL containing fragment]
+    expected: FAIL
+
+  [Cache.matchAll with responses containing "Vary" header]
+    expected: FAIL
+
+  [Cache.match with responses containing "Vary" header]
+    expected: FAIL
+
+  [Cache.matchAll with "ignoreVary" parameter]
+    expected: FAIL
+
+  [Cache.match with Request and Response objects with different URLs]
+    expected: FAIL
+

deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/non-element-nodes-001.html.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-[non-element-nodes-001.html]
-  type: testharness
-  [Checks whether an entity reference node does not have createShadowRoot() method.]
-    expected: FAIL
-
-  [When createShadowRoot() is called on a text node, InvalidNodeTypeError should be thrown.]
-    expected: FAIL
-
-  [When createShadowRoot() is called on a comment node, InvalidNodeTypeError should be thrown.]
-    expected: FAIL
-
-  [When createShadowRoot() is called on a CDATA section node, InvalidNodeTypeError should be thrown.]
-    expected: FAIL
-
-  [When createShadowRoot() is called on an attribute node, InvalidNodeTypeError should be thrown.]
-    expected: FAIL
-
-  [When createShadowRoot() is called on a document fragment node, InvalidNodeTypeError should be thrown.]
-    expected: FAIL
-
-  [When createShadowRoot() is called on an entity reference node, InvalidNodeTypeError should be thrown.]
-    expected: FAIL
-
-  [When createShadowRoot() is called on a processing instruction node, InvalidNodeTypeError should be thrown.]
-    expected: FAIL
-
-  [When createShadowRoot() is called on a document node, InvalidNodeTypeError should be thrown.]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/events/event-dispatch/test-003.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-003.html]
-  type: testharness
-  [A_05_05_03_T01]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/html-elements-and-their-shadow-trees/test-004.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[test-004.html]
-  type: testharness
-  [A_09_00_04_T01]
-    expected: FAIL
-
-  [A_09_00_04_T02]
-    expected: FAIL
-

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-003.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/methods/test-003.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/extensions-to-event-interface/event-path-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-event-interface/event-path-001.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/extensions-to-event-interface/event-path-002.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-event-interface/event-path-002.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/activeElement-confirm-return-null.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/activeElement-confirm-return-null.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-007.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-007.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-007.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-007.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/the-content-html-element/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/the-content-html-element/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/the-content-html-element/test-002.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/the-content-html-element/test-002.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/the-content-html-element/test-003.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/the-content-html-element/test-003.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/the-content-html-element/test-005.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/the-content-html-element/test-005.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/the-shadow-html-element/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-002.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/the-shadow-html-element/test-002.html.ini

rename from testing/web-platform/meta/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-004.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/elements-and-dom-objects/the-shadow-html-element/test-004.html.ini

new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/shadow-dom/untriaged/events/event-dispatch/test-003.html.ini
@@ -0,0 +1,6 @@
+[test-003.html]
+  type: testharness
+  expected: TIMEOUT
+  [A_05_05_03_T01]
+    expected: TIMEOUT
+

rename from testing/web-platform/meta/shadow-dom/events/events-that-are-always-stopped/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/events-that-are-always-stopped/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/events/events-that-are-always-stopped/test-002.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/events-that-are-always-stopped/test-002.html.ini

rename from testing/web-platform/meta/shadow-dom/events/events-that-are-always-stopped/test-003.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/events-that-are-always-stopped/test-003.html.ini

rename from testing/web-platform/meta/shadow-dom/events/events-that-are-always-stopped/test-005.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/events-that-are-always-stopped/test-005.html.ini

rename from testing/web-platform/meta/shadow-dom/events/events-that-are-always-stopped/test-007.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/events-that-are-always-stopped/test-007.html.ini

rename from testing/web-platform/meta/shadow-dom/events/events-that-are-always-stopped/test-008.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/events-that-are-always-stopped/test-008.html.ini

rename from testing/web-platform/meta/shadow-dom/events/events-that-are-always-stopped/test-009.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/events-that-are-always-stopped/test-009.html.ini

rename from testing/web-platform/meta/shadow-dom/events/retargeting-focus-events/test-002.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/retargeting-focus-events/test-002.html.ini

rename from testing/web-platform/meta/shadow-dom/events/retargeting-focus-events/test-003.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/retargeting-focus-events/test-003.html.ini

rename from testing/web-platform/meta/shadow-dom/events/retargeting-relatedtarget/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/retargeting-relatedtarget/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/events/retargeting-relatedtarget/test-002.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/retargeting-relatedtarget/test-002.html.ini

rename from testing/web-platform/meta/shadow-dom/events/retargeting-relatedtarget/test-003.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/retargeting-relatedtarget/test-003.html.ini

rename from testing/web-platform/meta/shadow-dom/events/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/events/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/html-elements-and-their-shadow-trees/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/html-elements-and-their-shadow-trees/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/html-elements-and-their-shadow-trees/test-003.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/html-elements-and-their-shadow-trees/test-003.html.ini

new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/shadow-dom/untriaged/html-elements-and-their-shadow-trees/test-004.html.ini
@@ -0,0 +1,5 @@
+[test-004.html]
+  type: testharness
+  [A_09_00_04_T01]
+    expected: FAIL
+

rename from testing/web-platform/meta/shadow-dom/html-elements-in-shadow-trees/html-forms/test-003.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-003.html.ini

rename from testing/web-platform/meta/shadow-dom/shadow-trees/composition/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/shadow-trees/composition/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/shadow-trees/content-pseudo-element/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/shadow-trees/content-pseudo-element/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/shadow-trees/content-pseudo-element/test-002.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/shadow-trees/content-pseudo-element/test-002.html.ini

rename from testing/web-platform/meta/shadow-dom/shadow-trees/custom-pseudo-elements/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/shadow-trees/custom-pseudo-elements/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/shadow-trees/lower-boundary-encapsulation/test-004.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/shadow-trees/lower-boundary-encapsulation/test-004.html.ini

rename from testing/web-platform/meta/shadow-dom/shadow-trees/rendering-shadow-trees/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/shadow-trees/rendering-shadow-trees/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-005.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-005.html.ini

rename from testing/web-platform/meta/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-007.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-007.html.ini

rename from testing/web-platform/meta/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-009.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-009.html.ini

rename from testing/web-platform/meta/shadow-dom/styles/css-variables/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/styles/css-variables/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/styles/deep-combinator/deep-combinator-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/styles/deep-combinator/deep-combinator-001.html.ini

rename from testing/web-platform/meta/shadow-dom/styles/shadow-pseudoelement/shadow-pseudoelement-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/styles/shadow-pseudoelement/shadow-pseudoelement-001.html.ini

rename from testing/web-platform/meta/shadow-dom/styles/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/styles/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/styles/test-005.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/styles/test-005.html.ini

rename from testing/web-platform/meta/shadow-dom/styles/test-007.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/styles/test-007.html.ini

rename from testing/web-platform/meta/shadow-dom/styles/test-008.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/styles/test-008.html.ini

rename from testing/web-platform/meta/shadow-dom/styles/test-009.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/styles/test-009.html.ini

rename from testing/web-platform/meta/shadow-dom/styles/test-010.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/styles/test-010.html.ini

rename from testing/web-platform/meta/shadow-dom/user-interaction/active-element/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/user-interaction/active-element/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/user-interaction/active-element/test-002.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/user-interaction/active-element/test-002.html.ini

rename from testing/web-platform/meta/shadow-dom/user-interaction/focus-navigation/test-001.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/user-interaction/focus-navigation/test-001.html.ini

rename from testing/web-platform/meta/shadow-dom/user-interaction/focus-navigation/test-002.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/user-interaction/focus-navigation/test-002.html.ini

rename from testing/web-platform/meta/shadow-dom/user-interaction/focus-navigation/test-003.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/user-interaction/focus-navigation/test-003.html.ini

rename from testing/web-platform/meta/shadow-dom/user-interaction/focus-navigation/test-004.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/user-interaction/focus-navigation/test-004.html.ini

rename from testing/web-platform/meta/shadow-dom/user-interaction/ranges-and-selections/test-002.html.ini
rename to testing/web-platform/meta/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html.ini

--- a/testing/web-platform/meta/subresource-integrity/subresource-integrity.html.ini
+++ b/testing/web-platform/meta/subresource-integrity/subresource-integrity.html.ini
@@ -64,14 +64,23 @@
     expected: FAIL
 
   [Style: <crossorigin='anonymous'> with incorrect hash, ACAO: *]
     expected: FAIL
 
   [Style: <crossorigin='use-credentials'> with incorrect hash CORS-eligible]
     expected: FAIL
 
-  [Style: <crossorigin='anonymous'> with CORS-ineligible resource]
-    expected: FAIL
-
   [Style: Same-origin with incorrect sha256 and sha512 hash, rel='alternate stylesheet' enabled]
     expected: FAIL
 
+  [Script: Cross-origin, not CORS request, with correct hash]
+    expected: FAIL
+
+  [Script: Cross-origin, not CORS request, with hash mismatch]
+    expected: FAIL
+
+  [Style: Cross-origin, not CORS request, with correct hash]
+    expected: FAIL
+
+  [Style: Cross-origin, not CORS request, with hash mismatch]
+    expected: FAIL
+

--- a/testing/web-platform/meta/websockets/constructor/014.html.ini
+++ b/testing/web-platform/meta/websockets/constructor/014.html.ini
@@ -1,9 +1,8 @@
 [014.html]
   type: testharness
   disabled:
     if (os == "win") and (version == "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1090198
   [WebSockets: serialize establish a connection]
     expected:
       if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
 

deleted file mode 100644
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/ServiceWorkerGlobalScope/unregister.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[unregister.https.html]
-  type: testharness
-  expected: TIMEOUT
-  [Unregister controlling service worker]
-    expected: TIMEOUT
-

--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-request-css-base-url.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-request-css-base-url.https.html.ini
@@ -1,9 +1,7 @@
 [fetch-request-css-base-url.https.html]
   type: testharness
   [CSS's base URL must be the request URL even when fetched from other URL.]
     expected:
-      if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
       if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
       FAIL
 

--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/register-same-scope-different-script-url.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/register-same-scope-different-script-url.https.html.ini
@@ -1,9 +1,6 @@
 [register-same-scope-different-script-url.https.html]
   type: testharness
   expected: TIMEOUT
   [Register then register new script URL]
     expected: TIMEOUT
 
-  [Register same-scope new script url effect on controller]
-    expected: TIMEOUT
-

deleted file mode 100644
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-controller.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[unregister-controller.https.html]
-  type: testharness
-  expected: TIMEOUT
-  [Unregister prevents new controllee even if registration is still in use]
-    expected: TIMEOUT
-

--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini
@@ -1,12 +1,25 @@
 [unregister-then-register-new-script.https.html]
   type: testharness
-  expected: TIMEOUT
+  expected:
+    if debug and not e10s and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): CRASH
+    if not debug and e10s and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): OK
+    if not debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): OK
+    if not debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): OK
+    if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): OK
+    if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
+    if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): OK
+    if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): OK
+    if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): OK
+    if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): OK
+    if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): OK
+    if debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): CRASH
+    if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
+    TIMEOUT
   [Registering a new script URL while an unregistered registration is in use]
-    expected: TIMEOUT
-
-  [Registering a new script URL that 404s does not resurrect an unregistered registration]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Registering a new script URL that fails to install does not resurrect an unregistered registration]
-    expected: TIMEOUT
+    expected: FAIL
 

--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-then-register.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-then-register.https.html.ini
@@ -1,12 +1,5 @@
 [unregister-then-register.https.html]
   type: testharness
-  expected: TIMEOUT
   [Unregister then register resolves to the original value if the registration is in use.]
-    expected: TIMEOUT
+    expected: FAIL
 
-  [Unregister then register does not affect existing controllee]
-    expected: TIMEOUT
-
-  [Unregister then register resurrects the registration]
-    expected: TIMEOUT
-