diff --git a/testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-cell-width-s.html.ini b/testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-cell-width-s.html.ini
deleted file mode 100644
index 5392b0121d6b..000000000000
--- a/testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-cell-width-s.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-cell-width-s.html]
-  expected:
-    if os == "win": FAIL
diff --git a/testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-width-s.html.ini b/testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-width-s.html.ini
deleted file mode 100644
index 85f6d236235f..000000000000
--- a/testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-width-s.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-width-s.html]
-  expected:
-    if os == "win": FAIL
diff --git a/testing/web-platform/meta/html/rendering/non-replaced-elements/the-hr-element-0/width.html.ini b/testing/web-platform/meta/html/rendering/non-replaced-elements/the-hr-element-0/width.html.ini
deleted file mode 100644
index 5e82c7d9247d..000000000000
--- a/testing/web-platform/meta/html/rendering/non-replaced-elements/the-hr-element-0/width.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[width.html]
-  expected:
-    if os == "win": FAIL
diff --git a/testing/web-platform/meta/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html.ini b/testing/web-platform/meta/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html.ini
deleted file mode 100644
index 7f29889d8073..000000000000
--- a/testing/web-platform/meta/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[canvas_without_context_a.html]
-  expected:
-    if os == "win": FAIL
diff --git a/testing/web-platform/meta/quirks/historical/list-item-bullet-size.html.ini b/testing/web-platform/meta/quirks/historical/list-item-bullet-size.html.ini
deleted file mode 100644
index ea2177476e78..000000000000
--- a/testing/web-platform/meta/quirks/historical/list-item-bullet-size.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[list-item-bullet-size.html]
-  expected:
-    if os == "win": FAIL
diff --git a/testing/web-platform/meta/svg/painting/reftests/paint-context-001.svg.ini b/testing/web-platform/meta/svg/painting/reftests/paint-context-001.svg.ini
index a779a77c0e5d..89cb1cd3eb89 100644
--- a/testing/web-platform/meta/svg/painting/reftests/paint-context-001.svg.ini
+++ b/testing/web-platform/meta/svg/painting/reftests/paint-context-001.svg.ini
@@ -9,3 +9,7 @@
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/painting/reftests/paint-context-002.svg.ini b/testing/web-platform/meta/svg/painting/reftests/paint-context-002.svg.ini
index 552e6456ebd8..3bdfd5dddd9f 100644
--- a/testing/web-platform/meta/svg/painting/reftests/paint-context-002.svg.ini
+++ b/testing/web-platform/meta/svg/painting/reftests/paint-context-002.svg.ini
@@ -9,3 +9,7 @@
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/painting/reftests/paint-order-001.svg.ini b/testing/web-platform/meta/svg/painting/reftests/paint-order-001.svg.ini
index e82d8b2b9042..5efc8be5d55e 100644
--- a/testing/web-platform/meta/svg/painting/reftests/paint-order-001.svg.ini
+++ b/testing/web-platform/meta/svg/painting/reftests/paint-order-001.svg.ini
@@ -1,3 +1,7 @@
 [paint-order-001.svg]
   expected:
     if os != "win": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/path/bearing/absolute.svg.ini b/testing/web-platform/meta/svg/path/bearing/absolute.svg.ini
