diff --git a/testing/web-platform/meta/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html.ini b/testing/web-platform/meta/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html.ini
index a714be03d5fd..0b1a8a224860 100644
--- a/testing/web-platform/meta/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html.ini
@@ -1,8 +1,8 @@
 [relpos-percentage-top-in-scrollable.html]
   [Top percentage resolved correctly for overflow contribution]
     expected:
-      if (os == "android") and debug and webrender: ["PASS", "FAIL"]
-      if (os == "android") and debug and not webrender: ["FAIL", "PASS"]
-      if (os == "android") and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "android") and not debug and not webrender: ["FAIL", "PASS"]
+      if (os == "android") and debug and webrender: [PASS, FAIL]
+      if (os == "android") and debug and not webrender: [FAIL, PASS]
+      if (os == "android") and not debug and webrender: [PASS, FAIL]
+      if (os == "android") and not debug and not webrender: [FAIL, PASS]
 
diff --git a/testing/web-platform/meta/css/compositing/root-element-opacity-change.html.ini b/testing/web-platform/meta/css/compositing/root-element-opacity-change.html.ini
index b14c9dcaf461..522267623a67 100644
--- a/testing/web-platform/meta/css/compositing/root-element-opacity-change.html.ini
+++ b/testing/web-platform/meta/css/compositing/root-element-opacity-change.html.ini
@@ -1,7 +1,8 @@
 [root-element-opacity-change.html]
   expected:
-    if webrender and (os == "win") and debug: ["PASS", "FAIL"]
-    if webrender and (os == "win") and not debug: ["PASS", "FAIL"]
-    if webrender and (os == "mac"): ["PASS", "FAIL"]
-    if webrender and (os == "linux"): ["PASS", "FAIL"]
-    if webrender and (os == "android"): ["PASS", "FAIL"]
+    if webrender and (os == "win") and debug: [PASS, FAIL]
+    if webrender and (os == "win") and not debug: [PASS, FAIL]
+    if webrender and (os == "mac"): [PASS, FAIL]
+    if webrender and (os == "linux"): [PASS, FAIL]
+    if webrender and (os == "android"): [PASS, FAIL]
+    if not webrender and (os == "android") and not debug: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html.ini
index 6a77291e45d7..c80dd89a932a 100644
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html.ini
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html.ini
@@ -1,2 +1,4 @@
 [grid-auto-margin-and-replaced-item-001.html]
-  expected: [FAIL, PASS]
+  expected:
+    if fission: ["FAIL", "PASS"]
+    [PASS, FAIL]
diff --git a/testing/web-platform/meta/css/css-lists/list-style-image-zoom-dynamic.html.ini b/testing/web-platform/meta/css/css-lists/list-style-image-zoom-dynamic.html.ini
index f3f651a649a9..d2d054f3f6ce 100644
--- a/testing/web-platform/meta/css/css-lists/list-style-image-zoom-dynamic.html.ini
+++ b/testing/web-platform/meta/css/css-lists/list-style-image-zoom-dynamic.html.ini
@@ -1,6 +1,6 @@
 [list-style-image-zoom-dynamic.html]
   expected:
-    if (os == "win") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-    if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
-    if (os == "mac") and not debug: ["PASS", "FAIL"]
+    if (os == "win") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+    if (os == "linux") and not debug and webrender: [PASS, FAIL]
+    if (os == "mac") and not debug: [PASS, FAIL]
     [FAIL, PASS]
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html.ini
index 82e46830aca1..bdd56cc2ecc1 100644
--- a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html.ini
+++ b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html.ini
@@ -1,7 +1,7 @@
 [clip-path-descendant-text-mutated-001.html]
   expected:
-    if (os == "win") and not webrender and (processor == "x86_64") and debug: ["PASS", "FAIL", "ERROR"]
-    if (os == "win") and not webrender and (processor == "x86_64") and not debug: ["FAIL", "PASS", "ERROR"]
-    if (os == "win") and not webrender and (processor == "x86"): ["PASS", "FAIL", "ERROR"]
-    if (os == "linux") and debug and not webrender: ["FAIL", "PASS"]
+    if (os == "win") and not webrender and (processor == "x86_64") and debug: [PASS, FAIL, ERROR]
+    if (os == "win") and not webrender and (processor == "x86_64") and not debug: [FAIL, PASS, ERROR]
+    if (os == "win") and not webrender and (processor == "x86"): [PASS, FAIL, ERROR]
+    if (os == "linux") and debug and not webrender: [FAIL, PASS]
     [PASS, FAIL]
diff --git a/testing/web-platform/meta/css/css-overflow/input-scrollable-region-001.html.ini b/testing/web-platform/meta/css/css-overflow/input-scrollable-region-001.html.ini
index c35a8dcb7aba..d196573d0c52 100644
--- a/testing/web-platform/meta/css/css-overflow/input-scrollable-region-001.html.ini
+++ b/testing/web-platform/meta/css/css-overflow/input-scrollable-region-001.html.ini
@@ -1,3 +1,3 @@
 [input-scrollable-region-001.html]
   expected:
-    if (processor == "x86") and debug: ["FAIL", "PASS"]
+    if (processor == "x86") and debug: [FAIL, PASS]
diff --git a/testing/web-platform/meta/css/css-sizing/range-percent-intrinsic-size-1.html.ini b/testing/web-platform/meta/css/css-sizing/range-percent-intrinsic-size-1.html.ini
index 7d98a6170ba4..42f2196c15fa 100644
--- a/testing/web-platform/meta/css/css-sizing/range-percent-intrinsic-size-1.html.ini
+++ b/testing/web-platform/meta/css/css-sizing/range-percent-intrinsic-size-1.html.ini
@@ -1,5 +1,6 @@
 [range-percent-intrinsic-size-1.html]
   expected:
-    if (os == "win") and not webrender and not debug and (processor == "x86_64"): ["PASS", "FAIL"]
-    if (os == "win") and not webrender and not debug and (processor == "x86"): ["PASS", "FAIL"]
-    if (os == "win") and not webrender and debug: ["PASS", "FAIL"]
+    if (os == "win") and not webrender and not debug and (processor == "x86_64"): [PASS, FAIL]
+    if (os == "win") and not webrender and not debug and (processor == "x86"): [PASS, FAIL]
+    if (os == "win") and not webrender and debug and (processor == "x86"): ["PASS", "FAIL"]
+    if (os == "win") and not webrender and debug and (processor == "x86_64"): ["FAIL", "PASS"]
diff --git a/testing/web-platform/meta/css/css-text-decor/text-underline-offset-overline-vertical.html.ini b/testing/web-platform/meta/css/css-text-decor/text-underline-offset-overline-vertical.html.ini
index 085902a1b7be..ef3a8b5dc930 100644
--- a/testing/web-platform/meta/css/css-text-decor/text-underline-offset-overline-vertical.html.ini
+++ b/testing/web-platform/meta/css/css-text-decor/text-underline-offset-overline-vertical.html.ini
@@ -1,3 +1,3 @@
 [text-underline-offset-overline-vertical.html]
   expected:
-    if os == "win" and bits == 32 and debug: ["FAIL", "PASS"]
+    if (os == "win") and (bits == 32) and debug: [FAIL, PASS]
diff --git a/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-003.html.ini b/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-003.html.ini
index 3a569ca80ee2..7b98c1217fe9 100644
--- a/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-003.html.ini
+++ b/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-003.html.ini
@@ -1,5 +1,5 @@
 [effect-reference-feimage-003.html]
   expected:
-    if webrender and (os == "android") and debug: ["FAIL", "PASS"]
-    if webrender and (os == "linux"): ["PASS", "FAIL"]
-    if webrender and (os == "win"): ["PASS", "FAIL"]
+    if webrender and (os == "android") and debug: [FAIL, PASS]
+    if webrender and (os == "linux"): [PASS, FAIL]
+    if webrender and (os == "win"): [PASS, FAIL]
diff --git a/testing/web-platform/meta/css/selectors/focus-within-006.html.ini b/testing/web-platform/meta/css/selectors/focus-within-006.html.ini
new file mode 100644
index 000000000000..94975e27051f
--- /dev/null
+++ b/testing/web-platform/meta/css/selectors/focus-within-006.html.ini
@@ -0,0 +1,3 @@
+[focus-within-006.html]
+  expected:
+    if (processor == "x86") and not debug: FAIL
diff --git a/testing/web-platform/meta/fetch/api/basic/text-utf8.any.js.ini b/testing/web-platform/meta/fetch/api/basic/text-utf8.any.js.ini
index 6a2a6fcdc925..44fe7f219dda 100644
--- a/testing/web-platform/meta/fetch/api/basic/text-utf8.any.js.ini
+++ b/testing/web-platform/meta/fetch/api/basic/text-utf8.any.js.ini
@@ -2,7 +2,7 @@
 
 [text-utf8.any.worker.html]
   expected:
-    if (os == "mac") and debug: ["OK", "CRASH"]
+    if (os == "mac") and debug: [OK, CRASH]
 
 [text-utf8.any.serviceworker.html]
 
diff --git a/testing/web-platform/meta/fetch/api/response/response-cancel-stream.any.js.ini b/testing/web-platform/meta/fetch/api/response/response-cancel-stream.any.js.ini
index e645d546f069..0b7082e48d98 100644
--- a/testing/web-platform/meta/fetch/api/response/response-cancel-stream.any.js.ini
+++ b/testing/web-platform/meta/fetch/api/response/response-cancel-stream.any.js.ini
@@ -1,33 +1,34 @@
 [response-cancel-stream.any.sharedworker.html]
   expected:
-    if os == "mac": ["OK", "TIMEOUT"]
+    if os == "mac": [OK, TIMEOUT]
   [Cancelling a closed Response stream]
     expected:
-      if os == "mac": ["PASS", "FAIL", "TIMEOUT"]
+      if os == "mac": [PASS, FAIL, TIMEOUT]
 
 
 [response-cancel-stream.any.html]
   expected:
-    if (os == "mac") and debug: ["OK", "ERROR", "TIMEOUT"]
-    if (os == "mac") and not debug: ["ERROR", "OK", "TIMEOUT"]
+    if (os == "mac") and debug: [OK, ERROR, TIMEOUT]
+    if (os == "mac") and not debug: [ERROR, OK, TIMEOUT]
   [Cancelling a closed Response stream]
     expected:
-      if os == "mac": ["FAIL", "PASS", "TIMEOUT"]
+      if os == "mac": [FAIL, PASS, TIMEOUT]
 
 
 [response-cancel-stream.any.serviceworker.html]
   expected:
-    if os == "mac": ["OK", "TIMEOUT"]
+    if os == "mac": [OK, TIMEOUT]
   [Cancelling a closed Response stream]
     expected:
-      if os == "mac": ["PASS", "FAIL", "TIMEOUT"]
+      if os == "mac": [PASS, FAIL, TIMEOUT]
 
 
 [response-cancel-stream.any.worker.html]
   expected:
-    if os == "mac": ["OK", "ERROR", "TIMEOUT"]
+    if (os == "mac") and not debug: ["ERROR", "OK", "TIMEOUT"]
+    if (os == "mac") and debug: ["OK", "ERROR", "TIMEOUT"]
   [Cancelling a closed Response stream]
     expected:
-      if (os == "mac") and debug: ["FAIL", "PASS", "TIMEOUT"]
-      if (os == "mac") and not debug: ["PASS", "FAIL", "TIMEOUT"]
+      if (os == "mac") and debug: [FAIL, PASS, TIMEOUT]
+      if (os == "mac") and not debug: [PASS, FAIL, TIMEOUT]
 
diff --git a/testing/web-platform/meta/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini b/testing/web-platform/meta/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini
index bdc5abac8385..105b8a920e5b 100644
--- a/testing/web-platform/meta/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini
+++ b/testing/web-platform/meta/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini
@@ -1,7 +1,9 @@
 [2d.text.draw.fontface.notinpage.html]
   [@font-face fonts should work even if they are not used in the page]
     expected:
-      if (os == "win") and (processor == "x86_64") and debug and not webrender: ["FAIL", "PASS"]
-      if (os == "win") and (processor == "x86") and debug: ["FAIL", "PASS"]
+      if (os == "win") and (processor == "x86_64") and debug and not webrender: [FAIL, PASS]
+      if (os == "win") and (processor == "x86") and debug: [FAIL, PASS]
+      if (os == "linux") and not webrender and debug: ["FAIL", "PASS"]
+      if (os == "mac") and debug: ["FAIL", "PASS"]
       [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.commit.w.html.ini b/testing/web-platform/meta/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.commit.w.html.ini
index 380f163d5a6f..ca78b686cc8a 100644
--- a/testing/web-platform/meta/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.commit.w.html.ini
+++ b/testing/web-platform/meta/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.commit.w.html.ini
@@ -1,8 +1,9 @@
 [offscreencanvas.commit.w.html]
   expected:
-    if (os == "linux") and webrender and not debug and not fission: ["ERROR", "OK"]
-    if (os == "linux") and webrender and not debug and fission: ["ERROR", "OK"]
-    if (os == "win") and debug and not webrender and (processor == "x86_64"): ["ERROR", "OK"]
+    if (os == "linux") and webrender and not debug and not fission: [ERROR, OK]
+    if (os == "linux") and webrender and not debug and fission: [ERROR, OK]
+    if (os == "win") and debug and not webrender and (processor == "x86_64"): [ERROR, OK]
+    if os == "mac": ["ERROR", "OK"]
     [OK, ERROR]
   [Test that calling OffscreenCanvas's commit pushes its contents to its placeholder.]
     expected: FAIL
diff --git a/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html.ini b/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html.ini
index 148d1385cd64..46a0b00976cd 100644
--- a/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html.ini
+++ b/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html.ini
@@ -3,14 +3,12 @@
     if (os == "win") and (processor == "x86_64"): random test
   expected:
     if (os == "win") and ccov: OK
-    if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["OK", "TIMEOUT"]
+    if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [OK, TIMEOUT]
     if debug: OK
-    [TIMEOUT, OK]
   [coop reporting test Report only tests for an opener without any COOP/COOP report only set to CROSS_ORIGIN with , , same-origin; report-to="coop-popup-report-only-endpoint", ]
     expected:
-      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [FAIL, TIMEOUT]
       if debug: FAIL
-      [TIMEOUT, FAIL]
 
   [coop reporting test Report only tests for an opener without any COOP/COOP report only set to SAME_ORIGIN with , , same-origin; report-to="coop-popup-report-only-endpoint", ]
     expected: FAIL
@@ -18,8 +16,8 @@
   [verify remaining reports]
     expected:
       if (os == "win") and ccov: PASS
-      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["PASS", "NOTRUN"]
-      if not debug and not webrender and (os == "linux") and (processor == "x86"): ["NOTRUN", "PASS"]
-      if not debug and not webrender and (os == "win"): ["NOTRUN", "PASS", "TIMEOUT"]
-      if not debug and webrender: ["NOTRUN", "PASS"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [PASS, NOTRUN]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): [NOTRUN, PASS]
+      if not debug and not webrender and (os == "win"): [NOTRUN, PASS, TIMEOUT]
+      if not debug and webrender: [NOTRUN, PASS]
 
diff --git a/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html.ini b/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html.ini
index 9dabcd690535..3455783df64e 100644
--- a/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html.ini
+++ b/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html.ini
@@ -1,39 +1,39 @@
 [report-only-same-origin-report-to.https.html]
   expected:
     if (os == "win") and ccov: OK
-    if not debug and (os == "linux") and not webrender and (processor == "x86"): ["TIMEOUT", "OK"]
-    if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if not debug and (os == "linux") and webrender: ["TIMEOUT", "OK"]
+    if not debug and (os == "linux") and not webrender and (processor == "x86"): [TIMEOUT, OK]
+    if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [OK, TIMEOUT]
+    if not debug and (os == "linux") and webrender: [TIMEOUT, OK]
     if not debug and (os == "mac"): TIMEOUT
-    if not debug and (os == "win"): ["TIMEOUT", "OK"]
+    if not debug and (os == "win"): [TIMEOUT, OK]
   [coop reporting test reporting same origin with report-to to CROSS_ORIGIN with , , same-origin; report-to="coop-popup-report-only-endpoint", ]
     expected:
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
-      if not debug and (os == "linux") and not webrender and (processor == "x86"): ["TIMEOUT", "FAIL"]
-      if not debug and (os == "linux") and webrender: ["TIMEOUT", "FAIL"]
-      if not debug and (os == "win") and (processor == "x86"): ["TIMEOUT", "FAIL"]
-      if not debug and (os == "win") and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
+      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [FAIL, TIMEOUT]
+      if not debug and (os == "linux") and not webrender and (processor == "x86"): [TIMEOUT, FAIL]
+      if not debug and (os == "linux") and webrender: [TIMEOUT, FAIL]
+      if not debug and (os == "win") and (processor == "x86"): [TIMEOUT, FAIL]
+      if not debug and (os == "win") and (processor == "x86_64"): [FAIL, TIMEOUT]
       if not debug and (os == "mac"): TIMEOUT
       FAIL
 
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with , , same-origin; report-to="coop-popup-report-only-endpoint", ]
     expected:
       if (os == "win") and ccov: PASS
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN", "TIMEOUT"]
-      if not debug and (os == "linux") and not webrender and (processor == "x86"): ["NOTRUN", "PASS", "TIMEOUT"]
-      if not debug and (os == "win") and (processor == "x86"): ["NOTRUN", "PASS", "TIMEOUT"]
-      if not debug and (os == "win") and (processor == "x86_64"): ["TIMEOUT", "PASS", "NOTRUN"]
-      if not debug and (os == "linux") and webrender: ["NOTRUN", "PASS", "TIMEOUT"]
+      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [PASS, NOTRUN, TIMEOUT]
+      if not debug and (os == "linux") and not webrender and (processor == "x86"): [NOTRUN, PASS, TIMEOUT]
+      if not debug and (os == "win") and (processor == "x86"): [NOTRUN, PASS, TIMEOUT]
+      if not debug and (os == "win") and (processor == "x86_64"): [TIMEOUT, PASS, NOTRUN]
+      if not debug and (os == "linux") and webrender: [NOTRUN, PASS, TIMEOUT]
       if not debug and (os == "mac"): NOTRUN
 
   [verify remaining reports]
     expected:
       if (os == "win") and ccov: PASS
-      if not debug and (os == "linux") and not webrender and (processor == "x86"): ["NOTRUN", "PASS"]
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
-      if not debug and (os == "linux") and webrender: ["NOTRUN", "PASS"]
+      if not debug and (os == "linux") and not webrender and (processor == "x86"): [NOTRUN, PASS]
+      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [PASS, NOTRUN]
+      if not debug and (os == "linux") and webrender: [NOTRUN, PASS]
       if not debug and (os == "mac"): NOTRUN
-      if not debug and (os == "win"): ["NOTRUN", "PASS"]
+      if not debug and (os == "win"): [NOTRUN, PASS]
 
   [coop reporting test reporting same origin with report-to to CROSS_ORIGIN with , , , ]
     expected: FAIL
diff --git a/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html.ini b/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html.ini
index f96255a1d309..6e1cd7dec0ab 100644
--- a/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html.ini
+++ b/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html.ini
@@ -1,20 +1,20 @@
 [report-only-same-origin.https.html]
   expected:
-    if not debug and (os == "win") and not fission and not webrender and (processor == "x86"): ["TIMEOUT", "OK"]
-    if not debug and (os == "win") and not fission and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if not debug and (os == "linux") and not webrender and (processor == "x86"): ["TIMEOUT", "OK"]
-    if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if not debug and (os == "win") and not fission and webrender: ["OK", "TIMEOUT"]
-    if not debug and (os == "linux") and webrender: ["TIMEOUT", "OK"]
-    if not debug and (os == "win") and fission: ["TIMEOUT", "OK"]
+    if not debug and (os == "win") and not fission and not webrender and (processor == "x86"): [TIMEOUT, OK]
+    if not debug and (os == "win") and not fission and not webrender and (processor == "x86_64"): [OK, TIMEOUT]
+    if not debug and (os == "linux") and not webrender and (processor == "x86"): [TIMEOUT, OK]
+    if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [OK, TIMEOUT]
+    if not debug and (os == "win") and not fission and webrender: [OK, TIMEOUT]
+    if not debug and (os == "linux") and webrender: [TIMEOUT, OK]
+    if not debug and (os == "win") and fission: [TIMEOUT, OK]
     if not debug and (os == "mac"): TIMEOUT
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with , , same-origin; report-to="coop-popup-report-only-endpoint", require-corp]
     expected:
-      if not debug and (os == "linux") and not webrender and (processor == "x86"): ["TIMEOUT", "FAIL"]
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
-      if not debug and (os == "linux") and webrender: ["TIMEOUT", "FAIL"]
-      if not debug and (os == "win") and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
-      if not debug and (os == "win") and (processor == "x86"): ["TIMEOUT", "FAIL"]
+      if not debug and (os == "linux") and not webrender and (processor == "x86"): [TIMEOUT, FAIL]
+      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [FAIL, TIMEOUT]
+      if not debug and (os == "linux") and webrender: [TIMEOUT, FAIL]
+      if not debug and (os == "win") and (processor == "x86_64"): [FAIL, TIMEOUT]
+      if not debug and (os == "win") and (processor == "x86"): [TIMEOUT, FAIL]
       if not debug and (os == "mac"): TIMEOUT
       FAIL
 
@@ -23,12 +23,12 @@
 
   [verify remaining reports]
     expected:
-      if not debug and (os == "win") and (processor == "x86_64") and not fission and webrender: ["PASS", "TIMEOUT", "NOTRUN"]
-      if not debug and (os == "win") and (processor == "x86_64") and not fission and not webrender: ["PASS", "TIMEOUT", "NOTRUN"]
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN", "TIMEOUT"]
-      if not debug and (os == "linux") and not webrender and (processor == "x86"): ["NOTRUN", "PASS", "TIMEOUT"]
-      if not debug and (os == "win") and (processor == "x86_64") and fission: ["TIMEOUT", "PASS", "NOTRUN"]
-      if not debug and (os == "linux") and webrender: ["NOTRUN", "PASS"]
-      if not debug and (os == "win") and (processor == "x86"): ["NOTRUN", "PASS", "TIMEOUT"]
+      if not debug and (os == "win") and (processor == "x86_64") and not fission and webrender: [PASS, TIMEOUT, NOTRUN]
+      if not debug and (os == "win") and (processor == "x86_64") and not fission and not webrender: [PASS, TIMEOUT, NOTRUN]
+      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [PASS, NOTRUN, TIMEOUT]
+      if not debug and (os == "linux") and not webrender and (processor == "x86"): [NOTRUN, PASS, TIMEOUT]
+      if not debug and (os == "win") and (processor == "x86_64") and fission: [TIMEOUT, PASS, NOTRUN]
+      if not debug and (os == "linux") and webrender: [NOTRUN, PASS]
+      if not debug and (os == "win") and (processor == "x86"): [NOTRUN, PASS, TIMEOUT]
       if not debug and (os == "mac"): NOTRUN
 
diff --git a/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html.ini b/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html.ini
index b86f3ae9804b..adae155efb2d 100644
--- a/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html.ini
+++ b/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html.ini
@@ -3,28 +3,24 @@
     if (os == "win") and (processor == "x86_64"): random test
   expected:
     if (os == "win") and ccov: OK
-    if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["OK", "TIMEOUT"]
+    if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [OK, TIMEOUT]
     if debug: OK
-    [TIMEOUT, OK]
   [coop reporting test reporting same origin with report-to to CROSS_ORIGIN with same-origin, require-corp, , ]
     expected:
       if (os == "win") and ccov: FAIL
-      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["FAIL", "NOTRUN", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [FAIL, NOTRUN, TIMEOUT]
       if debug: FAIL
-      [NOTRUN, FAIL, TIMEOUT]
 
   [coop reporting test reporting same origin with report-to to CROSS_ORIGIN with same-origin-allow-popups; report-to="coop-popup-report-endpoint", require-corp, , ]
     expected:
-      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [FAIL, TIMEOUT]
       if debug: FAIL
-      [TIMEOUT, FAIL]
 
   [verify remaining reports]
     expected:
       if ccov: [NOTRUN, PASS]
-      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["PASS", "NOTRUN"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [PASS, NOTRUN]
       if debug: PASS
-      [NOTRUN, PASS]
 
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with same-origin; report-to="coop-popup-report-endpoint", , , ]
     expected: FAIL
diff --git a/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html.ini b/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html.ini
index ce04cce09c99..0c03667ad580 100644
--- a/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html.ini
+++ b/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html.ini
@@ -2,27 +2,23 @@
   disabled:
     if (os == "win") and (processor == "x86_64"): random test
   expected:
-    if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["OK", "TIMEOUT"]
+    if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [OK, TIMEOUT]
     if debug: OK
-    [TIMEOUT, OK]
   [coop reporting test reporting same origin to SAME_ORIGIN with unsafe-none; report-to="coop-popup-report-endpoint", , , ]
     expected:
       if (os == "linux") and ccov: [TIMEOUT, FAIL]
-      if not debug and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
+      if not debug and not webrender and (processor == "x86_64"): [FAIL, TIMEOUT]
       if debug: FAIL
-      [TIMEOUT, FAIL]
 
   [coop reporting test reporting same origin to CROSS_ORIGIN with unsafe-none; report-to="coop-popup-report-endpoint", , , ]
     expected:
-      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["FAIL", "NOTRUN", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [FAIL, NOTRUN, TIMEOUT]
       if debug: FAIL
-      [NOTRUN, FAIL, TIMEOUT]
 
   [verify remaining reports]
     expected:
-      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["PASS", "NOTRUN"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [PASS, NOTRUN]
       if debug: PASS
-      [NOTRUN, PASS]
 
   [coop reporting test reporting same origin to CROSS_ORIGIN with same-origin; report-to="coop-popup-report-endpoint", , , ]
     expected: FAIL
@@ -30,7 +26,6 @@
   [coop reporting test reporting same origin to SAME_ORIGIN with , , same-origin; report-to="coop-popup-report-only-endpoint", ]
     expected:
       if (os == "win") and ccov: TIMEOUT
-      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["PASS", "NOTRUN"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [PASS, NOTRUN]
       if debug: PASS
-      [NOTRUN, PASS]
 
diff --git a/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html.ini b/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html.ini
index 651f29379807..703723ec69ce 100644
--- a/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html.ini
+++ b/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html.ini
@@ -3,30 +3,27 @@
     if (os == "win") and (processor == "x86_64"): random test
   expected:
     if (os == "win") and ccov: OK
-    if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["OK", "TIMEOUT"]
+    if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [OK, TIMEOUT]
     if debug: OK
-    [TIMEOUT, OK]
   [coop reporting test reporting same origin with report-to to CROSS_ORIGIN with same-origin; report-to="coop-popup-report-endpoint", , , ]
     expected:
       if ccov: FAIL
-      if not debug and not webrender and (os == "linux") and (processor == "x86"): ["NOTRUN", "FAIL"]
-      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["FAIL", "NOTRUN"]
-      if not debug and not webrender and (os == "win"): ["NOTRUN", "FAIL", "TIMEOUT"]
-      if not debug and webrender: ["NOTRUN", "FAIL"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): [NOTRUN, FAIL]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [FAIL, NOTRUN]
+      if not debug and not webrender and (os == "win"): [NOTRUN, FAIL, TIMEOUT]
+      if not debug and webrender: [NOTRUN, FAIL]
       FAIL
 
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with same-origin, , , ]
     expected:
-      if not debug and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
+      if not debug and not webrender and (processor == "x86_64"): [FAIL, TIMEOUT]
       if debug: FAIL
-      [TIMEOUT, FAIL]
 
   [verify remaining reports]
     expected:
       if (os == "win") and ccov: PASS
-      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["PASS", "NOTRUN"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [PASS, NOTRUN]
       if debug: PASS
-      [NOTRUN, PASS]
 
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with same-origin; report-to="coop-popup-report-endpoint", , , ]
     expected: FAIL
diff --git a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini
index eeaa26b0b00b..af3ae4febbd8 100644
--- a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini
+++ b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini
@@ -43,20 +43,22 @@
 
 [utf-16le.html?include=workers]
   expected:
-    if (os == "mac") and debug: ["TIMEOUT", "OK"]
+    if (os == "mac") and debug: [TIMEOUT, OK]
+    if (processor == "x86") and debug: ["TIMEOUT", "OK"]
     [OK, TIMEOUT]
   [SharedWorker() in a shared worker]
     expected: FAIL
 
   [importScripts() in a shared worker]
     expected:
-      if not webrender and (os == "win") and (processor == "x86"): ["FAIL", "TIMEOUT"]
-      if not webrender and (os == "linux"): ["FAIL", "TIMEOUT"]
+      if not webrender and (os == "win") and (processor == "x86"): [FAIL, TIMEOUT]
+      if not webrender and (os == "linux"): [FAIL, TIMEOUT]
       FAIL
 
   [SharedWorker constructor]
     expected:
-      if (os == "mac") and debug: ["TIMEOUT", "PASS"]
+      if (os == "mac") and debug: [TIMEOUT, PASS]
+      if (processor == "x86") and debug: ["TIMEOUT", "PASS"]
       [PASS, TIMEOUT]
 
   [SharedWorker() in a dedicated worker]
@@ -64,7 +66,7 @@
 
   [Worker() in a shared worker]
     expected:
-      if (os == "linux") and webrender: ["PASS", "TIMEOUT"]
+      if (os == "linux") and webrender: [PASS, TIMEOUT]
 
 
 [utf-16le.html?include=loading]
diff --git a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini
index 0c0c2af795c5..51cfc93096ac 100644
--- a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini
+++ b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini
@@ -33,24 +33,28 @@
 
 [utf-8.html?include=workers]
   expected:
-    if (os == "win") and debug and not webrender and (processor == "x86"): ["TIMEOUT", "OK"]
-    if (os == "win") and debug and webrender: ["TIMEOUT", "OK"]
-    if (os == "mac") and debug: ["TIMEOUT", "OK"]
+    if (os == "win") and debug and not webrender and (processor == "x86"): [TIMEOUT, OK]
+    if (os == "win") and debug and webrender: [TIMEOUT, OK]
+    if (os == "mac") and debug: [TIMEOUT, OK]
+    if (os == "android") and not debug and webrender: ["TIMEOUT", "OK"]
+    if (os == "linux") and debug: ["TIMEOUT", "OK"]
     [OK, TIMEOUT]
   [SharedWorker() in a shared worker]
     expected: FAIL
 
   [importScripts() in a shared worker]
     expected:
-      if (processor == "x86") and debug: ["TIMEOUT", "FAIL"]
-      if (processor == "x86") and not debug: ["FAIL", "TIMEOUT"]
+      if (processor == "x86") and debug: [TIMEOUT, FAIL]
+      if (processor == "x86") and not debug: [FAIL, TIMEOUT]
       FAIL
 
   [SharedWorker constructor]
     expected:
-      if (os == "win") and debug and not webrender and (processor == "x86"): ["TIMEOUT", "PASS"]
-      if (os == "win") and debug and webrender: ["TIMEOUT", "PASS"]
-      if (os == "mac") and debug: ["TIMEOUT", "PASS"]
+      if (os == "win") and debug and not webrender and (processor == "x86"): [TIMEOUT, PASS]
+      if (os == "win") and debug and webrender: [TIMEOUT, PASS]
+      if (os == "mac") and debug: [TIMEOUT, PASS]
+      if (os == "android") and not debug and webrender: ["TIMEOUT", "PASS"]
+      if (os == "linux") and debug: ["TIMEOUT", "PASS"]
       [PASS, TIMEOUT]
 
   [SharedWorker() in a dedicated worker]
@@ -58,7 +62,7 @@
 
   [Worker() in a shared worker]
     expected:
-      if (os == "win") and debug and not webrender: ["PASS", "TIMEOUT"]
+      if (os == "win") and debug and not webrender: [PASS, TIMEOUT]
 
 
 [utf-8.html?include=websocket]
diff --git a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini
index 42385b03eb1a..d254949a5641 100644
--- a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini
+++ b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini
@@ -287,21 +287,23 @@
 
 [windows-1251.html?include=workers]
   expected:
-    if (os == "linux") and debug and not fission: ["TIMEOUT", "OK"]
-    if (os == "win") and (processor == "x86") and not debug: ["TIMEOUT", "OK"]
+    if (os == "linux") and debug and not fission: [TIMEOUT, OK]
+    if (os == "win") and (processor == "x86") and not debug: [TIMEOUT, OK]
+    if (os == "mac") and debug: ["TIMEOUT", "OK"]
     [OK, TIMEOUT]
   [SharedWorker() in a shared worker]
     expected: FAIL
 
   [importScripts() in a shared worker]
     expected:
-      if processor == "x86": ["FAIL", "TIMEOUT"]
+      if processor == "x86": [FAIL, TIMEOUT]
       FAIL
 
   [SharedWorker constructor]
     expected:
-      if (os == "win") and (processor == "x86") and not debug: ["TIMEOUT", "PASS"]
-      if (os == "linux") and debug and not fission: ["TIMEOUT", "PASS"]
+      if (os == "win") and (processor == "x86") and not debug: [TIMEOUT, PASS]
+      if (os == "linux") and debug and not fission: [TIMEOUT, PASS]
+      if (os == "mac") and debug: ["TIMEOUT", "PASS"]
       [PASS, TIMEOUT]
 
   [SharedWorker() in a dedicated worker]
@@ -309,8 +311,8 @@
 
   [Worker() in a shared worker]
     expected:
-      if not webrender and (os == "win") and (processor == "x86"): ["PASS", "TIMEOUT"]
-      if not webrender and (os == "linux"): ["PASS", "TIMEOUT"]
+      if not webrender and (os == "win") and (processor == "x86"): [PASS, TIMEOUT]
+      if not webrender and (os == "linux"): [PASS, TIMEOUT]
 
 
 [windows-1251.html?include=scheme]
diff --git a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini
index 139dde2d49bf..787f7558fb88 100644
--- a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini
+++ b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini
@@ -115,22 +115,28 @@
 
 [windows-1252.html?include=workers]
   expected:
-    if not debug and fission and (os == "win"): ["TIMEOUT", "OK"]
-    if debug and (os == "mac"): ["TIMEOUT", "OK"]
+    if not debug and fission and (os == "win"): [TIMEOUT, OK]
+    if debug and (os == "mac"): [TIMEOUT, OK]
+    if (os == "linux") and debug and not webrender: ["TIMEOUT", "OK"]
+    if (os == "linux") and not debug and webrender: ["TIMEOUT", "OK"]
+    if os == "mac": ["TIMEOUT", "OK"]
     [OK, TIMEOUT]
   [SharedWorker() in a shared worker]
     expected: FAIL
 
   [importScripts() in a shared worker]
     expected:
-      if (os == "win") and not webrender: ["FAIL", "TIMEOUT"]
-      if (os == "linux") and webrender: ["FAIL", "TIMEOUT"]
+      if (os == "win") and not webrender: [FAIL, TIMEOUT]
+      if (os == "linux") and webrender: [FAIL, TIMEOUT]
       FAIL
 
   [SharedWorker constructor]
     expected:
-      if not debug and fission and (os == "win"): ["TIMEOUT", "PASS"]
-      if debug and (os == "mac"): ["TIMEOUT", "PASS"]
+      if not debug and fission and (os == "win"): [TIMEOUT, PASS]
+      if debug and (os == "mac"): [TIMEOUT, PASS]
+      if (os == "linux") and not debug and webrender: ["TIMEOUT", "PASS"]
+      if (os == "linux") and debug and not webrender: ["TIMEOUT", "PASS"]
+      if os == "mac": ["TIMEOUT", "PASS"]
       [PASS, TIMEOUT]
 
   [SharedWorker() in a dedicated worker]
@@ -138,7 +144,7 @@
 
   [Worker() in a shared worker]
     expected:
-      if processor == "x86": ["PASS", "TIMEOUT"]
+      if processor == "x86": [PASS, TIMEOUT]
 
 
 [windows-1252.html?include=websocket]
diff --git a/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first-when-later.html.ini b/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first-when-later.html.ini
index 807d2582c4ae..1e59d4f1268b 100644
--- a/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first-when-later.html.ini
+++ b/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first-when-later.html.ini
@@ -1,6 +1,6 @@
 [first-when-later.html]
   [The first autofocus in the document wins, even if elements are inserted later.]
     expected:
-      if (os == "win") and not fission and not debug and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "win") and fission: ["PASS", "FAIL"]
+      if (os == "win") and not fission and not debug and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "win") and fission: [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/no-autofocus-on-changing-input-type.html.ini b/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/no-autofocus-on-changing-input-type.html.ini
index f82a4638cd5a..1166695e8399 100644
--- a/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/no-autofocus-on-changing-input-type.html.ini
+++ b/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/no-autofocus-on-changing-input-type.html.ini
@@ -3,5 +3,7 @@
     expected:
       if (os == "win") and debug and not webrender: PASS
       if (os == "linux") and debug and not webrender: PASS
+      if not debug and webrender and (os == "android"): ["FAIL", "PASS"]
+      if not debug and webrender and (os == "win"): ["FAIL", "PASS"]
       [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/html/semantics/forms/input-change-event-properties.html.ini b/testing/web-platform/meta/html/semantics/forms/input-change-event-properties.html.ini
index f2de4f87dcef..e2deffe25d46 100644
--- a/testing/web-platform/meta/html/semantics/forms/input-change-event-properties.html.ini
+++ b/testing/web-platform/meta/html/semantics/forms/input-change-event-properties.html.ini
@@ -1,22 +1,23 @@
 [input-change-event-properties.html]
   expected:
-    if (os == "android") and debug and webrender: ["OK", "ERROR"]
-    if (os == "android") and debug and not webrender: ["OK", "ERROR"]
-    if (os == "android") and not debug: ["OK", "ERROR"]
+    if (os == "android") and debug and webrender: [OK, ERROR]
+    if (os == "android") and debug and not webrender: [OK, ERROR]
+    if (os == "android") and not debug: [OK, ERROR]
   [<select> pressing down arrow]
     expected:
-      if (os == "android") and webrender and debug: ["FAIL", "PASS"]
-      if (os == "android") and webrender and not debug: ["PASS", "FAIL"]
+      if (os == "android") and webrender and debug: [FAIL, PASS]
+      if (os == "android") and webrender and not debug: [PASS, FAIL]
       if (os == "android") and not webrender: FAIL
       if os == "mac": FAIL
 
   [<textarea></textarea> typing]
     expected:
-      if (os == "android") and debug and webrender: ["PASS", "FAIL"]
-      if (os == "android") and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "android") and not debug: ["PASS", "FAIL"]
+      if (os == "android") and debug and webrender: [PASS, FAIL]
+      if (os == "android") and debug and not webrender: [PASS, FAIL]
+      if (os == "android") and webrender: ["FAIL", "PASS"]
+      if (os == "android") and not webrender: ["PASS", "FAIL"]
 
   [<input type="number"> typing]
     expected:
-      if (os == "android") and debug: ["PASS", "FAIL"]
+      if (os == "android") and debug: [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-classic.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-classic.html.ini
index 039a26c4889d..17747616eb3b 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-classic.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-classic.html.ini
@@ -2,9 +2,9 @@
   [<script> error: Move fetch-error external classic script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
       FAIL
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-module.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-module.html.ini
index 6efe6bca8249..c0259e869454 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-module.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-module.html.ini
@@ -2,9 +2,9 @@
   [<script> error: Move fetch-error external module script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "win") and not debug: PASS
       if (os == "mac") and not debug: PASS
       FAIL
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-classic.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-classic.html.ini
index 723287bb3d42..2665e4409690 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-classic.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-classic.html.ini
@@ -2,9 +2,9 @@
   [<script> load: Move parse-error external classic script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
       FAIL
@@ -12,9 +12,9 @@
   [window error: Move parse-error external classic script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
       FAIL
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-module.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-module.html.ini
index 8814471cfb9f..8a1e81e77ce2 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-module.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-module.html.ini
@@ -2,9 +2,9 @@
   [window error: Move parse-error external module script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "win") and not debug: PASS
       if (os == "mac") and not debug: PASS
       FAIL
@@ -12,9 +12,9 @@
   [<script> load: Move parse-error external module script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "win") and not debug: PASS
       if (os == "mac") and not debug: PASS
       FAIL
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-classic.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-classic.html.ini
index dbda3ddb0232..b7b966e572c7 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-classic.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-classic.html.ini
@@ -2,9 +2,9 @@
   [Eval: Move success external classic script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "win") and not debug: PASS
       if (os == "mac") and not debug: PASS
       FAIL
@@ -12,9 +12,9 @@
   [<script> load: Move success external classic script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "win") and not debug: PASS
       if (os == "mac") and not debug: PASS
       FAIL
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-module.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-module.html.ini
index 71d15bb19d74..b484dac83ada 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-module.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-module.html.ini
@@ -2,9 +2,9 @@
   [<script> load: Move success external module script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
       FAIL
@@ -12,9 +12,9 @@
   [Eval: Move success external module script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
       FAIL
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-classic.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-classic.html.ini
index 541c54613729..1e46bab691fd 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-classic.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-classic.html.ini
@@ -2,32 +2,32 @@
   [<script> load: Move parse-error external classic script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
-      if (os == "linux") and debug: ["FAIL", "PASS"]
+      if (os == "linux") and debug: [FAIL, PASS]
       FAIL
 
   [window error: Move parse-error external classic script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
-      if (os == "linux") and debug: ["FAIL", "PASS"]
+      if (os == "linux") and debug: [FAIL, PASS]
       FAIL
 
   [<script> error: Move parse-error external classic script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["FAIL", "PASS"]
-      if (os == "linux") and not debug and webrender: ["FAIL", "PASS"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [FAIL, PASS]
+      if (os == "linux") and not debug and webrender: [FAIL, PASS]
       if (os == "mac") and not debug: FAIL
-      if (os == "linux") and debug: ["PASS", "FAIL"]
+      if (os == "linux") and debug: [PASS, FAIL]
       if (os == "win") and not debug: FAIL
 
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-module.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-module.html.ini
index 679f23eaa5ca..6b596987d0ff 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-module.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-module.html.ini
@@ -2,32 +2,32 @@
   [<script> error: Move parse-error external module script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["FAIL", "PASS"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["FAIL", "PASS"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [FAIL, PASS]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [FAIL, PASS]
       if (os == "win") and not debug: FAIL
       if (os == "mac") and not debug: FAIL
-      if (os == "linux") and debug: ["PASS", "FAIL"]
+      if (os == "linux") and debug: [PASS, FAIL]
 
   [window error: Move parse-error external module script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
-      if (os == "linux") and debug: ["FAIL", "PASS"]
+      if (os == "linux") and debug: [FAIL, PASS]
       if (os == "win") and not debug: PASS
       FAIL
 
   [<script> load: Move parse-error external module script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
-      if (os == "linux") and debug: ["FAIL", "PASS"]
+      if (os == "linux") and debug: [FAIL, PASS]
       FAIL
 
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-inline-classic.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-inline-classic.html.ini
index 6a68cb05e55c..98ac455b983e 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-inline-classic.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-inline-classic.html.ini
@@ -2,9 +2,9 @@
   [window error: Move parse-error inline classic script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
       FAIL
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-classic.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-classic.html.ini
index 7cef8ebb505a..0978568db348 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-classic.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-classic.html.ini
@@ -2,32 +2,32 @@
   [<script> error: Move success external classic script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["FAIL", "PASS"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["FAIL", "PASS"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [FAIL, PASS]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [FAIL, PASS]
       if (os == "mac") and not debug: FAIL
-      if (os == "linux") and debug: ["PASS", "FAIL"]
+      if (os == "linux") and debug: [PASS, FAIL]
       if (os == "win") and not debug: FAIL
 
   [<script> load: Move success external classic script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
-      if (os == "linux") and debug: ["FAIL", "PASS"]
+      if (os == "linux") and debug: [FAIL, PASS]
       FAIL
 
   [Eval: Move success external classic script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "win") and not debug: PASS
-      if (os == "linux") and debug: ["FAIL", "PASS"]
+      if (os == "linux") and debug: [FAIL, PASS]
       if (os == "mac") and not debug: PASS
       FAIL
 
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-module.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-module.html.ini
index e7052c5a4321..a26c799cede4 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-module.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-module.html.ini
@@ -2,32 +2,32 @@
   [<script> load: Move success external module script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
-      if (os == "linux") and debug: ["FAIL", "PASS"]
+      if (os == "linux") and debug: [FAIL, PASS]
       FAIL
 
   [Eval: Move success external module script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
-      if (os == "linux") and debug: ["FAIL", "PASS"]
+      if (os == "linux") and debug: [FAIL, PASS]
       FAIL
 
   [<script> error: Move success external module script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["FAIL", "PASS"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["FAIL", "PASS"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [FAIL, PASS]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [FAIL, PASS]
       if (os == "mac") and not debug: FAIL
-      if (os == "linux") and debug: ["PASS", "FAIL"]
+      if (os == "linux") and debug: [PASS, FAIL]
       if (os == "win") and not debug: FAIL
 
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-inline-classic.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-inline-classic.html.ini
index 2aee687a8b62..60f9903d70d3 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-inline-classic.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-inline-classic.html.ini
@@ -2,9 +2,9 @@
   [Eval: Move success inline classic script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
       FAIL
diff --git a/testing/web-platform/meta/intersection-observer/cross-origin-iframe.sub.html.ini b/testing/web-platform/meta/intersection-observer/cross-origin-iframe.sub.html.ini
index 28e67ec180c4..8d7e78bd3e3f 100644
--- a/testing/web-platform/meta/intersection-observer/cross-origin-iframe.sub.html.ini
+++ b/testing/web-platform/meta/intersection-observer/cross-origin-iframe.sub.html.ini
@@ -2,5 +2,6 @@
   [First rAF]
     expected:
       if debug: PASS
+      if not debug and (os == "android") and webrender: ["FAIL", "PASS"]
       [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/intersection-observer/timestamp.html.ini b/testing/web-platform/meta/intersection-observer/timestamp.html.ini
index 16e0fbde6f93..af39871685fa 100644
--- a/testing/web-platform/meta/intersection-observer/timestamp.html.ini
+++ b/testing/web-platform/meta/intersection-observer/timestamp.html.ini
@@ -2,8 +2,9 @@ prefs: [privacy.reduceTimerPrecision:false]
 [timestamp.html]
   [Generate notifications.]
     expected:
-      if (os == "linux") and webrender and debug and fission: ["PASS", "FAIL"]
-      if (os == "linux") and webrender and debug and not fission: ["PASS", "FAIL"]
-      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
-      if (os == "android") and debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and webrender and debug and fission: [PASS, FAIL]
+      if (os == "linux") and webrender and debug and not fission: [PASS, FAIL]
+      if (os == "linux") and not webrender and not debug: [PASS, FAIL]
+      if (os == "android") and debug and not webrender: [PASS, FAIL]
+      if (os == "win") and webrender: FAIL
 
diff --git a/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-001.html.ini b/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-001.html.ini
index e6651a8ccc31..8daabf440269 100644
--- a/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-001.html.ini
+++ b/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-001.html.ini
@@ -1,7 +1,8 @@
 [operator-dictionary-spacing-001.html]
   [Operator dictionary chunk 1 - lspace/rspace]
     expected:
-      if (os == "linux") and not webrender and not debug and (processor == "x86"): ["FAIL", "PASS"]
+      if (os == "linux") and not webrender and not debug and (processor == "x86"): [FAIL, PASS]
+      if (os == "linux") and not debug and not webrender: ["FAIL", "PASS"]
       [PASS, FAIL]
 
   [Operator dictionary chunk 3 - lspace/rspace]
diff --git a/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-002.html.ini b/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-002.html.ini
index 0b5367713888..a70514c3d828 100644
--- a/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-002.html.ini
+++ b/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-002.html.ini
@@ -1,13 +1,14 @@
 [operator-dictionary-spacing-002.html]
   [Operator dictionary chunk 1 - lspace/rspace]
     expected:
-      if (os == "linux") and not fission and webrender and not debug: ["FAIL", "PASS"]
-      if (os == "win") and (processor == "x86") and debug: ["FAIL", "PASS"]
-      if (os == "mac") and debug: ["FAIL", "PASS"]
+      if (os == "linux") and not fission and webrender and not debug: [FAIL, PASS]
+      if (os == "win") and (processor == "x86") and debug: [FAIL, PASS]
+      if (os == "mac") and debug: [FAIL, PASS]
+      if (os == "linux") and debug and not webrender: ["FAIL", "PASS"]
       [PASS, FAIL]
 
   [Operator dictionary chunk 3 - lspace/rspace]
     expected:
-      if (os == "mac") and debug: ["FAIL", "PASS"]
+      if (os == "mac") and debug: [FAIL, PASS]
       [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-003.html.ini b/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-003.html.ini
index 9990cc611019..1221563d0126 100644
--- a/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-003.html.ini
+++ b/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-003.html.ini
@@ -1,10 +1,12 @@
 [operator-dictionary-spacing-003.html]
   [Operator dictionary chunk 1 - lspace/rspace]
     expected:
-      if os == "mac": ["PASS", "FAIL"]
+      if (os == "mac") and not debug: ["PASS", "FAIL"]
+      if (os == "mac") and debug: ["FAIL", "PASS"]
 
   [Operator dictionary chunk 3 - lspace/rspace]
     expected:
-      if (os == "linux") and debug and not webrender: ["FAIL", "PASS"]
+      if (os == "linux") and debug and not webrender: [FAIL, PASS]
+      if (os == "mac") and debug: ["FAIL", "PASS"]
       [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-004.html.ini b/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-004.html.ini
index 8fab2b5b9dd8..08e841412017 100644
--- a/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-004.html.ini
+++ b/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-004.html.ini
@@ -3,15 +3,15 @@
     disabled:
       if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1668892
     expected:
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
-      if (os == "mac") and debug: ["FAIL", "PASS"]
+      if (os == "mac") and not debug: [PASS, FAIL]
+      if (os == "mac") and debug: [FAIL, PASS]
 
   [Operator dictionary chunk 3 - lspace/rspace]
     expected:
-      if (os == "linux") and debug and webrender and not fission: ["FAIL", "PASS"]
-      if (os == "linux") and debug and webrender and fission: ["PASS", "FAIL"]
-      if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
-      if (os == "mac") and debug: ["FAIL", "PASS"]
-      if (os == "linux") and not debug: ["PASS", "FAIL"]
+      if (os == "linux") and debug and webrender and not fission: [FAIL, PASS]
+      if (os == "linux") and debug and webrender and fission: [PASS, FAIL]
+      if (os == "linux") and debug and not webrender: [PASS, FAIL]
+      if (os == "mac") and not debug: [PASS, FAIL]
+      if (os == "mac") and debug: [FAIL, PASS]
+      if (os == "linux") and not debug: [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-005.html.ini b/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-005.html.ini
index 2aa7b2a9b409..42d95a6115a4 100644
--- a/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-005.html.ini
+++ b/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-005.html.ini
@@ -1,6 +1,8 @@
 [operator-dictionary-spacing-005.html]
   [Operator dictionary chunk 3 - lspace/rspace]
-    expected: [PASS, FAIL]
+    expected:
+      if (os == "linux") and not webrender and debug: ["FAIL", "PASS"]
+      [PASS, FAIL]
 
   [Operator dictionary chunk 1 - lspace/rspace]
     expected: [PASS, FAIL]
diff --git a/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-006.html.ini b/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-006.html.ini
index 60815710aeae..9b1508f56ba0 100644
--- a/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-006.html.ini
+++ b/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-006.html.ini
@@ -1,20 +1,20 @@
 [operator-dictionary-spacing-006.html]
   [Operator dictionary chunk 3 - lspace/rspace]
     expected:
-      if (os == "linux") and debug and not fission and not webrender: ["FAIL", "PASS"]
-      if (os == "linux") and debug and not fission and webrender: ["FAIL", "PASS"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and debug and fission: ["PASS", "FAIL"]
-      if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
-      if (os == "mac") and debug: ["FAIL", "PASS"]
+      if (os == "linux") and debug and not fission and not webrender: [FAIL, PASS]
+      if (os == "linux") and debug and not fission and webrender: [FAIL, PASS]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and debug and fission: [PASS, FAIL]
+      if (os == "linux") and not debug and webrender: [PASS, FAIL]
+      if (os == "mac") and not debug: [PASS, FAIL]
+      if (os == "mac") and debug: [FAIL, PASS]
 
   [Operator dictionary chunk 1 - lspace/rspace]
     expected:
-      if debug and (os == "linux") and not fission and webrender: ["FAIL", "PASS"]
-      if debug and (os == "linux") and not fission and not webrender: ["FAIL", "PASS"]
-      if debug and (os == "win") and (processor == "x86_64"): ["FAIL", "PASS"]
-      if debug and (os == "mac"): ["FAIL", "PASS"]
+      if debug and (os == "linux") and not fission and webrender: [FAIL, PASS]
+      if debug and (os == "linux") and not fission and not webrender: [FAIL, PASS]
+      if debug and (os == "win") and (processor == "x86_64"): [FAIL, PASS]
+      if debug and (os == "mac"): [FAIL, PASS]
       [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-bitrate.https.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-bitrate.https.html.ini
index d2668e969b58..539a2a871797 100644
--- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-bitrate.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-bitrate.https.html.ini
@@ -1,6 +1,6 @@
 [MediaRecorder-bitrate.https.html]
   expected:
-    if (os == "linux") and not fission and (processor == "x86_64") and debug and webrender: ["OK", "ERROR"]
-    if (os == "linux") and not fission and (processor == "x86_64") and not debug and not webrender: ["OK", "ERROR"]
-    if (os == "linux") and fission and not debug: ["OK", "ERROR", "CRASH"]
-    if (os == "android") and debug: CRASH
+    if (os == "linux") and not fission and (processor == "x86_64") and debug and webrender: [OK, ERROR]
+    if (os == "linux") and not fission and (processor == "x86_64") and not debug and not webrender: [OK, ERROR]
+    if (os == "linux") and fission and not debug: [OK, ERROR, CRASH]
+    if (os == "android") and debug: OK
diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-disabled-tracks.https.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-disabled-tracks.https.html.ini
index 5759d021fab1..b2104491c937 100644
--- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-disabled-tracks.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-disabled-tracks.https.html.ini
@@ -1,8 +1,8 @@
 [MediaRecorder-disabled-tracks.https.html]
   expected:
-    if (os == "linux") and not webrender and not debug and (processor == "x86_64"): ["CRASH", "ERROR", "OK"]
-    if (os == "linux") and webrender and not debug and fission: ["ERROR", "CRASH"]
-    if (os == "linux") and webrender and not debug and not fission: ["ERROR", "CRASH"]
-    if (os == "linux") and not webrender and debug: ["ERROR", "CRASH", ""]
+    if (os == "linux") and not webrender and not debug and (processor == "x86_64"): [CRASH, ERROR, OK]
+    if (os == "linux") and webrender and not debug and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and webrender and not debug and not fission: [ERROR, CRASH]
+    if (os == "linux") and not webrender and debug: [ERROR, CRASH, ]
     if (os == "linux") and webrender and debug: ERROR
-    if (os == "android") and debug: CRASH
+    if (os == "android") and debug: OK
diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-mimetype.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-mimetype.html.ini
index 1b3f7ea4b7c1..14a21949fc55 100644
--- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-mimetype.html.ini
+++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-mimetype.html.ini
@@ -1,32 +1,32 @@
 [MediaRecorder-mimetype.html]
   expected:
     if (os == "linux") and not debug and (processor == "x86_64") and webrender and not fission: ERROR
-    if (os == "linux") and not debug and (processor == "x86_64") and webrender and fission: ["ERROR", "CRASH"]
-    if (os == "linux") and not debug and (processor == "x86_64") and not webrender: ["ERROR", "OK", "CRASH"]
-    if (os == "win") and webrender and not debug: ["OK", "TIMEOUT"]
-    if (os == "android") and debug: CRASH
+    if (os == "linux") and not debug and (processor == "x86_64") and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and (processor == "x86_64") and not webrender: [ERROR, OK, CRASH]
+    if (os == "win") and webrender and not debug: [OK, TIMEOUT]
+    if (os == "android") and debug: OK
     if (os == "linux") and debug: ERROR
   [MediaRecorder doesn't fire 'onstart' multiple times for video]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
 
   [MediaRecorder doesn't fire 'onstart' multiple times for audio/video]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
 
   [MediaRecorder formats mimeType well after 'start' for audio]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
 
   [MediaRecorder doesn't fire 'onstart' multiple times for audio]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "TIMEOUT"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, TIMEOUT]
 
   [MediaRecorder formats mimeType well after 'start' for audio/video]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
 
   [MediaRecorder formats mimeType well after 'start' for video]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
 
diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html.ini
index 9f326745e034..fd4c12cdf291 100644
--- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html.ini
@@ -1,12 +1,12 @@
 [MediaRecorder-peerconnection-no-sink.https.html]
   expected:
-    if (os == "linux") and webrender and not debug and fission: ["ERROR", "CRASH"]
-    if (os == "linux") and webrender and not debug and not fission: ["ERROR", "CRASH"]
-    if (os == "linux") and not webrender and not debug and (processor == "x86_64"): ["ERROR", "OK"]
+    if (os == "linux") and webrender and not debug and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and webrender and not debug and not fission: [ERROR, CRASH]
+    if (os == "linux") and not webrender and not debug and (processor == "x86_64"): [ERROR, OK]
     if (os == "linux") and webrender and debug: ERROR
     if (os == "linux") and not webrender and debug: ERROR
     if (os == "android") and not debug: TIMEOUT
-    if (os == "android") and debug: CRASH
+    if (os == "android") and debug: TIMEOUT
   [MediaRecorder records from PeerConnection without sinks, {"video":{}}]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1669551
 
diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini
index 63ab8c25f0bb..2a763b3283ab 100644
--- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini
@@ -1,12 +1,12 @@
 [MediaRecorder-peerconnection.https.html]
   expected:
-    if (os == "linux") and not debug and webrender and fission: ["ERROR", "CRASH"]
-    if (os == "linux") and not debug and webrender and not fission: ["ERROR", "CRASH"]
-    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["ERROR", "CRASH", "OK"]
-    if (os == "android") and debug and webrender: ["CRASH", "ERROR", "TIMEOUT"]
-    if (os == "android") and debug and not webrender: ["CRASH", "ERROR", "TIMEOUT"]
+    if (os == "linux") and not debug and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and webrender and not fission: [ERROR, CRASH]
+    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [ERROR, CRASH, OK]
+    if (os == "android") and debug and webrender: [CRASH, ERROR, TIMEOUT]
+    if (os == "android") and debug and not webrender: [CRASH, ERROR, TIMEOUT]
     if (os == "linux") and debug: ERROR
-    if (os == "android") and not debug: ["TIMEOUT", "ERROR", "CRASH"]
+    if (os == "android") and not debug: [TIMEOUT, ERROR, CRASH]
   [PeerConnection MediaRecorder receives data after onstart, {"video":{}} mimeType ""]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1669551
     expected:
diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-stop.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-stop.html.ini
index dff392936253..42851f57bdfd 100644
--- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-stop.html.ini
+++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-stop.html.ini
@@ -1,8 +1,8 @@
 [MediaRecorder-stop.html]
   expected:
-    if (os == "linux") and (processor == "x86_64") and webrender and not debug and fission: ["ERROR", "CRASH"]
-    if (os == "linux") and (processor == "x86_64") and webrender and not debug and not fission: ["ERROR", "CRASH"]
+    if (os == "linux") and (processor == "x86_64") and webrender and not debug and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and (processor == "x86_64") and webrender and not debug and not fission: [ERROR, CRASH]
     if (os == "linux") and (processor == "x86_64") and webrender and debug: ERROR
-    if (os == "linux") and (processor == "x86_64") and not webrender and debug: ["ERROR", "CRASH"]
-    if (os == "linux") and (processor == "x86_64") and not webrender and not debug: ["CRASH", "ERROR", "OK"]
-    if (os == "android") and debug: CRASH
+    if (os == "linux") and (processor == "x86_64") and not webrender and debug: [ERROR, CRASH]
+    if (os == "linux") and (processor == "x86_64") and not webrender and not debug: [CRASH, ERROR, OK]
+    if (os == "android") and debug: OK
diff --git a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini
index 9efb9f739426..de07f919b5ea 100644
--- a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini
+++ b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini
@@ -1,15 +1,15 @@
 [audio-upgrade.https.sub.html]
   expected:
-    if (os == "linux") and webrender and not debug and not fission: ["OK", "TIMEOUT"]
-    if (os == "android") and not webrender and not debug: ["OK", "TIMEOUT"]
-    if (os == "android") and not webrender and debug: ["TIMEOUT", "OK"]
-    if (os == "android") and webrender: ["OK", "TIMEOUT"]
-    if (os == "win") and (processor == "x86"): ["OK", "TIMEOUT"]
+    if (os == "linux") and webrender and not debug and not fission: [OK, TIMEOUT]
+    if (os == "android") and not webrender and not debug: [OK, TIMEOUT]
+    if (os == "android") and not webrender and debug: [TIMEOUT, OK]
+    if (os == "android") and webrender: [OK, TIMEOUT]
+    if (os == "win") and (processor == "x86"): [OK, TIMEOUT]
   [Audio autoupgraded]
     expected:
-      if (os == "linux") and webrender and not debug and not fission: ["PASS", "TIMEOUT"]
-      if (os == "android") and not webrender and debug: ["TIMEOUT", "PASS"]
-      if (os == "android") and not webrender and not debug: ["PASS", "TIMEOUT"]
-      if (os == "win") and (processor == "x86"): ["PASS", "TIMEOUT"]
-      if (os == "android") and webrender: ["PASS", "TIMEOUT"]
+      if (os == "linux") and webrender and not debug and not fission: [PASS, TIMEOUT]
+      if (os == "android") and not webrender and debug: [TIMEOUT, PASS]
+      if (os == "android") and not webrender and not debug: [PASS, TIMEOUT]
+      if (os == "win") and (processor == "x86"): [PASS, TIMEOUT]
+      if (os == "android") and webrender: [PASS, TIMEOUT]
 
diff --git a/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html.ini b/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html.ini
index 70df5064d2ad..f75b62dd6a53 100644
--- a/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html.ini
+++ b/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html.ini
@@ -1,13 +1,14 @@
 [pointerevent_getCoalescedEvents_when_pointerlocked.html]
   [mouse pointermove getCoalescedEvents when lock test]
     expected:
-      if not fission and (os == "win") and (processor == "x86_64") and not webrender and debug: ["FAIL", "PASS"]
-      if not fission and (os == "win") and (processor == "x86") and debug: ["FAIL", "PASS"]
-      if not fission and (os == "linux") and not webrender and debug: ["FAIL", "PASS"]
-      if not fission and (os == "linux") and webrender and debug: ["FAIL", "PASS"]
-      if not fission and (os == "linux") and webrender and not debug: ["FAIL", "PASS"]
-      if fission and (os == "linux") and not debug: ["FAIL", "PASS"]
-      if fission and (os == "linux") and debug: ["FAIL", "PASS"]
-      if fission and (os == "win"): ["FAIL", "PASS"]
+      if not fission and (os == "win") and (processor == "x86_64") and not webrender and debug: [FAIL, PASS]
+      if not fission and (os == "win") and (processor == "x86") and debug: [FAIL, PASS]
+      if not fission and (os == "linux") and not webrender and debug: [FAIL, PASS]
+      if not fission and (os == "linux") and webrender and debug: [FAIL, PASS]
+      if not fission and (os == "linux") and webrender and not debug: [FAIL, PASS]
+      if fission and (os == "linux") and not debug: [FAIL, PASS]
+      if fission and (os == "linux") and debug: [FAIL, PASS]
+      if fission and (os == "win"): [FAIL, PASS]
+      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["FAIL", "PASS"]
       [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini b/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini
index 2c7e2558a37a..d23a6c3c51c2 100644
--- a/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini
+++ b/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini
@@ -1,11 +1,13 @@
 [pointerevent_movementxy_with_pointerlock.html]
   expected:
-    if (os == "win") and webrender and not debug and not fission: ["OK", "ERROR"]
-    if (os == "linux") and not debug and not webrender: ["OK", "ERROR"]
-    if (os == "linux") and not debug and webrender: ["OK", "ERROR", "TIMEOUT"]
-    if os == "mac": ["OK", "ERROR", "TIMEOUT"]
+    if (os == "win") and webrender and not debug and not fission: [OK, ERROR]
+    if (os == "linux") and not debug and not webrender: [OK, ERROR]
+    if (os == "linux") and not debug and webrender: [OK, ERROR, TIMEOUT]
+    if os == "mac": [OK, ERROR, TIMEOUT]
   [mouse pointerevent movementX/Y with pointerlock test]
     expected:
-      if (processor == "x86_64") and (os == "android") and debug and webrender: ["FAIL", "PASS", "TIMEOUT"]
+      if (processor == "x86_64") and (os == "android") and debug and webrender: [FAIL, PASS, TIMEOUT]
+      if (os == "linux") and debug and webrender: ["FAIL", "PASS", "TIMEOUT"]
+      if (os == "android") and not webrender: ["FAIL", "PASS", "TIMEOUT"]
       [PASS, FAIL, TIMEOUT]
 
diff --git a/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html.ini b/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html.ini
index 18768ca7ea26..a13cc6348560 100644
--- a/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html.ini
+++ b/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html.ini
@@ -1,10 +1,10 @@
 [pointerevent_pointerlock_supercedes_capture.html]
   [mouse no pointercapture while pointerlock]
     expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and not webrender: ["PASS", "FAIL"]
-      if (os == "linux") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and not debug: ["FAIL", "PASS"]
-      if (os == "linux") and not fission and debug: ["PASS", "FAIL"]
-      if os == "mac": ["PASS", "FAIL"]
+      if (os == "win") and (processor == "x86_64") and not fission and debug and webrender: [PASS, FAIL]
+      if (os == "win") and (processor == "x86_64") and not fission and not debug and not webrender: [PASS, FAIL]
+      if (os == "linux") and not fission and not debug and webrender: [PASS, FAIL]
+      if (os == "win") and (processor == "x86") and not debug: [FAIL, PASS]
+      if (os == "linux") and not fission and debug: [PASS, FAIL]
+      if os == "mac": [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini b/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
index 9e136074eba3..e3d3b30c7e86 100644
--- a/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
+++ b/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
@@ -1,12 +1,11 @@
 [iframe-inheritance-about-blank.html]
   expected:
-    if (os == "linux") and not debug and (processor == "x86_64") and webrender and fission: ["OK", "TIMEOUT"]
-    if (os == "linux") and not debug and (processor == "x86_64") and not webrender: ["OK", "TIMEOUT"]
-    if (os == "linux") and debug and webrender and not fission: ["OK", "TIMEOUT"]
-    if (os == "android") and debug and not webrender: ["OK", "TIMEOUT"]
-    if (os == "android") and not debug and webrender: ["OK", "TIMEOUT"]
-    if (os == "android") and not debug and not webrender: ["OK", "TIMEOUT"]
-    [TIMEOUT, OK]
+    if (os == "linux") and not debug and (processor == "x86_64") and webrender and fission: [OK, TIMEOUT]
+    if (os == "linux") and not debug and (processor == "x86_64") and not webrender: [OK, TIMEOUT]
+    if (os == "linux") and debug and webrender and not fission: [OK, TIMEOUT]
+    if (os == "android") and debug and not webrender: [OK, TIMEOUT]
+    if (os == "android") and not debug and webrender: [OK, TIMEOUT]
+    if (os == "android") and not debug and not webrender: [OK, TIMEOUT]
   [The value of document.referrer in an about:blank iframe is the outer document's full URL, regardless of referrer policy]
     expected: FAIL
 
@@ -15,13 +14,12 @@
 
   [A subresource fetched from an about:blank iframe is fetched with no 'Referer' header]
     expected:
-      if (os == "linux") and not debug and (processor == "x86_64") and webrender and fission: ["PASS", "NOTRUN"]
-      if (os == "linux") and debug and webrender and not fission: ["PASS", "NOTRUN"]
-      if (os == "linux") and not debug and (processor == "x86_64") and not webrender: ["PASS", "NOTRUN"]
-      if (os == "android") and debug and not webrender: ["PASS", "NOTRUN"]
-      if (os == "android") and not debug and webrender: ["PASS", "NOTRUN"]
-      if (os == "android") and not debug and not webrender: ["PASS", "NOTRUN"]
-      [NOTRUN, PASS]
+      if (os == "linux") and not debug and (processor == "x86_64") and webrender and fission: [PASS, NOTRUN]
+      if (os == "linux") and debug and webrender and not fission: [PASS, NOTRUN]
+      if (os == "linux") and not debug and (processor == "x86_64") and not webrender: [PASS, NOTRUN]
+      if (os == "android") and debug and not webrender: [PASS, NOTRUN]
+      if (os == "android") and not debug and webrender: [PASS, NOTRUN]
+      if (os == "android") and not debug and not webrender: [PASS, NOTRUN]
 
   [The fetch() API in an about:blank iframe with a custom URL referrer is fetched with a 'Referer` header that uses the outer document's URL along with its referrer policy]
     expected: FAIL
diff --git a/testing/web-platform/meta/resize-observer/change-layout-in-error.html.ini b/testing/web-platform/meta/resize-observer/change-layout-in-error.html.ini
index a51184f74c5b..b340ff8423ed 100644
--- a/testing/web-platform/meta/resize-observer/change-layout-in-error.html.ini
+++ b/testing/web-platform/meta/resize-observer/change-layout-in-error.html.ini
@@ -1,12 +1,13 @@
 [change-layout-in-error.html]
   [Changing layout in window error handler should not result in lifecyle loop when resize observer loop limit is reached.]
     expected:
-      if not debug and (os == "win") and (processor == "x86_64") and webrender and fission: ["PASS", "FAIL"]
-      if not debug and (os == "win") and (processor == "x86_64") and not webrender: ["PASS", "FAIL"]
-      if not debug and (os == "linux") and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if not debug and (os == "linux") and webrender: ["PASS", "FAIL"]
-      if not debug and (os == "android") and not webrender: ["PASS", "FAIL"]
-      if not debug and (os == "android") and webrender: ["PASS", "FAIL"]
-      if not debug and (os == "mac"): ["PASS", "FAIL"]
+      if not debug and (os == "win") and (processor == "x86_64") and webrender and fission: [PASS, FAIL]
+      if not debug and (os == "win") and (processor == "x86_64") and not webrender: [PASS, FAIL]
+      if not debug and (os == "linux") and not webrender and (processor == "x86"): [PASS, FAIL]
+      if not debug and (os == "linux") and webrender: [PASS, FAIL]
+      if not debug and (os == "android") and not webrender: [PASS, FAIL]
+      if not debug and (os == "android") and webrender: [PASS, FAIL]
+      if not debug and (os == "mac"): [PASS, FAIL]
+      if not debug and (os == "win") and not webrender and (processor == "x86"): ["PASS", "FAIL"]
       [FAIL, PASS]
 
diff --git a/testing/web-platform/meta/resource-timing/resource-reload-TAO.sub.html.ini b/testing/web-platform/meta/resource-timing/resource-reload-TAO.sub.html.ini
index c3e2141a6409..c2a9760fcf25 100644
--- a/testing/web-platform/meta/resource-timing/resource-reload-TAO.sub.html.ini
+++ b/testing/web-platform/meta/resource-timing/resource-reload-TAO.sub.html.ini
@@ -1,15 +1,13 @@
 [resource-reload-TAO.sub.html]
   expected:
-    if (os == "win") and not debug and not fission and (processor == "x86_64"): ["TIMEOUT", "OK"]
-    if (os == "win") and not debug and not fission and (processor == "x86"): ["TIMEOUT", "OK"]
-    if (os == "win") and not debug and fission: ["OK", "TIMEOUT"]
-    if os == "mac": ["TIMEOUT", "OK"]
-    TIMEOUT
+    if (os == "win") and not debug and not fission and (processor == "x86_64"): [TIMEOUT, OK]
+    if (os == "win") and not debug and not fission and (processor == "x86"): [TIMEOUT, OK]
+    if (os == "win") and not debug and fission: [OK, TIMEOUT]
+    if os == "mac": [TIMEOUT, OK]
   [Test that TAO headers are reused on reloads.]
     expected:
-      if (os == "win") and not debug and not fission and (processor == "x86_64"): ["TIMEOUT", "PASS"]
-      if (os == "win") and not debug and not fission and (processor == "x86"): ["TIMEOUT", "PASS"]
-      if (os == "win") and not debug and fission: ["PASS", "TIMEOUT"]
-      if os == "mac": ["TIMEOUT", "PASS"]
-      TIMEOUT
+      if (os == "win") and not debug and not fission and (processor == "x86_64"): [TIMEOUT, PASS]
+      if (os == "win") and not debug and not fission and (processor == "x86"): [TIMEOUT, PASS]
+      if (os == "win") and not debug and fission: [PASS, TIMEOUT]
+      if os == "mac": [TIMEOUT, PASS]
 
diff --git a/testing/web-platform/meta/resource-timing/workerStart-tao-protected.https.html.ini b/testing/web-platform/meta/resource-timing/workerStart-tao-protected.https.html.ini
index 854b5ff1ec74..0913191d5906 100644
--- a/testing/web-platform/meta/resource-timing/workerStart-tao-protected.https.html.ini
+++ b/testing/web-platform/meta/resource-timing/workerStart-tao-protected.https.html.ini
@@ -1,25 +1,26 @@
 [workerStart-tao-protected.https.html]
   expected:
-    if not debug and (os == "win") and not webrender and (processor == "x86_64"): OK
+    if not debug and (os == "win") and not webrender and (processor == "x86_64"): TIMEOUT
     if not debug and (os == "android") and not webrender: OK
     if debug and not fission: OK
     [OK, TIMEOUT]
   [Add TAO iframe to remote origin. Make sure workerStart is not zero]
     expected:
-      if not debug and (os == "linux") and webrender and fission: ["FAIL", "TIMEOUT"]
-      if not debug and (os == "linux") and webrender and not fission: ["FAIL", "TIMEOUT", "NOTRUN"]
-      if not debug and (os == "win") and not webrender and (processor == "x86"): ["FAIL", "TIMEOUT"]
-      if not debug and (os == "win") and webrender and not fission: ["FAIL", "TIMEOUT", "NOTRUN"]
-      if not debug and (os == "win") and webrender and fission: ["FAIL", "TIMEOUT"]
-      if not debug and (os == "android") and webrender: ["FAIL", "TIMEOUT", "NOTRUN"]
-      if not debug and (os == "linux") and not webrender: ["FAIL", "TIMEOUT"]
-      if not debug and (os == "mac"): ["FAIL", "TIMEOUT"]
-      if debug and fission: ["FAIL", "TIMEOUT"]
+      if not debug and (os == "linux") and webrender and fission: [FAIL, TIMEOUT]
+      if not debug and (os == "linux") and webrender and not fission: [FAIL, TIMEOUT, NOTRUN]
+      if not debug and (os == "win") and not webrender and (processor == "x86"): [FAIL, TIMEOUT]
+      if not debug and (os == "win") and webrender and not fission: [FAIL, TIMEOUT, NOTRUN]
+      if not debug and (os == "win") and webrender and fission: [FAIL, TIMEOUT]
+      if not debug and (os == "android") and webrender: [FAIL, TIMEOUT, NOTRUN]
+      if not debug and (os == "linux") and not webrender: [FAIL, TIMEOUT]
+      if not debug and (os == "mac"): [FAIL, TIMEOUT]
+      if debug and fission: [FAIL, TIMEOUT]
+      if (os == "win") and not debug and not webrender and (processor == "x86_64"): TIMEOUT
       FAIL
 
   [Add TAO-less iframe to remote origin. Make sure workerStart is zero]
     expected:
-      if webrender and not debug and (os == "linux") and not fission: ["PASS", "TIMEOUT"]
-      if webrender and not debug and (os == "win") and not fission: ["PASS", "TIMEOUT"]
-      if webrender and not debug and (os == "android"): ["PASS", "TIMEOUT"]
+      if webrender and not debug and (os == "linux") and not fission: [PASS, TIMEOUT]
+      if webrender and not debug and (os == "win") and not fission: [PASS, TIMEOUT]
+      if webrender and not debug and (os == "android"): [PASS, TIMEOUT]
 
diff --git a/testing/web-platform/meta/screen-orientation/event-before-promise.html.ini b/testing/web-platform/meta/screen-orientation/event-before-promise.html.ini
index 5d9a949100d1..83fc8c838b59 100644
--- a/testing/web-platform/meta/screen-orientation/event-before-promise.html.ini
+++ b/testing/web-platform/meta/screen-orientation/event-before-promise.html.ini
@@ -1,8 +1,8 @@
 [event-before-promise.html]
   expected:
-    if (os == "win") and (processor == "x86") and debug: ["ERROR", "OK"]
-    if (os == "win") and (processor == "x86") and not debug: ["ERROR", "OK"]
-    if os == "android": ["TIMEOUT", "OK", "ERROR"]
+    if (os == "win") and (processor == "x86") and debug: [ERROR, OK]
+    if (os == "win") and (processor == "x86") and not debug: [ERROR, OK]
+    if os == "android": [TIMEOUT, OK, ERROR]
     [OK, ERROR]
   [The 'change' event must fire before the [[orientationPendingPromise\]\] is resolved.]
     expected:
diff --git a/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini
index 817e61368522..06a55868ae0e 100644
--- a/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini
@@ -1,27 +1,28 @@
 [navigation-redirect.https.html]
   [SW-fallbacked redirect to same-origin same-scope with different hash fragments.]
     expected:
-      if webrender and not debug: ["PASS", "FAIL"]
+      if webrender and not debug: [PASS, FAIL]
+      if not webrender and (os == "linux") and not debug: ["PASS", "FAIL"]
 
   [SW-fallbacked redirect to same-origin same-scope.]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "FAIL"]
-      if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
-      if (os == "linux") and not debug: ["PASS", "FAIL"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, FAIL]
+      if (os == "win") and webrender and not debug and fission: [PASS, FAIL]
+      if (os == "linux") and not debug: [PASS, FAIL]
 
   [SW-fallbacked redirect to same-origin same-scope with a hash fragment.]
     expected:
-      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and webrender and not debug: ["PASS", "FAIL"]
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
+      if (os == "win") and debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and webrender and not debug: [PASS, FAIL]
+      if (os == "mac") and not debug: [PASS, FAIL]
 
   [SW-fallbacked redirect to other-origin and back to same-origin.]
     expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
+      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: [PASS, FAIL]
+      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: [PASS, FAIL]
+      if (os == "win") and (processor == "x86_64") and fission: [PASS, FAIL]
+      if (os == "linux") and not webrender and not debug: [PASS, FAIL]
+      if (os == "mac") and not debug: [PASS, FAIL]
 
 
 [navigation-redirect.https.html?client]
diff --git a/testing/web-platform/meta/service-workers/service-worker/update-no-cache-request-headers.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/update-no-cache-request-headers.https.html.ini
index d5c82aec2214..890323e529f6 100644
--- a/testing/web-platform/meta/service-workers/service-worker/update-no-cache-request-headers.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/update-no-cache-request-headers.https.html.ini
@@ -1,6 +1,7 @@
 [update-no-cache-request-headers.https.html]
   [headers in no-cache mode]
     expected:
-      if fission and (os == "linux") and debug: ["FAIL", "PASS"]
+      if fission and (os == "linux") and debug: [FAIL, PASS]
+      if (os == "mac") and debug: ["FAIL", "PASS"]
       [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/video-rvfc/request-video-frame-callback-webrtc.https.html.ini b/testing/web-platform/meta/video-rvfc/request-video-frame-callback-webrtc.https.html.ini
index 4ec33f5706be..ff65e72c1e81 100644
--- a/testing/web-platform/meta/video-rvfc/request-video-frame-callback-webrtc.https.html.ini
+++ b/testing/web-platform/meta/video-rvfc/request-video-frame-callback-webrtc.https.html.ini
@@ -1,7 +1,7 @@
 [request-video-frame-callback-webrtc.https.html]
   expected:
-    if (os == "linux") and fission and not debug: ["ERROR", "CRASH"]
-    if (os == "android") and debug: CRASH
+    if (os == "linux") and fission and not debug: [ERROR, CRASH]
+    if (os == "android") and debug: ERROR
     ERROR
   [Test video.requestVideoFrameCallback() parameters for WebRTC applications.]
     expected: TIMEOUT
diff --git a/testing/web-platform/meta/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html.ini b/testing/web-platform/meta/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html.ini
index 2ccfec329116..3dc7aa3a45d2 100644
--- a/testing/web-platform/meta/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html.ini
+++ b/testing/web-platform/meta/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html.ini
@@ -1,8 +1,8 @@
 [RTCRtpSynchronizationSource-captureTimestamp.html]
   expected:
-    if (os == "linux") and debug and webrender and fission: ["OK", "ERROR"]
-    if (os == "linux") and debug and not webrender: ["OK", "ERROR"]
-    if (os == "android") and debug: CRASH
+    if (os == "linux") and debug and webrender and fission: [OK, ERROR]
+    if (os == "linux") and debug and not webrender: [OK, ERROR]
+    if (os == "android") and debug: OK
   [Audio and video RTCRtpSynchronizationSource.captureTimestamp are comparable]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-legacy.https.html.ini b/testing/web-platform/meta/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-legacy.https.html.ini
index 7e9d8e55a0e4..8d3ba6869ae9 100644
--- a/testing/web-platform/meta/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-legacy.https.html.ini
+++ b/testing/web-platform/meta/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-legacy.https.html.ini
@@ -1,10 +1,10 @@
 [RTCPeerConnection-insertable-streams-legacy.https.html]
   expected:
-    if (os == "linux") and not debug and (processor == "x86_64") and webrender and not fission: ["ERROR", "OK", "CRASH"]
-    if (os == "linux") and not debug and (processor == "x86_64") and webrender and fission: ["OK", "ERROR", "CRASH"]
-    if (os == "linux") and not debug and (processor == "x86_64") and not webrender: ["OK", "CRASH", "ERROR"]
-    if (os == "linux") and debug and fission: ["ERROR", "OK"]
-    if (os == "android") and debug: CRASH
+    if (os == "linux") and not debug and (processor == "x86_64") and webrender and not fission: [ERROR, OK, CRASH]
+    if (os == "linux") and not debug and (processor == "x86_64") and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and (processor == "x86_64") and not webrender: [OK, CRASH, ERROR]
+    if (os == "linux") and debug and fission: [ERROR, OK]
+    if (os == "android") and debug: OK
   [Legacy API works]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/webrtc/RTCDTMFSender-insertDTMF.https.html.ini b/testing/web-platform/meta/webrtc/RTCDTMFSender-insertDTMF.https.html.ini
deleted file mode 100644
index 73ce7544df52..000000000000
--- a/testing/web-platform/meta/webrtc/RTCDTMFSender-insertDTMF.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[RTCDTMFSender-insertDTMF.https.html]
-  expected:
-    if (os == "android") and debug: CRASH
diff --git a/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange-long.https.html.ini b/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange-long.https.html.ini
index ba8cfa9ea177..da3c96f8a8dc 100644
--- a/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange-long.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange-long.https.html.ini
@@ -1,12 +1,12 @@
 [RTCDTMFSender-ontonechange-long.https.html]
   expected:
-    if (os == "linux") and not debug and webrender and fission: ["ERROR", "CRASH"]
-    if (os == "linux") and not debug and webrender and not fission: ["CRASH", "ERROR"]
-    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["CRASH", "ERROR", "OK"]
-    if (os == "android") and debug: CRASH
-    if (os == "linux") and debug: ERROR
+    if (os == "linux") and not debug and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and webrender and not fission: [CRASH, ERROR]
+    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [CRASH, ERROR, OK]
+    if (os == "android") and debug: OK
+    if (os == "linux") and debug: OK
   [insertDTMF with duration greater than 6000 should be clamped to 6000]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1402717
     expected:
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
+      if (os == "win") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange.https.html.ini b/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange.https.html.ini
index 2ab5310f7cf4..1e46ca665470 100644
--- a/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange.https.html.ini
@@ -2,8 +2,8 @@
   restart-after:
     if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1641237
   expected:
-    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["ERROR", "CRASH", "OK"]
-    if (os == "linux") and not debug and webrender and fission: ["CRASH", "ERROR"]
-    if (os == "linux") and not debug and webrender and not fission: ["ERROR", "CRASH"]
-    if (os == "android") and debug: CRASH
-    if (os == "linux") and debug: ERROR
+    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [ERROR, CRASH, OK]
+    if (os == "linux") and not debug and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and webrender and not fission: [ERROR, CRASH]
+    if (os == "android") and debug: OK
+    if (os == "linux") and debug: OK
diff --git a/testing/web-platform/meta/webrtc/RTCPeerConnection-getStats.https.html.ini b/testing/web-platform/meta/webrtc/RTCPeerConnection-getStats.https.html.ini
index d7105ea1af7e..c34218483490 100644
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-getStats.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-getStats.https.html.ini
@@ -1,11 +1,10 @@
 [RTCPeerConnection-getStats.https.html]
   expected:
-    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["CRASH", "ERROR", "TIMEOUT"]
-    if (os == "linux") and not debug and webrender and fission: ["ERROR", "CRASH"]
-    if (os == "linux") and not debug and webrender and not fission: ["ERROR", "CRASH"]
-    if (os == "linux") and debug: ERROR
-    if (os == "android") and debug: CRASH
-    TIMEOUT
+    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [CRASH, ERROR, TIMEOUT]
+    if (os == "linux") and not debug and webrender and fission: [TIMEOUT, ERROR, CRASH]
+    if (os == "linux") and not debug and webrender and not fission: [ERROR, CRASH]
+    if (os == "linux") and debug: TIMEOUT
+    if (os == "android") and debug: TIMEOUT
   [getStats() with no argument should return stats report containing peer-connection stats on an empty PC]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1531087
     expected: FAIL
diff --git a/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState-disconnected.https.html.ini b/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState-disconnected.https.html.ini
deleted file mode 100644
index b3776e1ac88b..000000000000
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState-disconnected.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[RTCPeerConnection-iceConnectionState-disconnected.https.html]
-  expected:
-    if (os == "android") and debug: CRASH
diff --git a/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState.https.html.ini b/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState.https.html.ini
index a6c60cb548f7..f541899306a2 100644
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState.https.html.ini
@@ -1,77 +1,77 @@
 [RTCPeerConnection-iceConnectionState.https.html]
   expected:
-    if (os == "linux") and not fission and not debug and webrender: ["OK", "ERROR"]
-    if (os == "linux") and not fission and debug and webrender: ["OK", "ERROR"]
-    if (os == "linux") and not fission and debug and not webrender: ["OK", "ERROR"]
-    if (os == "win") and webrender and not fission: ["OK", "TIMEOUT"]
-    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
-    if (os == "mac") and debug: ["OK", "TIMEOUT"]
-    if (os == "android") and debug: CRASH
+    if (os == "linux") and not fission and not debug and webrender: [OK, ERROR]
+    if (os == "linux") and not fission and debug and webrender: [OK, ERROR]
+    if (os == "linux") and not fission and debug and not webrender: [OK, ERROR]
+    if (os == "win") and webrender and not fission: [OK, TIMEOUT]
+    if (os == "mac") and not debug: [OK, TIMEOUT]
+    if (os == "mac") and debug: [OK, TIMEOUT]
+    if (os == "android") and debug: OK
   [connection with one data channel should eventually have connected connection state]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1278299
     expected:
-      if (os == "win") and webrender and not fission: ["FAIL", "TIMEOUT"]
-      if (os == "mac") and debug: ["FAIL", "TIMEOUT"]
-      if (os == "mac") and not debug: ["FAIL", "TIMEOUT"]
+      if (os == "win") and webrender and not fission: [FAIL, TIMEOUT]
+      if (os == "mac") and debug: [FAIL, TIMEOUT]
+      if (os == "mac") and not debug: [FAIL, TIMEOUT]
       FAIL
 
   [iceConnectionState changes at the right time, with bundle policy max-bundle]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
     expected:
-      if (os == "win") and webrender and not fission: ["FAIL", "NOTRUN"]
-      if (os == "mac") and debug: ["FAIL", "NOTRUN"]
-      if (os == "mac") and not debug: ["FAIL", "NOTRUN"]
+      if (os == "win") and webrender and not fission: [FAIL, NOTRUN]
+      if (os == "mac") and debug: [FAIL, NOTRUN]
+      if (os == "mac") and not debug: [FAIL, NOTRUN]
       FAIL
 
   [iceConnectionState changes at the right time, with bundle policy max-compat]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
     expected:
-      if (os == "win") and webrender and not fission: ["FAIL", "NOTRUN"]
-      if (os == "mac") and debug: ["FAIL", "NOTRUN"]
-      if (os == "mac") and not debug: ["FAIL", "NOTRUN"]
+      if (os == "win") and webrender and not fission: [FAIL, NOTRUN]
+      if (os == "mac") and debug: [FAIL, NOTRUN]
+      if (os == "mac") and not debug: [FAIL, NOTRUN]
       FAIL
 
   [iceConnectionState changes at the right time, with bundle policy balanced]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
     expected:
-      if (os == "win") and webrender and not fission: ["FAIL", "NOTRUN"]
-      if (os == "mac") and debug: ["FAIL", "NOTRUN"]
-      if (os == "mac") and not debug: ["FAIL", "NOTRUN"]
+      if (os == "win") and webrender and not fission: [FAIL, NOTRUN]
+      if (os == "mac") and debug: [FAIL, NOTRUN]
+      if (os == "mac") and not debug: [FAIL, NOTRUN]
       FAIL
 
   [Closing a PeerConnection should not fire iceconnectionstatechange event]
     expected:
-      if (os == "win") and webrender and not fission: ["PASS", "NOTRUN"]
-      if (os == "mac") and debug: ["PASS", "NOTRUN"]
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not fission: [PASS, NOTRUN]
+      if (os == "mac") and debug: [PASS, NOTRUN]
+      if (os == "mac") and not debug: [PASS, NOTRUN]
 
   [ICE can connect in a recvonly usecase]
     expected:
-      if (os == "win") and webrender and not fission: ["PASS", "NOTRUN"]
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
-      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not fission: [PASS, NOTRUN]
+      if (os == "mac") and not debug: [PASS, NOTRUN]
+      if (os == "mac") and debug: [PASS, NOTRUN]
 
   [connection with audio and video tracks should eventually have connected connection state]
     expected:
-      if (os == "win") and webrender and not fission: ["PASS", "NOTRUN"]
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
-      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not fission: [PASS, NOTRUN]
+      if (os == "mac") and not debug: [PASS, NOTRUN]
+      if (os == "mac") and debug: [PASS, NOTRUN]
 
   [connection with audio track should eventually have connected connection state]
     expected:
-      if (os == "win") and webrender and not fission: ["PASS", "TIMEOUT"]
-      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
-      if (os == "mac") and debug: ["PASS", "TIMEOUT"]
+      if (os == "win") and webrender and not fission: [PASS, TIMEOUT]
+      if (os == "mac") and not debug: [PASS, TIMEOUT]
+      if (os == "mac") and debug: [PASS, TIMEOUT]
 
   [Responder ICE connection state behaves as expected]
     expected:
-      if (os == "win") and webrender and not fission: ["PASS", "NOTRUN"]
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
-      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not fission: [PASS, NOTRUN]
+      if (os == "mac") and not debug: [PASS, NOTRUN]
+      if (os == "mac") and debug: [PASS, NOTRUN]
 
   [connection with one data channel should eventually have connected or completed connection state]
     expected:
-      if (os == "win") and webrender and not fission: ["PASS", "TIMEOUT"]
-      if (os == "mac") and not debug: ["PASS", "FAIL", "TIMEOUT"]
-      if (os == "mac") and debug: ["PASS", "FAIL"]
+      if (os == "win") and webrender and not fission: [PASS, TIMEOUT]
+      if (os == "mac") and not debug: [PASS, FAIL, TIMEOUT]
+      if (os == "mac") and debug: [PASS, FAIL]
 
diff --git a/testing/web-platform/meta/webrtc/RTCPeerConnection-mandatory-getStats.https.html.ini b/testing/web-platform/meta/webrtc/RTCPeerConnection-mandatory-getStats.https.html.ini
index eb014b7d3f15..d6acfbeb62b0 100644
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-mandatory-getStats.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-mandatory-getStats.https.html.ini
@@ -1,11 +1,11 @@
 [RTCPeerConnection-mandatory-getStats.https.html]
   expected:
-    if (os == "linux") and (processor == "x86_64") and webrender and not debug and fission: ["CRASH", "ERROR"]
+    if (os == "linux") and (processor == "x86_64") and webrender and not debug and fission: [OK, ERROR, CRASH]
     if (os == "linux") and (processor == "x86_64") and webrender and not debug and not fission: ERROR
-    if (os == "linux") and (processor == "x86_64") and webrender and debug: ERROR
-    if (os == "linux") and (processor == "x86_64") and not webrender and debug: ["ERROR", "CRASH"]
-    if (os == "linux") and (processor == "x86_64") and not webrender and not debug: ["ERROR", "CRASH", "OK"]
-    if (os == "android") and debug: CRASH
+    if (os == "linux") and (processor == "x86_64") and webrender and debug: OK
+    if (os == "linux") and (processor == "x86_64") and not webrender and debug: [OK, ERROR, CRASH]
+    if (os == "linux") and (processor == "x86_64") and not webrender and not debug: [ERROR, CRASH, OK]
+    if (os == "android") and debug: OK
   [RTCRtpStreamStats's transportId]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225723
     expected: FAIL
diff --git a/testing/web-platform/meta/webrtc/RTCPeerConnection-ondatachannel.html.ini b/testing/web-platform/meta/webrtc/RTCPeerConnection-ondatachannel.html.ini
index 6050d57cf180..6bed95ea76ab 100644
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-ondatachannel.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-ondatachannel.html.ini
@@ -1,46 +1,49 @@
 [RTCPeerConnection-ondatachannel.html]
   bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
   expected:
-    if (os == "win") and not debug and not webrender and (processor == "x86"): ["TIMEOUT", "OK"]
+    if (os == "win") and not debug and not webrender and (processor == "x86"): [TIMEOUT, OK]
+    if (os == "mac") and not debug: ["TIMEOUT", "OK"]
     [OK, TIMEOUT]
   [In-band negotiated channel created on remote peer should match the same configuration as local peer]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
     expected:
-      if (os == "win") and not debug and not webrender and (processor == "x86"): ["TIMEOUT", "PASS"]
-      if (os == "win") and not debug and webrender: ["PASS", "TIMEOUT", "NOTRUN"]
-      if (os == "mac") and not debug: ["PASS", "NOTRUN", "TIMEOUT"]
+      if (os == "win") and not debug and not webrender and (processor == "x86"): [TIMEOUT, PASS]
+      if (os == "win") and not debug and webrender: [PASS, TIMEOUT, NOTRUN]
+      if (os == "mac") and not debug: [PASS, NOTRUN, TIMEOUT]
       [PASS, TIMEOUT]
 
   [In-band negotiated channel created on remote peer should match the same (default) configuration as local peer]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
     expected:
-      if (os == "win") and not debug and not webrender and (processor == "x86"): ["NOTRUN", "PASS"]
+      if (os == "win") and not debug and not webrender and (processor == "x86"): [NOTRUN, PASS]
+      if (os == "mac") and not debug: ["NOTRUN", "PASS"]
       [PASS, NOTRUN]
 
   [Open event should not be raised when sending and immediately closing the channel in the datachannel event]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
     expected:
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
+      if (os == "mac") and not debug: [PASS, NOTRUN]
 
   [Negotiated channel should not fire datachannel event on remote peer]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
     expected:
-      if (os == "win") and not debug and not webrender and (processor == "x86"): ["NOTRUN", "PASS"]
+      if (os == "win") and not debug and not webrender and (processor == "x86"): [NOTRUN, PASS]
+      if (os == "mac") and not debug: ["NOTRUN", "PASS"]
       [PASS, NOTRUN]
 
   [Open event should be raised when closing the channel in the datachannel event after enqueuing a task]
     expected:
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
+      if (os == "mac") and not debug: [PASS, NOTRUN]
 
   [Data channel event should fire when new data channel is announced to the remote peer]
     expected:
-      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
+      if (os == "mac") and not debug: [PASS, TIMEOUT]
 
   [Open event should not be raised when closing the channel in the datachannel event]
     expected:
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
+      if (os == "mac") and not debug: [PASS, NOTRUN]
 
   [Should be able to send data in a datachannel event handler]
     expected:
-      if (os == "mac") and not debug: ["PASS", "NOTRUN", "TIMEOUT"]
+      if (os == "mac") and not debug: [PASS, NOTRUN, TIMEOUT]
 
diff --git a/testing/web-platform/meta/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html.ini b/testing/web-platform/meta/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html.ini
deleted file mode 100644
index 60396967f864..000000000000
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[RTCPeerConnection-onsignalingstatechanged.https.html]
-  expected:
-    if (os == "android") and debug: CRASH
diff --git a/testing/web-platform/meta/webrtc/RTCPeerConnection-remote-track-mute.https.html.ini b/testing/web-platform/meta/webrtc/RTCPeerConnection-remote-track-mute.https.html.ini
index 83a5bc085550..461e257e2285 100644
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-remote-track-mute.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-remote-track-mute.https.html.ini
@@ -1,35 +1,35 @@
 [RTCPeerConnection-remote-track-mute.https.html]
   prefs: [media.peerconnection.mute_on_bye_or_timeout:true]
   expected:
-    if (os == "win") and not debug and not fission and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if (os == "linux") and webrender and debug and fission: ["ERROR", "OK"]
-    if (os == "linux") and webrender and debug and not fission: ["ERROR", "OK"]
-    if (os == "linux") and webrender and not debug and fission: ["CRASH", "OK", "ERROR"]
-    if (os == "linux") and webrender and not debug and not fission: ["ERROR", "OK"]
-    if (os == "linux") and not webrender and not debug and (processor == "x86"): ["OK", "TIMEOUT"]
-    if (os == "linux") and not webrender and not debug and (processor == "x86_64"): ["CRASH", "OK", "TIMEOUT"]
-    if (os == "linux") and not webrender and debug: ["OK", "ERROR"]
-    if (os == "android") and debug: CRASH
+    if (os == "win") and not debug and not fission and (processor == "x86_64"): [OK, TIMEOUT]
+    if (os == "linux") and webrender and debug and fission: [ERROR, OK]
+    if (os == "linux") and webrender and debug and not fission: [ERROR, OK]
+    if (os == "linux") and webrender and not debug and fission: [CRASH, OK, ERROR]
+    if (os == "linux") and webrender and not debug and not fission: [ERROR, OK]
+    if (os == "linux") and not webrender and not debug and (processor == "x86"): [OK, TIMEOUT]
+    if (os == "linux") and not webrender and not debug and (processor == "x86_64"): [CRASH, OK, TIMEOUT]
+    if (os == "linux") and not webrender and debug: [OK, ERROR]
+    if (os == "android") and debug: OK
   [pc.close() on one side causes mute events on the other]
     expected:
-      if (os == "win") and not debug and not fission and (processor == "x86_64"): ["PASS", "NOTRUN"]
+      if (os == "win") and not debug and not fission and (processor == "x86_64"): [PASS, NOTRUN]
 
   [Changing transceiver direction to 'sendrecv' unmutes the remote track]
     expected:
-      if (os == "win") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
-      if (os == "win") and not debug and webrender and not fission: ["PASS", "FAIL", "NOTRUN"]
+      if (os == "win") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "win") and not debug and not webrender and (processor == "x86_64"): [PASS, NOTRUN]
+      if (os == "win") and not debug and webrender and not fission: [PASS, FAIL, NOTRUN]
 
   [transceiver.stop() on one side (without renegotiation) causes mute events on the other]
     expected:
-      if (os == "win") and not debug and not fission and (processor == "x86_64"): ["PASS", "NOTRUN"]
+      if (os == "win") and not debug and not fission and (processor == "x86_64"): [PASS, NOTRUN]
 
   [Changing transceiver direction to 'inactive' mutes the remote track]
     expected:
-      if (os == "win") and not debug and webrender and not fission: ["PASS", "TIMEOUT", "NOTRUN"]
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
+      if (os == "win") and not debug and webrender and not fission: [PASS, TIMEOUT, NOTRUN]
+      if (os == "win") and not debug and not webrender and (processor == "x86_64"): [PASS, NOTRUN]
 
   [ontrack: track goes from muted to unmuted]
     expected:
-      if (os == "win") and not debug and not fission and (processor == "x86_64"): ["PASS", "TIMEOUT"]
+      if (os == "win") and not debug and not fission and (processor == "x86_64"): [PASS, TIMEOUT]
 
diff --git a/testing/web-platform/meta/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html.ini b/testing/web-platform/meta/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html.ini
index 177fbf5b0560..71b34b664be3 100644
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html.ini
@@ -2,7 +2,7 @@
   restart-after:
     if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1641237
   expected:
-    if (os == "linux") and debug and webrender and fission: ["OK", "ERROR"]
-    if (os == "linux") and debug and webrender and not fission: ["OK", "ERROR"]
-    if (os == "linux") and debug and not webrender: ["OK", "ERROR"]
-    if (os == "android") and debug: CRASH
+    if (os == "linux") and debug and webrender and fission: [OK, ERROR]
+    if (os == "linux") and debug and webrender and not fission: [OK, ERROR]
+    if (os == "linux") and debug and not webrender: [OK, ERROR]
+    if (os == "android") and debug: OK
diff --git a/testing/web-platform/meta/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html.ini b/testing/web-platform/meta/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html.ini
index a1ff2f72affa..69dfc2eb1466 100644
--- a/testing/web-platform/meta/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html.ini
@@ -1,10 +1,10 @@
 [RTCRtpReceiver-getSynchronizationSources.https.html]
   expected:
-    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["CRASH", "ERROR", "OK"]
-    if (os == "linux") and not debug and webrender and fission: ["ERROR", "CRASH"]
-    if (os == "linux") and not debug and webrender and not fission: ["ERROR", "CRASH"]
-    if (os == "android") and debug: CRASH
-    if (os == "linux") and debug: ERROR
+    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [CRASH, ERROR, OK]
+    if (os == "linux") and not debug and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and webrender and not fission: [ERROR, CRASH]
+    if (os == "android") and debug: OK
+    if (os == "linux") and debug: OK
   [[audio-only\] RTCRtpSynchronizationSource.voiceActivityFlag is a boolean]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1525394
     expected: FAIL
diff --git a/testing/web-platform/meta/webrtc/RTCRtpTransceiver.https.html.ini b/testing/web-platform/meta/webrtc/RTCRtpTransceiver.https.html.ini
index c916d4b37220..4526dcd8f00b 100644
--- a/testing/web-platform/meta/webrtc/RTCRtpTransceiver.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCRtpTransceiver.https.html.ini
@@ -2,126 +2,126 @@
   restart-after:
     if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1641237
   expected:
-    if (os == "linux") and (processor == "x86_64") and webrender and debug and fission: ["ERROR", "CRASH"]
+    if (os == "linux") and (processor == "x86_64") and webrender and debug and fission: [OK, ERROR, CRASH]
     if (os == "linux") and (processor == "x86_64") and webrender and debug and not fission: ERROR
-    if (os == "linux") and (processor == "x86_64") and webrender and not debug and fission: ["ERROR", "CRASH"]
-    if (os == "linux") and (processor == "x86_64") and webrender and not debug and not fission: ["CRASH", "ERROR"]
-    if (os == "linux") and (processor == "x86_64") and not webrender and debug: ["ERROR", "CRASH"]
-    if (os == "linux") and (processor == "x86_64") and not webrender and not debug: ["CRASH", "ERROR", "OK"]
-    if (os == "android") and debug and webrender: ["CRASH", "OK"]
-    if (os == "android") and debug and not webrender: ["CRASH", "OK"]
-    if (os == "android") and not debug and webrender: ["CRASH", "OK"]
-    if (os == "android") and not debug and not webrender: ["OK", "CRASH"]
-    if (os == "win") and (processor == "x86") and debug: ["OK", "ERROR"]
+    if (os == "linux") and (processor == "x86_64") and webrender and not debug and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and (processor == "x86_64") and webrender and not debug and not fission: [CRASH, ERROR]
+    if (os == "linux") and (processor == "x86_64") and not webrender and debug: [OK, ERROR, CRASH]
+    if (os == "linux") and (processor == "x86_64") and not webrender and not debug: [CRASH, ERROR, OK]
+    if (os == "android") and debug and webrender: [CRASH, OK]
+    if (os == "android") and debug and not webrender: [CRASH, OK]
+    if (os == "android") and not debug and webrender: [CRASH, OK]
+    if (os == "android") and not debug and not webrender: [OK, CRASH]
+    if (os == "win") and (processor == "x86") and debug: [OK, ERROR]
   [checkRemoteRollback]
     expected:
-      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
+      if (processor == "x86") and debug: [FAIL, NOTRUN]
       FAIL
 
   [checkStopAfterCreateOffer]
     expected:
-      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
+      if (processor == "x86") and debug: [FAIL, NOTRUN]
       FAIL
 
   [checkLocalRollback]
     expected:
-      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
+      if (processor == "x86") and debug: [FAIL, NOTRUN]
       FAIL
 
   [checkStopAfterCreateAnswer]
     expected:
-      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
+      if (processor == "x86") and debug: [FAIL, NOTRUN]
       FAIL
 
   [checkStopAfterSetLocalAnswer]
     expected:
-      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
+      if (processor == "x86") and debug: [FAIL, NOTRUN]
       FAIL
 
   [checkStopAfterSetRemoteOffer]
     expected:
-      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
+      if (processor == "x86") and debug: [FAIL, NOTRUN]
       FAIL
 
   [checkStopAfterSetLocalOffer]
     expected:
-      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
+      if (processor == "x86") and debug: [FAIL, NOTRUN]
       FAIL
 
   [checkStop]
     expected:
-      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
+      if (processor == "x86") and debug: [FAIL, NOTRUN]
       FAIL
 
   [checkAddIceCandidateToStoppedTransceiver]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkReplaceTrackNullDoesntPreventPairing]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkAddTrackExistingTransceiverThenRemove]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkMsectionReuse]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkAddTransceiverNoTrackDoesntPair]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkRemoveTrackNegotiation]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkStopAfterClose]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkAddTransceiverWithTrackDoesntPair]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkAddTransceiverThenAddTrackPairs]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkSendrecvWithTracklessStream]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkAddTrackPairs]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkStopAfterCreateOfferWithReusedMsection]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkBundleTagRejected]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkMute]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkSendrecvWithNoSendTrack]
     expected:
-      if (processor == "x86") and debug: ["PASS", "TIMEOUT"]
+      if (processor == "x86") and debug: [PASS, TIMEOUT]
 
   [checkRemoveAndReadd]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkAddTransceiverThenReplaceTrackDoesntPair]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
   [checkRollbackAndSetRemoteOfferWithDifferentType]
     expected:
-      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
+      if (processor == "x86") and debug: [PASS, NOTRUN]
 
diff --git a/testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini b/testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini
index c5db5adedb4a..933e803fa78a 100644
--- a/testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini
+++ b/testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini
@@ -1,20 +1,20 @@
 [bundle.https.html]
   expected:
-    if (os == "linux") and not debug and (processor == "x86_64") and webrender and fission: ["ERROR", "CRASH"]
+    if (os == "linux") and not debug and (processor == "x86_64") and webrender and fission: [OK, ERROR, CRASH]
     if (os == "linux") and not debug and (processor == "x86_64") and webrender and not fission: ERROR
-    if (os == "linux") and not debug and (processor == "x86_64") and not webrender: ["ERROR", "CRASH", "OK"]
-    if (os == "win") and (processor == "x86") and debug: ["OK", "TIMEOUT"]
-    if (os == "linux") and debug: ERROR
-    if (os == "android") and debug: CRASH
+    if (os == "linux") and not debug and (processor == "x86_64") and not webrender: [ERROR, CRASH, OK]
+    if (os == "win") and (processor == "x86") and debug: [OK, TIMEOUT]
+    if (os == "linux") and debug: OK
+    if (os == "android") and debug: OK
   [not negotiating BUNDLE creates two separate ice and dtls transports]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
     expected:
-      if (processor == "x86") and debug: ["FAIL", "TIMEOUT"]
+      if (processor == "x86") and debug: [FAIL, TIMEOUT]
       FAIL
 
   [bundles on the first transport and closes the second]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
     expected:
-      if (processor == "x86") and debug: ["FAIL", "TIMEOUT", "NOTRUN"]
+      if (processor == "x86") and debug: [FAIL, TIMEOUT, NOTRUN]
       FAIL
 
diff --git a/testing/web-platform/meta/webrtc/protocol/rtp-demuxing.html.ini b/testing/web-platform/meta/webrtc/protocol/rtp-demuxing.html.ini
index 8af586b18efa..5c62c5d046b0 100644
--- a/testing/web-platform/meta/webrtc/protocol/rtp-demuxing.html.ini
+++ b/testing/web-platform/meta/webrtc/protocol/rtp-demuxing.html.ini
@@ -1,4 +1,10 @@
 [rtp-demuxing.html]
+  expected:
+    if (os == "android") and debug and webrender: TIMEOUT
   [Can demux two video tracks with different payload types on a bundled connection]
     expected: FAIL
 
+  [Can demux two video tracks with the same payload type on an unbundled connection]
+    expected:
+      if (os == "android") and debug and webrender: TIMEOUT
+
diff --git a/testing/web-platform/meta/webrtc/receiver-track-live.https.html.ini b/testing/web-platform/meta/webrtc/receiver-track-live.https.html.ini
deleted file mode 100644
index 71e379cdf65c..000000000000
--- a/testing/web-platform/meta/webrtc/receiver-track-live.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[receiver-track-live.https.html]
-  expected:
-    if (os == "android") and debug: CRASH
diff --git a/testing/web-platform/meta/webrtc/simplecall-no-ssrcs.https.html.ini b/testing/web-platform/meta/webrtc/simplecall-no-ssrcs.https.html.ini
index e92b7fee8397..064236ac576f 100644
--- a/testing/web-platform/meta/webrtc/simplecall-no-ssrcs.https.html.ini
+++ b/testing/web-platform/meta/webrtc/simplecall-no-ssrcs.https.html.ini
@@ -1,7 +1,7 @@
 [simplecall-no-ssrcs.https.html]
   expected:
-    if (os == "linux") and not debug and webrender and fission: ["ERROR", "CRASH"]
-    if (os == "linux") and not debug and webrender and not fission: ["ERROR", "CRASH"]
-    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["ERROR", "CRASH", "OK"]
-    if (os == "linux") and debug: ERROR
-    if (os == "android") and debug: CRASH
+    if (os == "linux") and not debug and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and webrender and not fission: [ERROR, CRASH]
+    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [ERROR, CRASH, OK]
+    if (os == "linux") and debug: OK
+    if (os == "android") and debug: OK
diff --git a/testing/web-platform/meta/webrtc/simplecall.https.html.ini b/testing/web-platform/meta/webrtc/simplecall.https.html.ini
index ff87e99947ba..22e15f2b9a53 100644
--- a/testing/web-platform/meta/webrtc/simplecall.https.html.ini
+++ b/testing/web-platform/meta/webrtc/simplecall.https.html.ini
@@ -1,9 +1,9 @@
 [simplecall.https.html]
   expected:
-    if (os == "linux") and webrender and not debug and fission: ["CRASH", "ERROR"]
-    if (os == "linux") and webrender and not debug and not fission: ["ERROR", "CRASH"]
-    if (os == "linux") and webrender and debug and fission: ["ERROR", "CRASH"]
+    if (os == "linux") and webrender and not debug and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and webrender and not debug and not fission: [ERROR, CRASH]
+    if (os == "linux") and webrender and debug and fission: [OK, ERROR, CRASH]
     if (os == "linux") and webrender and debug and not fission: ERROR
-    if (os == "linux") and not webrender and not debug and (processor == "x86_64"): ["ERROR", "CRASH", "OK"]
-    if (os == "linux") and not webrender and debug: ERROR
-    if (os == "android") and debug: CRASH
+    if (os == "linux") and not webrender and not debug and (processor == "x86_64"): [ERROR, CRASH, OK]
+    if (os == "linux") and not webrender and debug: OK
+    if (os == "android") and debug: OK
diff --git a/testing/web-platform/meta/xhr/xhr-timeout-longtask.any.js.ini b/testing/web-platform/meta/xhr/xhr-timeout-longtask.any.js.ini
index ed74274382ee..687233c4a468 100644
--- a/testing/web-platform/meta/xhr/xhr-timeout-longtask.any.js.ini
+++ b/testing/web-platform/meta/xhr/xhr-timeout-longtask.any.js.ini
@@ -1,15 +1,15 @@
 [xhr-timeout-longtask.any.html]
   [Long tasks should not trigger load timeout]
     expected:
-      if os == "mac": ["FAIL", "PASS"]
+      if os == "mac": [FAIL, PASS]
       FAIL
 
 
 [xhr-timeout-longtask.any.worker.html]
   [Long tasks should not trigger load timeout]
     expected:
-      if (os == "linux") and webrender and debug and not fission: ["PASS", "FAIL"]
-      if (os == "mac") and debug: ["FAIL", "PASS"]
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
-      if (os == "linux") and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and webrender and debug and not fission: [PASS, FAIL]
+      if (os == "mac") and debug: [FAIL, PASS]
+      if (os == "mac") and not debug: [PASS, FAIL]
+      if (os == "linux") and not webrender: [PASS, FAIL]