index 6c3c16de6019..d40457a51b1b 100644
--- a/testing/web-platform/meta/svg/path/bearing/absolute.svg.ini
+++ b/testing/web-platform/meta/svg/path/bearing/absolute.svg.ini
@@ -7,3 +7,7 @@
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/path/bearing/relative.svg.ini b/testing/web-platform/meta/svg/path/bearing/relative.svg.ini
index e147dd97e1a9..67112d175446 100644
--- a/testing/web-platform/meta/svg/path/bearing/relative.svg.ini
+++ b/testing/web-platform/meta/svg/path/bearing/relative.svg.ini
@@ -7,3 +7,7 @@
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/path/bearing/zero.svg.ini b/testing/web-platform/meta/svg/path/bearing/zero.svg.ini
index 518947563c42..e904b0254208 100644
--- a/testing/web-platform/meta/svg/path/bearing/zero.svg.ini
+++ b/testing/web-platform/meta/svg/path/bearing/zero.svg.ini
@@ -7,3 +7,7 @@
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/path/closepath/segment-completing.svg.ini b/testing/web-platform/meta/svg/path/closepath/segment-completing.svg.ini
index f790471d96e0..436b3fb40dfb 100644
--- a/testing/web-platform/meta/svg/path/closepath/segment-completing.svg.ini
+++ b/testing/web-platform/meta/svg/path/closepath/segment-completing.svg.ini
@@ -7,3 +7,7 @@
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/path/distance/pathLength-zero-percentage.svg.ini b/testing/web-platform/meta/svg/path/distance/pathLength-zero-percentage.svg.ini
index 80ddc7b5477e..88cd9d954e2a 100644
--- a/testing/web-platform/meta/svg/path/distance/pathLength-zero-percentage.svg.ini
+++ b/testing/web-platform/meta/svg/path/distance/pathLength-zero-percentage.svg.ini
@@ -7,3 +7,7 @@
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/path/distance/pathLength-zero.svg.ini b/testing/web-platform/meta/svg/path/distance/pathLength-zero.svg.ini
index 6835f7ee9f3e..3befea53529d 100644
--- a/testing/web-platform/meta/svg/path/distance/pathLength-zero.svg.ini
+++ b/testing/web-platform/meta/svg/path/distance/pathLength-zero.svg.ini
@@ -7,3 +7,7 @@
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/path/property/priority.svg.ini b/testing/web-platform/meta/svg/path/property/priority.svg.ini
index 699abb448f0b..19968ddabb5f 100644
--- a/testing/web-platform/meta/svg/path/property/priority.svg.ini
+++ b/testing/web-platform/meta/svg/path/property/priority.svg.ini
@@ -7,3 +7,7 @@
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/pservers/reftests/radialgradient-basic-002.svg.ini b/testing/web-platform/meta/svg/pservers/reftests/radialgradient-basic-002.svg.ini
new file mode 100644
index 000000000000..726cf5bc0e15
--- /dev/null
+++ b/testing/web-platform/meta/svg/pservers/reftests/radialgradient-basic-002.svg.ini
@@ -0,0 +1,4 @@
+[radialgradient-basic-002.svg]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/svg/rendering/order/z-index.svg.ini b/testing/web-platform/meta/svg/rendering/order/z-index.svg.ini
index c36ce72c5666..3f6119148483 100644
--- a/testing/web-platform/meta/svg/rendering/order/z-index.svg.ini
+++ b/testing/web-platform/meta/svg/rendering/order/z-index.svg.ini
@@ -1,7 +1,2 @@
 [z-index.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/svg/shapes/ellipse-01.svg.ini b/testing/web-platform/meta/svg/shapes/ellipse-01.svg.ini
index c4bdcc4e4237..ba82bd11fc43 100644
--- a/testing/web-platform/meta/svg/shapes/ellipse-01.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-01.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-01.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/shapes/ellipse-02.svg.ini b/testing/web-platform/meta/svg/shapes/ellipse-02.svg.ini
index 41b470ea2529..ed55690cbc1b 100644
--- a/testing/web-platform/meta/svg/shapes/ellipse-02.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-02.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-02.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/shapes/ellipse-03.svg.ini b/testing/web-platform/meta/svg/shapes/ellipse-03.svg.ini
index a8cd27292f2d..ab07519f72db 100644
--- a/testing/web-platform/meta/svg/shapes/ellipse-03.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-03.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-03.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/shapes/ellipse-05.svg.ini b/testing/web-platform/meta/svg/shapes/ellipse-05.svg.ini
index a20bc7333c27..3f39d2b667aa 100644
--- a/testing/web-platform/meta/svg/shapes/ellipse-05.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-05.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-05.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/shapes/ellipse-06.svg.ini b/testing/web-platform/meta/svg/shapes/ellipse-06.svg.ini
index ad5188ea3efd..fa08cf43c33a 100644
--- a/testing/web-platform/meta/svg/shapes/ellipse-06.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-06.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-06.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/shapes/ellipse-07.svg.ini b/testing/web-platform/meta/svg/shapes/ellipse-07.svg.ini
index b66cb507f44c..5632140690ad 100644
--- a/testing/web-platform/meta/svg/shapes/ellipse-07.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-07.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-07.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/shapes/ellipse-08.svg.ini b/testing/web-platform/meta/svg/shapes/ellipse-08.svg.ini
index 7e56a8de37cb..0f73fc05d599 100644
--- a/testing/web-platform/meta/svg/shapes/ellipse-08.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-08.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-08.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/shapes/rect-01.svg.ini b/testing/web-platform/meta/svg/shapes/rect-01.svg.ini
deleted file mode 100644
index 632099d5777c..000000000000
--- a/testing/web-platform/meta/svg/shapes/rect-01.svg.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[rect-01.svg]
-  expected:
-    if os == "win": FAIL
diff --git a/testing/web-platform/meta/svg/shapes/rect-02.svg.ini b/testing/web-platform/meta/svg/shapes/rect-02.svg.ini
deleted file mode 100644
index 46c08f1f0b81..000000000000
--- a/testing/web-platform/meta/svg/shapes/rect-02.svg.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[rect-02.svg]
-  expected:
-    if os == "win": FAIL
diff --git a/testing/web-platform/meta/svg/shapes/rect-03.svg.ini b/testing/web-platform/meta/svg/shapes/rect-03.svg.ini
index efbb4b5f0c01..3e2fad200362 100644
--- a/testing/web-platform/meta/svg/shapes/rect-03.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/rect-03.svg.ini
@@ -2,4 +2,8 @@
   expected:
     if (os == "linux") and not webrender: PASS
     if os == "mac": PASS
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     FAIL
diff --git a/testing/web-platform/meta/svg/shapes/reftests/pathlength-002.svg.ini b/testing/web-platform/meta/svg/shapes/reftests/pathlength-002.svg.ini
index 4abbd184ca7a..6b9f5747a895 100644
--- a/testing/web-platform/meta/svg/shapes/reftests/pathlength-002.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/reftests/pathlength-002.svg.ini
@@ -2,3 +2,7 @@
   expected:
     if os == "linux": FAIL
     if os == "mac": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/shapes/reftests/pathlength-003.svg.ini b/testing/web-platform/meta/svg/shapes/reftests/pathlength-003.svg.ini
index cab709a49c29..a817e95b670d 100644
--- a/testing/web-platform/meta/svg/shapes/reftests/pathlength-003.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/reftests/pathlength-003.svg.ini
@@ -2,3 +2,7 @@
   expected:
     if os == "linux": FAIL
     if os == "mac": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-complex-001.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-complex-001.svg.ini
index 441ab11ed69e..a0e996c90d5a 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-complex-001.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-complex-001.svg.ini
@@ -1,3 +1,7 @@
 [text-complex-001.svg]
   expected:
     if os != "win": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-complex-002.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-complex-002.svg.ini
index b3e48bd38848..c28855c0210c 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-complex-002.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-complex-002.svg.ini
@@ -1,3 +1,7 @@
 [text-complex-002.svg]
   expected:
     if os != "win": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-inline-size-001.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-inline-size-001.svg.ini
index dfe33d068342..656bbe26c041 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-001.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-001.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-001.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-inline-size-002.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-inline-size-002.svg.ini
index c3a0fc638d23..7fa725e59258 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-002.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-002.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-002.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-inline-size-003.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-inline-size-003.svg.ini
index cd375750ce32..9aee6b56cf6e 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-003.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-003.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-003.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-inline-size-005.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-inline-size-005.svg.ini
index dba621366f39..00f5c0e1a44d 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-005.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-005.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-005.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-inline-size-006.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-inline-size-006.svg.ini
index 82f8e9ae5bc2..8d3745b46f60 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-006.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-006.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-006.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-inline-size-007.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-inline-size-007.svg.ini
index ca2c122c21fd..ebdef77df4f1 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-007.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-007.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-007.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-inline-size-101.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-inline-size-101.svg.ini
index b5eb58a96cad..8888929110b6 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-101.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-101.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-101.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-inline-size-201.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-inline-size-201.svg.ini
index ef70bfb87d64..dee2101967fc 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-201.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-201.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-201.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-multiline-001.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-multiline-001.svg.ini
index 01a4007ac49d..5053fcefd4d3 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-multiline-001.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-multiline-001.svg.ini
@@ -1,7 +1,2 @@
 [text-multiline-001.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-multiline-002.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-multiline-002.svg.ini
index 17f80be6c890..b3afa0f3fd9c 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-multiline-002.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-multiline-002.svg.ini
@@ -1,7 +1,2 @@
 [text-multiline-002.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-multiline-003.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-multiline-003.svg.ini
index 3fe920cf0ae5..d0e37b913888 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-multiline-003.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-multiline-003.svg.ini
@@ -1,7 +1,2 @@
 [text-multiline-003.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-shape-inside-001.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-shape-inside-001.svg.ini
index 10af35a19efc..db30748977ec 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-shape-inside-001.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-shape-inside-001.svg.ini
@@ -1,3 +1,7 @@
 [text-shape-inside-001.svg]
   expected:
     if os != "win": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/text-shape-inside-002.svg.ini b/testing/web-platform/meta/svg/text/reftests/text-shape-inside-002.svg.ini
index c51b3c84edf4..a497721ba597 100644
--- a/testing/web-platform/meta/svg/text/reftests/text-shape-inside-002.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-shape-inside-002.svg.ini
@@ -1,3 +1,7 @@
 [text-shape-inside-002.svg]
   expected:
     if os != "win": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/textpath-shape-001.svg.ini b/testing/web-platform/meta/svg/text/reftests/textpath-shape-001.svg.ini
index c4d845d33f5d..864eba73aa49 100644
--- a/testing/web-platform/meta/svg/text/reftests/textpath-shape-001.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/textpath-shape-001.svg.ini
@@ -2,3 +2,7 @@
   expected:
     if os == "linux": FAIL
     if os == "mac": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/svg/text/reftests/textpath-side-001.svg.ini b/testing/web-platform/meta/svg/text/reftests/textpath-side-001.svg.ini
index 8b6e5edc3820..d994c2042d65 100644
--- a/testing/web-platform/meta/svg/text/reftests/textpath-side-001.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/textpath-side-001.svg.ini
@@ -2,3 +2,7 @@
   expected:
     if os == "linux": FAIL
     if os == "mac": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/wptcommandline.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/wptcommandline.py
index 56f2c36769ba..d6d905a24a5a 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -259,7 +259,7 @@ scheme host and port.""")
     gecko_group.add_argument("--stylo-threads", action="store", type=int, default=1,
                              help="Number of parallel threads to use for stylo")
     gecko_group.add_argument("--reftest-internal", dest="reftest_internal", action="store_true",
-                             default=None, help="Enable reftest runner implemented inside Marionette")
+                             default=True, help="Enable reftest runner implemented inside Marionette")
     gecko_group.add_argument("--reftest-external", dest="reftest_internal", action="store_false",
                              help="Disable reftest runner implemented inside Marionette")
     gecko_group.add_argument("--reftest-screenshot", dest="reftest_screenshot", action="store",
@@ -512,10 +512,6 @@ def check_args(kwargs):
         kwargs['extra_prefs'] = [tuple(prefarg.split('=', 1)) for prefarg in
                                  kwargs['extra_prefs']]
 
-    if kwargs["reftest_internal"] is None:
-        # Default to the internal reftest implementation on Linux and OSX
-        kwargs["reftest_internal"] = sys.platform.startswith("linux") or sys.platform.startswith("darwin")
-
     return kwargs