diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 998883210cd..6ba0f9387ea 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -95150,10 +95150,6 @@
       [
        "/css/CSS2/text/text-indent-wrap-001-ref-inline-margin.xht",
        "=="
-      ],
-      [
-       "/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht",
-       "!="
       ]
      ],
      {}
@@ -107779,6 +107775,30 @@
      {}
     ]
    ],
+   "css/css-backgrounds/border-bottom-left-radius-004.xht": [
+    [
+     "/css/css-backgrounds/border-bottom-left-radius-004.xht",
+     [
+      [
+       "/css/css-backgrounds/border-bottom-left-radius-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-backgrounds/border-bottom-left-radius-005.xht": [
+    [
+     "/css/css-backgrounds/border-bottom-left-radius-005.xht",
+     [
+      [
+       "/css/css-backgrounds/border-bottom-left-radius-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-backgrounds/border-bottom-left-radius-010.xht": [
     [
      "/css/css-backgrounds/border-bottom-left-radius-010.xht",
@@ -107827,6 +107847,30 @@
      {}
     ]
    ],
+   "css/css-backgrounds/border-bottom-right-radius-004.xht": [
+    [
+     "/css/css-backgrounds/border-bottom-right-radius-004.xht",
+     [
+      [
+       "/css/css-backgrounds/border-bottom-right-radius-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-backgrounds/border-bottom-right-radius-005.xht": [
+    [
+     "/css/css-backgrounds/border-bottom-right-radius-005.xht",
+     [
+      [
+       "/css/css-backgrounds/border-bottom-right-radius-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-backgrounds/border-bottom-right-radius-010.xht": [
     [
      "/css/css-backgrounds/border-bottom-right-radius-010.xht",
@@ -107911,24 +107955,12 @@
      {}
     ]
    ],
-   "css/css-backgrounds/border-image-5.html": [
-    [
-     "/css/css-backgrounds/border-image-5.html",
-     [
-      [
-       "/css/css-backgrounds/support/reftest-border-image-5.png",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-backgrounds/border-image-6.html": [
     [
      "/css/css-backgrounds/border-image-6.html",
      [
       [
-       "/css/css-backgrounds/support/reftest-border-image-5.png",
+       "/css/css-backgrounds/border-image-6-ref.html",
        "=="
       ]
      ],
@@ -108283,6 +108315,30 @@
      {}
     ]
    ],
+   "css/css-backgrounds/border-top-left-radius-004.xht": [
+    [
+     "/css/css-backgrounds/border-top-left-radius-004.xht",
+     [
+      [
+       "/css/css-backgrounds/border-top-left-radius-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-backgrounds/border-top-left-radius-005.xht": [
+    [
+     "/css/css-backgrounds/border-top-left-radius-005.xht",
+     [
+      [
+       "/css/css-backgrounds/border-top-left-radius-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-backgrounds/border-top-left-radius-010.xht": [
     [
      "/css/css-backgrounds/border-top-left-radius-010.xht",
@@ -108331,6 +108387,30 @@
      {}
     ]
    ],
+   "css/css-backgrounds/border-top-right-radius-004.xht": [
+    [
+     "/css/css-backgrounds/border-top-right-radius-004.xht",
+     [
+      [
+       "/css/css-backgrounds/border-top-right-radius-004-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-backgrounds/border-top-right-radius-005.xht": [
+    [
+     "/css/css-backgrounds/border-top-right-radius-005.xht",
+     [
+      [
+       "/css/css-backgrounds/border-top-right-radius-005-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-backgrounds/border-top-right-radius-010.xht": [
     [
      "/css/css-backgrounds/border-top-right-radius-010.xht",
@@ -116731,6 +116811,18 @@
      {}
     ]
    ],
+   "css/css-flexbox/flex-wrap-004.html": [
+    [
+     "/css/css-flexbox/flex-wrap-004.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-flexbox/flexbox-flex-direction-column-reverse.htm": [
     [
      "/css/css-flexbox/flexbox-flex-direction-column-reverse.htm",
@@ -124640,7 +124732,7 @@
      "/css/css-images/multiple-position-color-stop-conic.html",
      [
       [
-       "/css/css-images/support/100x100-blue-green.html",
+       "/css/css-images/reference/100x100-blue-green.html",
        "=="
       ]
      ],
@@ -124664,7 +124756,7 @@
      "/css/css-images/multiple-position-color-stop-linear.html",
      [
       [
-       "/css/css-images/support/100x100-blue-green.html",
+       "/css/css-images/reference/100x100-blue-green.html",
        "=="
       ]
      ],
@@ -124688,7 +124780,7 @@
      "/css/css-images/multiple-position-color-stop-radial.html",
      [
       [
-       "/css/css-images/support/100x100-blue-green.html",
+       "/css/css-images/reference/100x100-blue-green.html",
        "=="
       ]
      ],
@@ -130484,7 +130576,7 @@
      "/css/css-namespaces/prefix-001.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-1.xml",
+       "/css/css-namespaces/reference/ref-lime-1.xml",
        "=="
       ]
      ],
@@ -130496,7 +130588,7 @@
      "/css/css-namespaces/prefix-002.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-1.xml",
+       "/css/css-namespaces/reference/ref-lime-1.xml",
        "=="
       ]
      ],
@@ -130508,7 +130600,7 @@
      "/css/css-namespaces/prefix-003.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-1-generic.xml",
+       "/css/css-namespaces/reference/ref-lime-1-generic.xml",
        "=="
       ]
      ],
@@ -130520,7 +130612,7 @@
      "/css/css-namespaces/prefix-004.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-2-generic.xml",
+       "/css/css-namespaces/reference/ref-lime-2-generic.xml",
        "=="
       ]
      ],
@@ -130532,7 +130624,7 @@
      "/css/css-namespaces/prefix-005.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-2-generic.xml",
+       "/css/css-namespaces/reference/ref-lime-2-generic.xml",
        "=="
       ]
      ],
@@ -130544,7 +130636,7 @@
      "/css/css-namespaces/prefix-006.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-2.xml",
+       "/css/css-namespaces/reference/ref-lime-2.xml",
        "=="
       ]
      ],
@@ -130556,7 +130648,7 @@
      "/css/css-namespaces/scope-001.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-1.xml",
+       "/css/css-namespaces/reference/ref-lime-1.xml",
        "=="
       ]
      ],
@@ -130568,7 +130660,7 @@
      "/css/css-namespaces/scope-002.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-1.xml",
+       "/css/css-namespaces/reference/ref-lime-1.xml",
        "=="
       ]
      ],
@@ -130580,7 +130672,7 @@
      "/css/css-namespaces/syntax-001.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-1-block.xml",
+       "/css/css-namespaces/reference/ref-lime-1-block.xml",
        "=="
       ]
      ],
@@ -130592,7 +130684,7 @@
      "/css/css-namespaces/syntax-002.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-1-block.xml",
+       "/css/css-namespaces/reference/ref-lime-1-block.xml",
        "=="
       ]
      ],
@@ -130604,7 +130696,7 @@
      "/css/css-namespaces/syntax-003.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-5.xml",
+       "/css/css-namespaces/reference/ref-lime-5.xml",
        "=="
       ]
      ],
@@ -130616,7 +130708,7 @@
      "/css/css-namespaces/syntax-004.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-1.xml",
+       "/css/css-namespaces/reference/ref-lime-1.xml",
        "=="
       ]
      ],
@@ -130628,7 +130720,7 @@
      "/css/css-namespaces/syntax-005.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-5.xml",
+       "/css/css-namespaces/reference/ref-lime-5.xml",
        "=="
       ]
      ],
@@ -130640,7 +130732,7 @@
      "/css/css-namespaces/syntax-006.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-1.xml",
+       "/css/css-namespaces/reference/ref-lime-1.xml",
        "=="
       ]
      ],
@@ -130652,7 +130744,7 @@
      "/css/css-namespaces/syntax-007.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-1.xml",
+       "/css/css-namespaces/reference/ref-lime-1.xml",
        "=="
       ]
      ],
@@ -130664,7 +130756,7 @@
      "/css/css-namespaces/syntax-008.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-2.xml",
+       "/css/css-namespaces/reference/ref-lime-2.xml",
        "=="
       ]
      ],
@@ -130676,7 +130768,7 @@
      "/css/css-namespaces/syntax-009.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-1.xml",
+       "/css/css-namespaces/reference/ref-lime-1.xml",
        "=="
       ]
      ],
@@ -130688,7 +130780,7 @@
      "/css/css-namespaces/syntax-010.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-3.xml",
+       "/css/css-namespaces/reference/ref-lime-3.xml",
        "=="
       ]
      ],
@@ -130700,7 +130792,7 @@
      "/css/css-namespaces/syntax-011.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-6.xml",
+       "/css/css-namespaces/reference/ref-lime-6.xml",
        "=="
       ]
      ],
@@ -130712,7 +130804,7 @@
      "/css/css-namespaces/syntax-012.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-3.xml",
+       "/css/css-namespaces/reference/ref-lime-3.xml",
        "=="
       ]
      ],
@@ -130724,7 +130816,7 @@
      "/css/css-namespaces/syntax-013.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-5.xml",
+       "/css/css-namespaces/reference/ref-lime-5.xml",
        "=="
       ]
      ],
@@ -130736,7 +130828,7 @@
      "/css/css-namespaces/syntax-014.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-3.xml",
+       "/css/css-namespaces/reference/ref-lime-3.xml",
        "=="
       ]
      ],
@@ -130748,7 +130840,7 @@
      "/css/css-namespaces/syntax-015.xml",
      [
       [
-       "/css/css-namespaces/reftest/ref-lime-1.xml",
+       "/css/css-namespaces/reference/ref-lime-1.xml",
        "=="
       ]
      ],
@@ -144579,6 +144671,18 @@
      {}
     ]
    ],
+   "css/css-text/white-space/white-space-wrap-after-nowrap-001.html": [
+    [
+     "/css/css-text/white-space/white-space-wrap-after-nowrap-001.html",
+     [
+      [
+       "/css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-text/word-break/word-break-break-all-000.html": [
     [
      "/css/css-text/word-break/word-break-break-all-000.html",
@@ -150980,7 +151084,7 @@
      "/css/css-transforms/transform-3d-rotateY-stair-above-001.xht",
      [
       [
-       "/css/css-transforms/reftest/transform-3d-rotateY-stair-above-ref-001.xht",
+       "/css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht",
        "=="
       ]
      ],
@@ -150992,7 +151096,7 @@
      "/css/css-transforms/transform-3d-rotateY-stair-below-001.xht",
      [
       [
-       "/css/css-transforms/reftest/transform-3d-rotateY-stair-above-ref-001.xht",
+       "/css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht",
        "=="
       ]
      ],
@@ -151088,7 +151192,7 @@
      "/css/css-transforms/transform-applies-to-001.xht",
      [
       [
-       "/css/css-transforms/reftest/transform-applies-to-001-ref.xht",
+       "/css/css-transforms/reference/transform-applies-to-001-ref.xht",
        "=="
       ]
      ],
@@ -151100,7 +151204,7 @@
      "/css/css-transforms/transform-applies-to-002.xht",
      [
       [
-       "/css/css-transforms/reftest/transform-applies-to-002-ref.xht",
+       "/css/css-transforms/reference/transform-applies-to-002-ref.xht",
        "=="
       ]
      ],
@@ -151212,7 +151316,7 @@
      "/css/css-transforms/transform-box/fill-box-mutation.html",
      [
       [
-       "/css/css-transforms/transform-box/support/greensquare200x200.html",
+       "/css/css-transforms/transform-box/reference/greensquare200x200.html",
        "=="
       ]
      ],
@@ -151224,7 +151328,7 @@
      "/css/css-transforms/transform-box/fill-box.html",
      [
       [
-       "/css/css-transforms/transform-box/support/greensquare200x200.html",
+       "/css/css-transforms/transform-box/reference/greensquare200x200.html",
        "=="
       ]
      ],
@@ -151236,7 +151340,7 @@
      "/css/css-transforms/transform-box/value-changed.html",
      [
       [
-       "/css/css-transforms/transform-box/support/greensquare200x200.html",
+       "/css/css-transforms/transform-box/reference/greensquare200x200.html",
        "=="
       ]
      ],
@@ -151248,7 +151352,7 @@
      "/css/css-transforms/transform-box/view-box-mutation.html",
      [
       [
-       "/css/css-transforms/transform-box/support/greensquare200x200.html",
+       "/css/css-transforms/transform-box/reference/greensquare200x200.html",
        "=="
       ]
      ],
@@ -151260,7 +151364,7 @@
      "/css/css-transforms/transform-box/view-box-nested.html",
      [
       [
-       "/css/css-transforms/transform-box/support/greensquare200x200.html",
+       "/css/css-transforms/transform-box/reference/greensquare200x200.html",
        "=="
       ]
      ],
@@ -151272,7 +151376,7 @@
      "/css/css-transforms/transform-box/view-box-viewbox-nested.html",
      [
       [
-       "/css/css-transforms/transform-box/support/greensquare200x200.html",
+       "/css/css-transforms/transform-box/reference/greensquare200x200.html",
        "=="
       ]
      ],
@@ -151284,7 +151388,7 @@
      "/css/css-transforms/transform-box/view-box-viewbox.html",
      [
       [
-       "/css/css-transforms/transform-box/support/greensquare200x200.html",
+       "/css/css-transforms/transform-box/reference/greensquare200x200.html",
        "=="
       ]
      ],
@@ -151296,7 +151400,7 @@
      "/css/css-transforms/transform-box/view-box.html",
      [
       [
-       "/css/css-transforms/transform-box/support/greensquare200x200.html",
+       "/css/css-transforms/transform-box/reference/greensquare200x200.html",
        "=="
       ]
      ],
@@ -152184,7 +152288,7 @@
      "/css/css-transforms/transform-origin-01.html",
      [
       [
-       "/css/css-transforms/reftest/transform-origin-01-ref.html",
+       "/css/css-transforms/reference/transform-origin-01-ref.html",
        "=="
       ]
      ],
@@ -154714,18 +154818,6 @@
       [
        "/css/css-transforms/transform3d-perspective-origin-ref.html",
        "=="
-      ],
-      [
-       "/css/css-transforms/transform3d-rotatex-perspective-001.html",
-       "!="
-      ],
-      [
-       "/css/css-transforms/transform3d-rotatex-ref.html",
-       "!="
-      ],
-      [
-       "/css/css-transforms/transform-lime-square-ref.html",
-       "!="
       ]
      ],
      {}
@@ -154894,10 +154986,6 @@
       [
        "/css/css-transforms/transform3d-rotatex-ref.html",
        "=="
-      ],
-      [
-       "/css/css-transforms/transform-lime-square-ref.html",
-       "!="
       ]
      ],
      {}
@@ -154926,9 +155014,17 @@
       [
        "/css/css-transforms/transform3d-rotatex-ref.html",
        "=="
-      ],
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-transforms/transform3d-rotatex-perspective-001.html": [
+    [
+     "/css/css-transforms/transform3d-rotatex-perspective-001.html",
+     [
       [
-       "/css/css-transforms/transform-lime-square-ref.html",
+       "/css/css-transforms/transform3d-rotatex-ref.html",
        "!="
       ]
      ],
@@ -154942,10 +155038,6 @@
       [
        "/css/css-transforms/transform3d-rotatex-ref.html",
        "!="
-      ],
-      [
-       "/css/css-transforms/transform-lime-square-ref.html",
-       "!="
       ]
      ],
      {}
@@ -171212,7 +171304,7 @@
      "/css/css-writing-modes/writing-mode-vertical-lr-002.xht",
      [
       [
-       "/css/css-writing-modes/reftest/writing-mode-vertical-lr-002-ref.xht",
+       "/css/css-writing-modes/reference/writing-mode-vertical-lr-002-ref.xht",
        "=="
       ]
      ],
@@ -171224,7 +171316,7 @@
      "/css/css-writing-modes/writing-mode-vertical-rl-001.xht",
      [
       [
-       "/css/css-writing-modes/reftest/writing-mode-vertical-rl-001-ref.xht",
+       "/css/css-writing-modes/reference/writing-mode-vertical-rl-001-ref.xht",
        "=="
       ]
      ],
@@ -171236,7 +171328,7 @@
      "/css/css-writing-modes/writing-mode-vertical-rl-002.xht",
      [
       [
-       "/css/css-writing-modes/reftest/writing-mode-vertical-rl-002-ref.xht",
+       "/css/css-writing-modes/reference/writing-mode-vertical-rl-002-ref.xht",
        "=="
       ]
      ],
@@ -195240,7 +195332,7 @@
      "/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg",
      [
       [
-       "/svg/embedded/support/green-rect-100x100.svg",
+       "/svg/embedded/reference/green-rect-100x100.svg",
        "=="
       ]
      ],
@@ -195252,7 +195344,7 @@
      "/svg/embedded/image-embedding-svg-with-viewport-units.svg",
      [
       [
-       "/svg/embedded/support/green-rect-100x100.svg",
+       "/svg/embedded/reference/green-rect-100x100.svg",
        "=="
       ]
      ],
@@ -196224,7 +196316,7 @@
      "/svg/shapes/reftests/disabled-shapes-01.svg",
      [
       [
-       "/svg/shapes/reftests/support/empty.svg",
+       "/svg/shapes/reftests/reference/empty.svg",
        "=="
       ]
      ],
@@ -199893,13 +199985,25 @@
      {}
     ]
    ],
+   "css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht": [
+    [
+     "/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht",
+     [
+      [
+       "/css/CSS2/text/text-indent-wrap-001-ref-inline-margin.xht",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/text/text-indent-wrap-001-ref-float.xht": [
     [
      "/css/CSS2/text/text-indent-wrap-001-ref-float.xht",
      [
       [
-       "/css/CSS2/text/text-indent-wrap-001-ref-inline-margin.xht",
-       "=="
+       "/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht",
+       "!="
       ]
      ],
      {}
@@ -199917,294 +200021,6 @@
      {}
     ]
    ],
-   "css/css-backgrounds/border-bottom-left-radius-003.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-left-radius-003.xht",
-     [
-      [
-       "/css/css-backgrounds/border-bottom-left-radius-004.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-bottom-left-radius-004.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-left-radius-004.xht",
-     [
-      [
-       "/css/css-backgrounds/border-bottom-left-radius-003.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-bottom-left-radius-005.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-left-radius-005.xht",
-     [
-      [
-       "/css/css-backgrounds/border-bottom-left-radius-006.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-bottom-left-radius-006.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-left-radius-006.xht",
-     [
-      [
-       "/css/css-backgrounds/border-bottom-left-radius-005.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-bottom-left-radius-007.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-left-radius-007.xht",
-     [
-      [
-       "/css/css-backgrounds/border-bottom-left-radius-009.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-bottom-left-radius-009.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-left-radius-009.xht",
-     [
-      [
-       "/css/css-backgrounds/border-bottom-left-radius-007.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-bottom-right-radius-003.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-right-radius-003.xht",
-     [
-      [
-       "/css/css-backgrounds/border-bottom-right-radius-004.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-bottom-right-radius-004.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-right-radius-004.xht",
-     [
-      [
-       "/css/css-backgrounds/border-bottom-right-radius-003.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-bottom-right-radius-005.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-right-radius-005.xht",
-     [
-      [
-       "/css/css-backgrounds/border-bottom-right-radius-006.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-bottom-right-radius-006.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-right-radius-006.xht",
-     [
-      [
-       "/css/css-backgrounds/border-bottom-right-radius-005.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-bottom-right-radius-007.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-right-radius-007.xht",
-     [
-      [
-       "/css/css-backgrounds/border-bottom-right-radius-009.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-bottom-right-radius-009.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-right-radius-009.xht",
-     [
-      [
-       "/css/css-backgrounds/border-bottom-right-radius-007.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-top-left-radius-003.xht": [
-    [
-     "/css/css-backgrounds/border-top-left-radius-003.xht",
-     [
-      [
-       "/css/css-backgrounds/border-top-left-radius-004.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-top-left-radius-004.xht": [
-    [
-     "/css/css-backgrounds/border-top-left-radius-004.xht",
-     [
-      [
-       "/css/css-backgrounds/border-top-left-radius-003.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-top-left-radius-005.xht": [
-    [
-     "/css/css-backgrounds/border-top-left-radius-005.xht",
-     [
-      [
-       "/css/css-backgrounds/border-top-left-radius-006.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-top-left-radius-006.xht": [
-    [
-     "/css/css-backgrounds/border-top-left-radius-006.xht",
-     [
-      [
-       "/css/css-backgrounds/border-top-left-radius-005.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-top-left-radius-007.xht": [
-    [
-     "/css/css-backgrounds/border-top-left-radius-007.xht",
-     [
-      [
-       "/css/css-backgrounds/border-top-left-radius-009.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-top-left-radius-009.xht": [
-    [
-     "/css/css-backgrounds/border-top-left-radius-009.xht",
-     [
-      [
-       "/css/css-backgrounds/border-top-left-radius-007.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-top-right-radius-003.xht": [
-    [
-     "/css/css-backgrounds/border-top-right-radius-003.xht",
-     [
-      [
-       "/css/css-backgrounds/border-top-right-radius-004.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-top-right-radius-004.xht": [
-    [
-     "/css/css-backgrounds/border-top-right-radius-004.xht",
-     [
-      [
-       "/css/css-backgrounds/border-top-right-radius-003.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-top-right-radius-005.xht": [
-    [
-     "/css/css-backgrounds/border-top-right-radius-005.xht",
-     [
-      [
-       "/css/css-backgrounds/border-top-right-radius-006.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-top-right-radius-006.xht": [
-    [
-     "/css/css-backgrounds/border-top-right-radius-006.xht",
-     [
-      [
-       "/css/css-backgrounds/border-top-right-radius-005.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-top-right-radius-007.xht": [
-    [
-     "/css/css-backgrounds/border-top-right-radius-007.xht",
-     [
-      [
-       "/css/css-backgrounds/border-top-right-radius-009.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "css/css-backgrounds/border-top-right-radius-009.xht": [
-    [
-     "/css/css-backgrounds/border-top-right-radius-009.xht",
-     [
-      [
-       "/css/css-backgrounds/border-top-right-radius-007.xht",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-transforms/2d-rotate-notref.html": [
     [
      "/css/css-transforms/2d-rotate-notref.html",
@@ -200229,9 +200045,9 @@
      {}
     ]
    ],
-   "css/css-transforms/transform3d-rotatex-perspective-001.html": [
+   "css/css-transforms/transform3d-perspective-origin-ref.html": [
     [
-     "/css/css-transforms/transform3d-rotatex-perspective-001.html",
+     "/css/css-transforms/transform3d-perspective-origin-ref.html",
      [
       [
        "/css/css-transforms/transform3d-rotatex-ref.html",
@@ -202458,6 +202274,11 @@
      {}
     ]
    ],
+   "WebIDL/ecmascript-binding/constructors-support.html": [
+    [
+     {}
+    ]
+   ],
    "WebIDL/invalid/idl/enum.widl": [
     [
      {}
@@ -249543,11 +249364,6 @@
      {}
     ]
    ],
-   "css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht": [
-    [
-     {}
-    ]
-   ],
    "css/CSS2/text/text-transform-capitalize-001-ref.xht": [
     [
      {}
@@ -254658,6 +254474,31 @@
      {}
     ]
    ],
+   "css/css-backgrounds/border-bottom-left-radius-004-ref.xht": [
+    [
+     {}
+    ]
+   ],
+   "css/css-backgrounds/border-bottom-left-radius-005-ref.xht": [
+    [
+     {}
+    ]
+   ],
+   "css/css-backgrounds/border-bottom-right-radius-004-ref.xht": [
+    [
+     {}
+    ]
+   ],
+   "css/css-backgrounds/border-bottom-right-radius-005-ref.xht": [
+    [
+     {}
+    ]
+   ],
+   "css/css-backgrounds/border-image-6-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-backgrounds/border-image-calc-ref.html": [
     [
      {}
@@ -254728,6 +254569,26 @@
      {}
     ]
    ],
+   "css/css-backgrounds/border-top-left-radius-004-ref.xht": [
+    [
+     {}
+    ]
+   ],
+   "css/css-backgrounds/border-top-left-radius-005-ref.xht": [
+    [
+     {}
+    ]
+   ],
+   "css/css-backgrounds/border-top-right-radius-004-ref.xht": [
+    [
+     {}
+    ]
+   ],
+   "css/css-backgrounds/border-top-right-radius-005-ref.xht": [
+    [
+     {}
+    ]
+   ],
    "css/css-backgrounds/box-shadow/support/box-shadow-blur-definition-001-dark-bound.png": [
     [
      {}
@@ -255348,11 +255209,6 @@
      {}
     ]
    ],
-   "css/css-backgrounds/support/reftest-border-image-5.png": [
-    [
-     {}
-    ]
-   ],
    "css/css-backgrounds/support/ruler-h-50%.png": [
     [
      {}
@@ -266863,7 +266719,7 @@
      {}
     ]
    ],
-   "css/css-images/support/100x100-blue-green.html": [
+   "css/css-images/reference/100x100-blue-green.html": [
     [
      {}
     ]
@@ -268513,42 +268369,42 @@
      {}
     ]
    ],
-   "css/css-namespaces/reftest/ref-lime-1-block.xml": [
+   "css/css-namespaces/reference/ref-lime-1-block.xml": [
     [
      {}
     ]
    ],
-   "css/css-namespaces/reftest/ref-lime-1-generic.xml": [
+   "css/css-namespaces/reference/ref-lime-1-generic.xml": [
     [
      {}
     ]
    ],
-   "css/css-namespaces/reftest/ref-lime-1.xml": [
+   "css/css-namespaces/reference/ref-lime-1.xml": [
     [
      {}
     ]
    ],
-   "css/css-namespaces/reftest/ref-lime-2-generic.xml": [
+   "css/css-namespaces/reference/ref-lime-2-generic.xml": [
     [
      {}
     ]
    ],
-   "css/css-namespaces/reftest/ref-lime-2.xml": [
+   "css/css-namespaces/reference/ref-lime-2.xml": [
     [
      {}
     ]
    ],
-   "css/css-namespaces/reftest/ref-lime-3.xml": [
+   "css/css-namespaces/reference/ref-lime-3.xml": [
     [
      {}
     ]
    ],
-   "css/css-namespaces/reftest/ref-lime-5.xml": [
+   "css/css-namespaces/reference/ref-lime-5.xml": [
     [
      {}
     ]
    ],
-   "css/css-namespaces/reftest/ref-lime-6.xml": [
+   "css/css-namespaces/reference/ref-lime-6.xml": [
     [
      {}
     ]
@@ -273878,6 +273734,11 @@
      {}
     ]
    ],
+   "css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-text/word-break/reference/word-break-break-all-010-ref.html": [
     [
      {}
@@ -274323,6 +274184,26 @@
      {}
     ]
    ],
+   "css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht": [
+    [
+     {}
+    ]
+   ],
+   "css/css-transforms/reference/transform-applies-to-001-ref.xht": [
+    [
+     {}
+    ]
+   ],
+   "css/css-transforms/reference/transform-applies-to-002-ref.xht": [
+    [
+     {}
+    ]
+   ],
+   "css/css-transforms/reference/transform-origin-01-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-transforms/reference/transform-origin-ref.html": [
     [
      {}
@@ -274418,26 +274299,6 @@
      {}
     ]
    ],
-   "css/css-transforms/reftest/transform-3d-rotateY-stair-above-ref-001.xht": [
-    [
-     {}
-    ]
-   ],
-   "css/css-transforms/reftest/transform-applies-to-001-ref.xht": [
-    [
-     {}
-    ]
-   ],
-   "css/css-transforms/reftest/transform-applies-to-002-ref.xht": [
-    [
-     {}
-    ]
-   ],
-   "css/css-transforms/reftest/transform-origin-01-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/css-transforms/rotate/reference/svg-rotate-3args-ref.html": [
     [
      {}
@@ -274763,7 +274624,7 @@
      {}
     ]
    ],
-   "css/css-transforms/transform-box/support/greensquare200x200.html": [
+   "css/css-transforms/transform-box/reference/greensquare200x200.html": [
     [
      {}
     ]
@@ -275363,11 +275224,6 @@
      {}
     ]
    ],
-   "css/css-transforms/transform3d-perspective-origin-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/css-transforms/transform3d-preserve3d-001-ref.html": [
     [
      {}
@@ -278738,17 +278594,17 @@
      {}
     ]
    ],
-   "css/css-writing-modes/reftest/writing-mode-vertical-lr-002-ref.xht": [
+   "css/css-writing-modes/reference/writing-mode-vertical-lr-002-ref.xht": [
     [
      {}
     ]
    ],
-   "css/css-writing-modes/reftest/writing-mode-vertical-rl-001-ref.xht": [
+   "css/css-writing-modes/reference/writing-mode-vertical-rl-001-ref.xht": [
     [
      {}
     ]
    ],
-   "css/css-writing-modes/reftest/writing-mode-vertical-rl-002-ref.xht": [
+   "css/css-writing-modes/reference/writing-mode-vertical-rl-002-ref.xht": [
     [
      {}
     ]
@@ -314778,7 +314634,7 @@
      {}
     ]
    ],
-   "svg/embedded/support/green-rect-100x100.svg": [
+   "svg/embedded/reference/green-rect-100x100.svg": [
     [
      {}
     ]
@@ -315323,7 +315179,7 @@
      {}
     ]
    ],
-   "svg/shapes/reftests/support/empty.svg": [
+   "svg/shapes/reftests/reference/empty.svg": [
     [
      {}
     ]
@@ -324498,6 +324354,11 @@
      {}
     ]
    ],
+   "webdriver/tests/support/authentication.py": [
+    [
+     {}
+    ]
+   ],
    "webdriver/tests/support/defaults.py": [
     [
      {}
@@ -337061,6 +336922,12 @@
      {}
     ]
    ],
+   "WebIDL/ecmascript-binding/constructors.html": [
+    [
+     "/WebIDL/ecmascript-binding/constructors.html",
+     {}
+    ]
+   ],
    "WebIDL/ecmascript-binding/default-iterator-object.html": [
     [
      "/WebIDL/ecmascript-binding/default-iterator-object.html",
@@ -420167,6 +420034,12 @@
      {}
     ]
    ],
+   "web-animations/interfaces/Animation/style-change-events.html": [
+    [
+     "/web-animations/interfaces/Animation/style-change-events.html",
+     {}
+    ]
+   ],
    "web-animations/interfaces/AnimationEffect/getComputedTiming.html": [
     [
      "/web-animations/interfaces/AnimationEffect/getComputedTiming.html",
@@ -420215,6 +420088,12 @@
      {}
     ]
    ],
+   "web-animations/interfaces/DocumentTimeline/style-change-events.html": [
+    [
+     "/web-animations/interfaces/DocumentTimeline/style-change-events.html",
+     {}
+    ]
+   ],
    "web-animations/interfaces/KeyframeEffect/composite.html": [
     [
      "/web-animations/interfaces/KeyframeEffect/composite.html",
@@ -420263,6 +420142,12 @@
      {}
     ]
    ],
+   "web-animations/interfaces/KeyframeEffect/style-change-events.html": [
+    [
+     "/web-animations/interfaces/KeyframeEffect/style-change-events.html",
+     {}
+    ]
+   ],
    "web-animations/interfaces/KeyframeEffect/target.html": [
     [
      "/web-animations/interfaces/KeyframeEffect/target.html",
@@ -423092,7 +422977,9 @@
    "webrtc/RTCPeerConnection-transceivers.https.html": [
     [
      "/webrtc/RTCPeerConnection-transceivers.https.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webrtc/RTCPeerConnectionIceEvent-constructor.html": [
@@ -446281,12 +446168,6 @@
      {}
     ]
    ],
-   "css/css-backgrounds/border-bottom-left-radius-008.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-left-radius-008.xht",
-     {}
-    ]
-   ],
    "css/css-backgrounds/border-bottom-left-radius-012.xht": [
     [
      "/css/css-backgrounds/border-bottom-left-radius-012.xht",
@@ -446305,12 +446186,6 @@
      {}
     ]
    ],
-   "css/css-backgrounds/border-bottom-right-radius-008.xht": [
-    [
-     "/css/css-backgrounds/border-bottom-right-radius-008.xht",
-     {}
-    ]
-   ],
    "css/css-backgrounds/border-bottom-right-radius-012.xht": [
     [
      "/css/css-backgrounds/border-bottom-right-radius-012.xht",
@@ -446749,12 +446624,6 @@
      {}
     ]
    ],
-   "css/css-backgrounds/border-top-left-radius-008.xht": [
-    [
-     "/css/css-backgrounds/border-top-left-radius-008.xht",
-     {}
-    ]
-   ],
    "css/css-backgrounds/border-top-left-radius-012.xht": [
     [
      "/css/css-backgrounds/border-top-left-radius-012.xht",
@@ -446797,12 +446666,6 @@
      {}
     ]
    ],
-   "css/css-backgrounds/border-top-right-radius-008.xht": [
-    [
-     "/css/css-backgrounds/border-top-right-radius-008.xht",
-     {}
-    ]
-   ],
    "css/css-backgrounds/border-top-right-radius-012.xht": [
     [
      "/css/css-backgrounds/border-top-right-radius-012.xht",
@@ -457166,6 +457029,14 @@
    "e094624c679202bd7035ed1593d83b2686360347",
    "testharness"
   ],
+  "WebIDL/ecmascript-binding/constructors-support.html": [
+   "3b2616170b1d4f48f9dab114e4135222ed10a6ea",
+   "support"
+  ],
+  "WebIDL/ecmascript-binding/constructors.html": [
+   "423e1bed22827b9b7f37781665b01ceb307d00c6",
+   "testharness"
+  ],
   "WebIDL/ecmascript-binding/default-iterator-object.html": [
    "c7e9188521a2ae0bc9f15ff9bcaefc55a5253ce2",
    "testharness"
@@ -536367,11 +536238,11 @@
    "visual"
   ],
   "css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht": [
-   "37852d9253c448eae582182756a481a44110fa9e",
-   "support"
+   "fdae290bc6f14ef01605e57a10ed25d3874d7ee3",
+   "reftest_node"
   ],
   "css/CSS2/text/text-indent-wrap-001-ref-float.xht": [
-   "18809f0adbf3a13043812e607654b23dd6a3776f",
+   "8c8c4a5e72d416d95de6b562d8ce9cf0dca282f8",
    "reftest_node"
   ],
   "css/CSS2/text/text-indent-wrap-001-ref-inline-margin.xht": [
@@ -536379,7 +536250,7 @@
    "reftest_node"
   ],
   "css/CSS2/text/text-indent-wrap-001.xht": [
-   "dc4c9b3abd29dd67487db26afee40f7806508cbd",
+   "31c226631ae847f6898126ff65fb6cb47a08e0a6",
    "reftest"
   ],
   "css/CSS2/text/text-transform-001.xht": [
@@ -547638,33 +547509,21 @@
    "5522722e824fb7be4a4547bcdbcaf4496faa1ef1",
    "visual"
   ],
-  "css/css-backgrounds/border-bottom-left-radius-003.xht": [
-   "312211138d23a4aecce6fcbb8638c0b85c179e52",
-   "reftest_node"
+  "css/css-backgrounds/border-bottom-left-radius-004-ref.xht": [
+   "15732f1c068b5890c7f65d2e7b561408cccde8e5",
+   "support"
   ],
   "css/css-backgrounds/border-bottom-left-radius-004.xht": [
-   "01ff790f9d759ab966b728c4161617dbd40628e2",
-   "reftest_node"
+   "92bcec5d16f80f133af406302b932efc8746f8fe",
+   "reftest"
+  ],
+  "css/css-backgrounds/border-bottom-left-radius-005-ref.xht": [
+   "26621b9a75c36b6c119acf7d622c6198b5770ee6",
+   "support"
   ],
   "css/css-backgrounds/border-bottom-left-radius-005.xht": [
-   "04d8a849238eccebdeebaf5dcd97c700fb6416f8",
-   "reftest_node"
-  ],
-  "css/css-backgrounds/border-bottom-left-radius-006.xht": [
-   "8f522644c8498b836c3caed6cd0e8d2f0ed29ac7",
-   "reftest_node"
-  ],
-  "css/css-backgrounds/border-bottom-left-radius-007.xht": [
-   "54bd5bd352f2112695f9b49262d79ca869628f92",
-   "reftest_node"
-  ],
-  "css/css-backgrounds/border-bottom-left-radius-008.xht": [
-   "33876eeb3ba91a3edc946f47ddb81bbdab720c60",
-   "visual"
-  ],
-  "css/css-backgrounds/border-bottom-left-radius-009.xht": [
-   "17df815ff4539f331adb00fab9e8f74eccc089d3",
-   "reftest_node"
+   "cc9fee12108c0c33325f9200d49dc8f30293fbb5",
+   "reftest"
   ],
   "css/css-backgrounds/border-bottom-left-radius-010.xht": [
    "3e7a1788b54919cdde0ec9ffc5e8e5dea8bff5f3",
@@ -547694,33 +547553,21 @@
    "ef6fb222012579f69c94a0b8e8bd0b310d96373b",
    "visual"
   ],
-  "css/css-backgrounds/border-bottom-right-radius-003.xht": [
-   "ba13706e1fc1d6a70f81e6e0f2ee8c4e88287304",
-   "reftest_node"
+  "css/css-backgrounds/border-bottom-right-radius-004-ref.xht": [
+   "8589ee96b117def11640ace8a2daa5f754a45471",
+   "support"
   ],
   "css/css-backgrounds/border-bottom-right-radius-004.xht": [
-   "907ed8255e6d6ab15194012f128f8fd96dc8d789",
-   "reftest_node"
+   "d9bbcf95900a3566233e35657cde1f42eadd887e",
+   "reftest"
+  ],
+  "css/css-backgrounds/border-bottom-right-radius-005-ref.xht": [
+   "9ed21b722270dcb6a73620b40a3b253126fdbdec",
+   "support"
   ],
   "css/css-backgrounds/border-bottom-right-radius-005.xht": [
-   "899b3b585b10ee0e8e2e506849139bf22ebc6cb7",
-   "reftest_node"
-  ],
-  "css/css-backgrounds/border-bottom-right-radius-006.xht": [
-   "d47009d1197066db6d0b753584a5db5d9bb45e69",
-   "reftest_node"
-  ],
-  "css/css-backgrounds/border-bottom-right-radius-007.xht": [
-   "c0d5b733b579572991924950ea935125d59eb2e8",
-   "reftest_node"
-  ],
-  "css/css-backgrounds/border-bottom-right-radius-008.xht": [
-   "b4b7b6e8f7c89964374d6a10c56a1f9d01420dc5",
-   "visual"
-  ],
-  "css/css-backgrounds/border-bottom-right-radius-009.xht": [
-   "633caa5ff246b31b3c205ab1c6eb3b91ebaeb553",
-   "reftest_node"
+   "899125420faaa9f8e3c5fa596490b2b3b546dd3c",
+   "reftest"
   ],
   "css/css-backgrounds/border-bottom-right-radius-010.xht": [
    "76676f89d1ca83470387e988d6ba6b14232bffa1",
@@ -547806,12 +547653,12 @@
    "619b677e114f3e8f842d4539b486e5b56953653f",
    "visual"
   ],
-  "css/css-backgrounds/border-image-5.html": [
-   "4fecfc7bf950ec310d87a7e147e3d058945a2c76",
-   "reftest"
+  "css/css-backgrounds/border-image-6-ref.html": [
+   "f3e3bb79c05336a3fa3aa0abe66260ddc8652884",
+   "support"
   ],
   "css/css-backgrounds/border-image-6.html": [
-   "235d263fac8892b4fdd6010d36dc1363ed423bb6",
+   "bc4cb1386b5cc634539fb4a6cd5c8599ec013f21",
    "reftest"
   ],
   "css/css-backgrounds/border-image-7.html": [
@@ -548230,33 +548077,21 @@
    "58f265ebf6ce40ab05bcf92b7aee17d459390880",
    "visual"
   ],
-  "css/css-backgrounds/border-top-left-radius-003.xht": [
-   "deed8ad6ad1e33e56f85cadae432c42d9274fcfc",
-   "reftest_node"
+  "css/css-backgrounds/border-top-left-radius-004-ref.xht": [
+   "b9c9cdac88267a980456ff69fda5afadb7571f8e",
+   "support"
   ],
   "css/css-backgrounds/border-top-left-radius-004.xht": [
-   "31e06fc2397ac482914b20ae0b285b9b926172d1",
-   "reftest_node"
+   "39e636db6bb62f65926d86525f541d9809dd7382",
+   "reftest"
+  ],
+  "css/css-backgrounds/border-top-left-radius-005-ref.xht": [
+   "f1a1935aa503aed0cd1f34ef586a54d00c3b568a",
+   "support"
   ],
   "css/css-backgrounds/border-top-left-radius-005.xht": [
-   "e4044300e66523813f8a5b18ffbdf313e4fd5287",
-   "reftest_node"
-  ],
-  "css/css-backgrounds/border-top-left-radius-006.xht": [
-   "dc2b9ebfad74ef19f7bd972714eae0644ec8eee9",
-   "reftest_node"
-  ],
-  "css/css-backgrounds/border-top-left-radius-007.xht": [
-   "7111e538fe2d7fed63a296dc3b8fe7c2c2d67595",
-   "reftest_node"
-  ],
-  "css/css-backgrounds/border-top-left-radius-008.xht": [
-   "724075cae1871977261455d6408f1889d4ee5cd7",
-   "visual"
-  ],
-  "css/css-backgrounds/border-top-left-radius-009.xht": [
-   "a5589fa9cc47f6234e42f975ac6f521dfeecb404",
-   "reftest_node"
+   "37af580e067b95a71002590d1ca4fa329ad72b85",
+   "reftest"
   ],
   "css/css-backgrounds/border-top-left-radius-010.xht": [
    "61b55e1f0857adf2ed65017fc4ae02cbe25e1e0e",
@@ -548302,33 +548137,21 @@
    "faaf86bb0bf7bc778d6212857324f773eb54939e",
    "visual"
   ],
-  "css/css-backgrounds/border-top-right-radius-003.xht": [
-   "66ac6caf432c4bdb9a72830222ddfe1a471bc866",
-   "reftest_node"
+  "css/css-backgrounds/border-top-right-radius-004-ref.xht": [
+   "ae031513ae2bbc317d2799d6625186438f15bd59",
+   "support"
   ],
   "css/css-backgrounds/border-top-right-radius-004.xht": [
-   "35bd619341298b526e5982799fd69de8631f6cad",
-   "reftest_node"
+   "cbedad809bad0e99df33044d9319f429d2a4ff8e",
+   "reftest"
+  ],
+  "css/css-backgrounds/border-top-right-radius-005-ref.xht": [
+   "a3303b72c7788651a0d132ef4122230ce8670ced",
+   "support"
   ],
   "css/css-backgrounds/border-top-right-radius-005.xht": [
-   "f44587cef469835d366d63ba86391bdfbaa1cc6e",
-   "reftest_node"
-  ],
-  "css/css-backgrounds/border-top-right-radius-006.xht": [
-   "be52dadfc55c6e0baf05fcd29bc0ad779c1ea4de",
-   "reftest_node"
-  ],
-  "css/css-backgrounds/border-top-right-radius-007.xht": [
-   "5a00a05da79456064d526d99a31cdea84211b84e",
-   "reftest_node"
-  ],
-  "css/css-backgrounds/border-top-right-radius-008.xht": [
-   "0fa67dbc92d21b25709a587bd2ea03fa71c7e205",
-   "visual"
-  ],
-  "css/css-backgrounds/border-top-right-radius-009.xht": [
-   "ec954d6003df3ee174fc5706d6d62659610b2d4d",
-   "reftest_node"
+   "8bd3965de5a3951ab5761d6779323f6e6a47d152",
+   "reftest"
   ],
   "css/css-backgrounds/border-top-right-radius-010.xht": [
    "5f2d5e5eab55bfd86a16e42a440e9773c28d11c5",
@@ -548607,7 +548430,7 @@
    "testharness"
   ],
   "css/css-backgrounds/parsing/border-image-slice-invalid.html": [
-   "c62a43d6b37422ae8ae3ea86b630bf3a38317a2e",
+   "6b6e0e9d610bc6c1b76c9f31d4c1651a783399c9",
    "testharness"
   ],
   "css/css-backgrounds/parsing/border-image-slice-valid.html": [
@@ -549154,10 +548977,6 @@
    "24948d0d0eb4b1178454418d106d5b1e942e69d2",
    "support"
   ],
-  "css/css-backgrounds/support/reftest-border-image-5.png": [
-   "01087f13dc1c239c51ae3569e8ea81ba8db5caff",
-   "support"
-  ],
   "css/css-backgrounds/support/ruler-h-50%.png": [
    "cf2eea6b438a11503a89414cbb2f9f1fde55df0c",
    "support"
@@ -554419,7 +554238,11 @@
    "reftest"
   ],
   "css/css-flexbox/flex-wrap-003.html": [
-   "a76e4449fb2e56a779c45c3a1c1c20ec31a093cf",
+   "b1a6619363aba8fb0b01177c596f4fdbf263fc37",
+   "reftest"
+  ],
+  "css/css-flexbox/flex-wrap-004.html": [
+   "679f62ae3e6659fa5627a3e2fb0276bcf6a13420",
    "reftest"
   ],
   "css/css-flexbox/flex-wrap_nowrap.html": [
@@ -567395,7 +567218,7 @@
    "support"
   ],
   "css/css-images/multiple-position-color-stop-conic.html": [
-   "d1608c0cfe8baa967cb1bdb6cb47b4635bf009b1",
+   "8a7331d08ff53bed6c19d96c95740b57fed43516",
    "reftest"
   ],
   "css/css-images/multiple-position-color-stop-linear-2-ref.html": [
@@ -567407,7 +567230,7 @@
    "reftest"
   ],
   "css/css-images/multiple-position-color-stop-linear.html": [
-   "2e1f9ed7be488a6c6fa68f4bc4252524ddab82b2",
+   "c739a2a71d2dbbc0088df45caac3a679d3d5ab37",
    "reftest"
   ],
   "css/css-images/multiple-position-color-stop-radial-2-ref.html": [
@@ -567419,7 +567242,7 @@
    "reftest"
   ],
   "css/css-images/multiple-position-color-stop-radial.html": [
-   "74e25df788b0736f687f5f6394c31437cc834f57",
+   "4b4fd95c4ec21307eee1e2f287f1b0db1d6d1490",
    "reftest"
   ],
   "css/css-images/parsing/gradient-position-invalid.html": [
@@ -567470,7 +567293,7 @@
    "b9dab78b518138272a1e29a6a2690d13f3e208e1",
    "testharness"
   ],
-  "css/css-images/support/100x100-blue-green.html": [
+  "css/css-images/reference/100x100-blue-green.html": [
    "e4f35c3e430cc2994709f6805576d1fe2c1f9cf3",
    "support"
   ],
@@ -571091,67 +570914,67 @@
    "support"
   ],
   "css/css-namespaces/prefix-001.xml": [
-   "c40bb7f1132c4f239d87871ecbaf03730e403ea3",
+   "eb717139e1dfd0e5a3ddd49a402f3c25f0333a48",
    "reftest"
   ],
   "css/css-namespaces/prefix-002.xml": [
-   "cc78f3f0aaf15088bb22793b58c79a0ef5e80ded",
+   "49ca7c0a9e116803ad7acf970e58bb4d3f92e4b3",
    "reftest"
   ],
   "css/css-namespaces/prefix-003.xml": [
-   "0b6f3293de1fa0118622cbe6e05588a452bfb96c",
+   "2f23ad4c061eba68692d222fbbb3cfea6af9a92b",
    "reftest"
   ],
   "css/css-namespaces/prefix-004.xml": [
-   "70c3bd1ed9bc5882f530f755026c29e42e9e45de",
+   "596d4637f9ba79f67abddef0383f197e66fa1090",
    "reftest"
   ],
   "css/css-namespaces/prefix-005.xml": [
-   "458b5aa3ebc4fd44a0b590de890a58db4b4894c9",
+   "5f7c3cad3d942ca2c81392b3e4ea38866f2da08d",
    "reftest"
   ],
   "css/css-namespaces/prefix-006.xml": [
-   "0bf59915a45b6f51b20dda3d8c79e8ce7f1d15cc",
+   "3cc0ab40f3aa5b91df020dddd2a654620af831bd",
    "reftest"
   ],
-  "css/css-namespaces/reftest/ref-lime-1-block.xml": [
+  "css/css-namespaces/reference/ref-lime-1-block.xml": [
    "c26b6fcf2c17918542e998f20d564f20878f9934",
    "support"
   ],
-  "css/css-namespaces/reftest/ref-lime-1-generic.xml": [
+  "css/css-namespaces/reference/ref-lime-1-generic.xml": [
    "12c5c012d0b17b3ac5c6c0cf3e51ec8420dd12c5",
    "support"
   ],
-  "css/css-namespaces/reftest/ref-lime-1.xml": [
+  "css/css-namespaces/reference/ref-lime-1.xml": [
    "9509a4bd3421226e48421dd643c7f625fd33316c",
    "support"
   ],
-  "css/css-namespaces/reftest/ref-lime-2-generic.xml": [
+  "css/css-namespaces/reference/ref-lime-2-generic.xml": [
    "047be42212bba6b98289c58ba197ad143345c338",
    "support"
   ],
-  "css/css-namespaces/reftest/ref-lime-2.xml": [
+  "css/css-namespaces/reference/ref-lime-2.xml": [
    "f2fa08395fec86944af3135d52ca2de627079cf6",
    "support"
   ],
-  "css/css-namespaces/reftest/ref-lime-3.xml": [
+  "css/css-namespaces/reference/ref-lime-3.xml": [
    "e50faba6b55ae5116c743dd0dd8487deaa78b481",
    "support"
   ],
-  "css/css-namespaces/reftest/ref-lime-5.xml": [
+  "css/css-namespaces/reference/ref-lime-5.xml": [
    "9c45f9de7cbab90d1bff7ee7363454da571e3a81",
    "support"
   ],
-  "css/css-namespaces/reftest/ref-lime-6.xml": [
+  "css/css-namespaces/reference/ref-lime-6.xml": [
    "d67da1ac3945e280b7bc8c5df28cc94899ef5193",
    "support"
   ],
   "css/css-namespaces/scope-001.xml": [
-   "bed4171efa1e95202595b6ffc5bab2c0f405dd8c",
+   "5271096a96432ca6ebd2b2907b7946efc6bc7c46",
    "reftest"
   ],
   "css/css-namespaces/scope-002.xml": [
-   "d25eb81780c1993175fddcfa9257d26dbac8ae66",
+   "ff5a2fec118407764e92d6d8f34496d1db3fd31d",
    "reftest"
   ],
   "css/css-namespaces/support/LOCK": [
@@ -571175,63 +570998,63 @@
    "support"
   ],
   "css/css-namespaces/syntax-001.xml": [
-   "01c57e07c7c1213cfaaaf97330da818016dc6ea8",
+   "83efb665b66cc32409776645b6c53a972e9aebf6",
    "reftest"
   ],
   "css/css-namespaces/syntax-002.xml": [
-   "cb04b9c8d6b1e751e0bd85fc7289a49a9034024b",
+   "30fa8aece35ad7b53ee93bb1c1b11bb02b091e34",
    "reftest"
   ],
   "css/css-namespaces/syntax-003.xml": [
-   "256286eeb1259723d128e0a1db0c4afba70c9520",
+   "1b2eb5f9c08ddb052616646710fb67b28ca018e6",
    "reftest"
   ],
   "css/css-namespaces/syntax-004.xml": [
-   "335bca98d24ac6dfbdb850813c231d196502b9a6",
+   "c4ce372b09c403e54253f944580f9e9f84db6c86",
    "reftest"
   ],
   "css/css-namespaces/syntax-005.xml": [
-   "164bea1ece4875beaf4a7395768cc5f22b503d02",
+   "9d6b0abe945bda36a86eb23a2524b4d2333769f8",
    "reftest"
   ],
   "css/css-namespaces/syntax-006.xml": [
-   "1c5975a852a2c5716460fb43c90511b104a82b20",
+   "09ff0d5916ec30c76ca158b8ac917c7d0df2817a",
    "reftest"
   ],
   "css/css-namespaces/syntax-007.xml": [
-   "6022d1c7e1c3becb94b06eec5109c559d5e40240",
+   "0c651f17d7895200d365d33efd639af46604caa1",
    "reftest"
   ],
   "css/css-namespaces/syntax-008.xml": [
-   "4cb4e233979e46b226f4b782076d0310122f2f7e",
+   "20284e2247c18821d49bd669c0a748a4c45c506b",
    "reftest"
   ],
   "css/css-namespaces/syntax-009.xml": [
-   "9f69fec67e0bc61d6eb30897c207cf82597ecbfc",
+   "edf2f4c9b48951f7ef40e12af32fc724a5032f2f",
    "reftest"
   ],
   "css/css-namespaces/syntax-010.xml": [
-   "e175a7bd3cebdc2a950871c80a0baac0471a61c4",
+   "06b280da792d05a8960cf3434b91b4f7a58d06c3",
    "reftest"
   ],
   "css/css-namespaces/syntax-011.xml": [
-   "e60cbe115ea14bd1be184357539026fb66ad2273",
+   "7d137fc7a546172027f6cb5131b79097e324d7b1",
    "reftest"
   ],
   "css/css-namespaces/syntax-012.xml": [
-   "557ba5065ba8974e03d5d26c1017d2f65804cb5a",
+   "43f211b4dd20a3de24b4440c9ef3efb7fee08d6b",
    "reftest"
   ],
   "css/css-namespaces/syntax-013.xml": [
-   "983e2e62d92b2a593b43067666b1638fd18dfafe",
+   "a7c63e43e092779ec2a0b7084929892cec7cfc99",
    "reftest"
   ],
   "css/css-namespaces/syntax-014.xml": [
-   "d57d8991cc82ee4a988e22aa67a2f436386801ce",
+   "1bdfc265ef603e8dd39436f8a405f16b3bd43bb6",
    "reftest"
   ],
   "css/css-namespaces/syntax-015.xml": [
-   "4460ddf559b157682bd3e8744548f8a24d607334",
+   "d39eb8b3a48d57062f72c435697824ab1c49f8c0",
    "reftest"
   ],
   "css/css-namespaces/syntax-016.xml": [
@@ -583166,6 +582989,10 @@
    "53cb2a083b0825a749d178d5093c1a105958143d",
    "support"
   ],
+  "css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html": [
+   "80b2260cbbe6122e90c297ab1f2cd83917712030",
+   "support"
+  ],
   "css/css-text/white-space/seg-break-transformation-000.html": [
    "cb7b0f30b566320c1022f61fde44bc09695badb1",
    "testharness"
@@ -583386,6 +583213,10 @@
    "6b21df62c5cbdfa2cce9e52d91c7a792d94354e8",
    "reftest"
   ],
+  "css/css-text/white-space/white-space-wrap-after-nowrap-001.html": [
+   "a484f1cf9167e468063cf2205493b8e71a254470",
+   "reftest"
+  ],
   "css/css-text/word-break/reference/word-break-break-all-010-ref.html": [
    "0e0300a72dc920a5ffb54cda6fbe84a2f517d010",
    "support"
@@ -585314,6 +585145,22 @@
    "d69df1ba455ae7cf049c68481ecc721676f3f22f",
    "support"
   ],
+  "css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht": [
+   "9a8d7e85934043bdcd3446f115856cccb6240fbc",
+   "support"
+  ],
+  "css/css-transforms/reference/transform-applies-to-001-ref.xht": [
+   "fe646caebd74d81f7a32da23f9c9ed7af9fb727b",
+   "support"
+  ],
+  "css/css-transforms/reference/transform-applies-to-002-ref.xht": [
+   "b9ef17475b707335d015c17f065fd5a55fb08e7b",
+   "support"
+  ],
+  "css/css-transforms/reference/transform-origin-01-ref.html": [
+   "0e85f3c698f6ce83f016a0a3c82d8796d406b274",
+   "support"
+  ],
   "css/css-transforms/reference/transform-origin-ref.html": [
    "980a273e0d6b7372777cf8af78dcae1283048907",
    "support"
@@ -585390,22 +585237,6 @@
    "12214ad615518b226e8473dc8aec37d258d74b1b",
    "support"
   ],
-  "css/css-transforms/reftest/transform-3d-rotateY-stair-above-ref-001.xht": [
-   "9a8d7e85934043bdcd3446f115856cccb6240fbc",
-   "support"
-  ],
-  "css/css-transforms/reftest/transform-applies-to-001-ref.xht": [
-   "fe646caebd74d81f7a32da23f9c9ed7af9fb727b",
-   "support"
-  ],
-  "css/css-transforms/reftest/transform-applies-to-002-ref.xht": [
-   "b9ef17475b707335d015c17f065fd5a55fb08e7b",
-   "support"
-  ],
-  "css/css-transforms/reftest/transform-origin-01-ref.html": [
-   "0e85f3c698f6ce83f016a0a3c82d8796d406b274",
-   "support"
-  ],
   "css/css-transforms/rotate-180-degrees-001.html": [
    "9532290cde76870ab8e21236a89586ddb9d20ddf",
    "visual"
@@ -586335,11 +586166,11 @@
    "testharness"
   ],
   "css/css-transforms/transform-3d-rotateY-stair-above-001.xht": [
-   "41d8979c4551076ce89f17a5c230719729168497",
+   "9a3aac888feee0854357320c6edf87530c07c536",
    "reftest"
   ],
   "css/css-transforms/transform-3d-rotateY-stair-below-001.xht": [
-   "5a1c1d4699895c8c0cb7e1da4a160afbeaf45d0c",
+   "5224da27fd4ac3d25e1a37f4edfd70a19fec8dec",
    "reftest"
   ],
   "css/css-transforms/transform-abspos-001.html": [
@@ -586375,11 +586206,11 @@
    "support"
   ],
   "css/css-transforms/transform-applies-to-001.xht": [
-   "0036e8e1acf2b806d7af3bdf1d02fc307e53f2fa",
+   "09bb196d533212a7113c27739a418e3ec974045a",
    "reftest"
   ],
   "css/css-transforms/transform-applies-to-002.xht": [
-   "80715d379d4d265516e4312a09a317a5e345b90b",
+   "186d0b74a3a5bab147aa457593b4bf306dc5cbb5",
    "reftest"
   ],
   "css/css-transforms/transform-background-001.html": [
@@ -586431,39 +586262,39 @@
    "support"
   ],
   "css/css-transforms/transform-box/fill-box-mutation.html": [
-   "ae602e3509d0ad066e67a9556db16b5e542ca4cb",
+   "1f0dfd01bb9ab6acf183721f23f8590293e9e32f",
    "reftest"
   ],
   "css/css-transforms/transform-box/fill-box.html": [
-   "eaea02a5dfe7764ff02b591ff66def0fb0965436",
+   "7e9b133aead426b36702e5377c3cd1347e36ff5f",
    "reftest"
   ],
-  "css/css-transforms/transform-box/support/greensquare200x200.html": [
+  "css/css-transforms/transform-box/reference/greensquare200x200.html": [
    "bee8bc70fe5d3ff49f7bd39d473bbb8a230f7d08",
    "support"
   ],
   "css/css-transforms/transform-box/value-changed.html": [
-   "825403ef7b62526aa4ec1c167538e062a1761309",
+   "4aca90a61c1f76a9ee83b912bd20acf31a0e295d",
    "reftest"
   ],
   "css/css-transforms/transform-box/view-box-mutation.html": [
-   "0d4a0ecdc2f9f598503e75a4e9906e680e8f1f81",
+   "d0c85fd59d36e06180bbea07700d6f7bc69e9559",
    "reftest"
   ],
   "css/css-transforms/transform-box/view-box-nested.html": [
-   "7f59777f15b827bbc69003b01ed6a5c6a10d6164",
+   "9e7fc17e2a5bc8c33b412d9f3c6e96caba60009a",
    "reftest"
   ],
   "css/css-transforms/transform-box/view-box-viewbox-nested.html": [
-   "4f667e20ba8103291d9440b097c901dbfe13b6ce",
+   "fc072363e8a30958f5d4d8522ab4feec0a860428",
    "reftest"
   ],
   "css/css-transforms/transform-box/view-box-viewbox.html": [
-   "cd040c1ba33864a2f2a32a452ec7375f69343190",
+   "a69d8092f646310ab6d9bbf9199a9983f9ca6f05",
    "reftest"
   ],
   "css/css-transforms/transform-box/view-box.html": [
-   "3345467c904d4635339adc4c5e96dbabb55320db",
+   "0b5eeda54382bb84ff97480b1852b953f547165d",
    "reftest"
   ],
   "css/css-transforms/transform-compound-001.html": [
@@ -586939,7 +586770,7 @@
    "reftest"
   ],
   "css/css-transforms/transform-origin-01.html": [
-   "c1b6f29a52ac3c001332e4cff77bfab60497dbd7",
+   "d7e1cd34d4556b84935eb0ed897c654d747a0c70",
    "reftest"
   ],
   "css/css-transforms/transform-origin-010.html": [
@@ -588023,12 +587854,12 @@
    "reftest"
   ],
   "css/css-transforms/transform3d-perspective-origin-001.html": [
-   "1a81bc1d4dad70862c5011043293702d19c83a0c",
+   "791d4bd136cc10a29030eb92ae603904a8a79f6a",
    "reftest"
   ],
   "css/css-transforms/transform3d-perspective-origin-ref.html": [
-   "dd0026b8fc1c9eec6695f2eb6a472c78a07a9e08",
-   "support"
+   "e174d7596f7cda83b616da59f1afab059c87b836",
+   "reftest_node"
   ],
   "css/css-transforms/transform3d-preserve3d-001-ref.html": [
    "383bc7a63eb55053bf17948c1c973d80f8f2d352",
@@ -588091,7 +587922,7 @@
    "reftest"
   ],
   "css/css-transforms/transform3d-rotate3d-001.html": [
-   "185346c333c11892378f9c2e6b939fdaac7867e2",
+   "93a46f1c6ab038b92e9bbbe3356d219cd2f1bdf4",
    "reftest"
   ],
   "css/css-transforms/transform3d-rotate3d-002.html": [
@@ -588099,15 +587930,15 @@
    "reftest"
   ],
   "css/css-transforms/transform3d-rotatex-001.html": [
-   "47ad10b388ce192e7dc84734d194572c4bc92d90",
+   "2f75f15cd0d62c9636a7867df221271525be003a",
    "reftest"
   ],
   "css/css-transforms/transform3d-rotatex-perspective-001.html": [
    "6d35cae63262d47dad9eae7aa74486955a1a1740",
-   "reftest_node"
+   "reftest"
   ],
   "css/css-transforms/transform3d-rotatex-perspective-002.html": [
-   "472d0aa854b6d448a9ddc946cdf71eb3ebb04335",
+   "ecf6a2f8d57ebf90e973a5009449edb73415dead",
    "reftest"
   ],
   "css/css-transforms/transform3d-rotatex-perspective-003.html": [
@@ -598726,15 +598557,15 @@
    "204d87a4b6e3ed254d30368761e9638fabcb041f",
    "support"
   ],
-  "css/css-writing-modes/reftest/writing-mode-vertical-lr-002-ref.xht": [
+  "css/css-writing-modes/reference/writing-mode-vertical-lr-002-ref.xht": [
    "496c03d8416e7e9ef2fcca5f8f2ab764a71b9a68",
    "support"
   ],
-  "css/css-writing-modes/reftest/writing-mode-vertical-rl-001-ref.xht": [
+  "css/css-writing-modes/reference/writing-mode-vertical-rl-001-ref.xht": [
    "ed0d5a6c95385e31169f128f3b1d3d827812ea6c",
    "support"
   ],
-  "css/css-writing-modes/reftest/writing-mode-vertical-rl-002-ref.xht": [
+  "css/css-writing-modes/reference/writing-mode-vertical-rl-002-ref.xht": [
    "5dccf5071e82905297c33bde6e019ad4b9c019cd",
    "support"
   ],
@@ -601347,15 +601178,15 @@
    "testharness"
   ],
   "css/css-writing-modes/writing-mode-vertical-lr-002.xht": [
-   "8086296174cbeae4e7ee06415311582118ed839b",
+   "291dff96d39c33d2eb0d1a16eaae71e56355829a",
    "reftest"
   ],
   "css/css-writing-modes/writing-mode-vertical-rl-001.xht": [
-   "0a7839cba0c811a3307784a2a6fcc3128bd6034c",
+   "5a5c7bf2a4eb5343ad7cfe639ace3ef71a6f4397",
    "reftest"
   ],
   "css/css-writing-modes/writing-mode-vertical-rl-002.xht": [
-   "f2d3ab078f9c564c4b0e2ad05ce239fff012760a",
+   "ac77d439d75dc9550494463e167eec52595219bd",
    "reftest"
   ],
   "css/css-writing-modes/writing-mode-vertical-rl-003-ref.htm": [
@@ -674351,14 +674182,14 @@
    "support"
   ],
   "svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg": [
-   "7880fcf501c032965814e383a93d89a31edda3c5",
+   "7ef2655dc91c815d57d1496d2e5707d54ac94c5d",
    "reftest"
   ],
   "svg/embedded/image-embedding-svg-with-viewport-units.svg": [
-   "6feb54b392f452071f8f4e2d470befee76c03ee6",
+   "653856de21bc50a48d8d2aa55fdaa276f994b8f6",
    "reftest"
   ],
-  "svg/embedded/support/green-rect-100x100.svg": [
+  "svg/embedded/reference/green-rect-100x100.svg": [
    "120941444a4898197d6b6001f9908a6cd48b62ba",
    "support"
   ],
@@ -677699,7 +677530,7 @@
    "reftest"
   ],
   "svg/shapes/reftests/disabled-shapes-01.svg": [
-   "d92eea169a6904c969fa0d6df363324194a1b335",
+   "3091ca7b0152c8580dbe49e2774dd8c5934917fb",
    "reftest"
   ],
   "svg/shapes/reftests/pathlength-001-ref.svg": [
@@ -677726,7 +677557,7 @@
    "506952f54b4b0b59d10a106af50ae61062873e99",
    "reftest"
   ],
-  "svg/shapes/reftests/support/empty.svg": [
+  "svg/shapes/reftests/reference/empty.svg": [
    "0c7be4e2da4480937124138e7dee3e26bd018abe",
    "support"
   ],
@@ -678587,7 +678418,7 @@
    "support"
   ],
   "tools/manifest/sourcefile.py": [
-   "d2e5df85526311f5503ff451a0ad4217eeb21865",
+   "f3e49662c1facaa0e71f6c79cc9e8629d373a3b4",
    "support"
   ],
   "tools/manifest/tests/__init__.py": [
@@ -679019,7 +678850,7 @@
    "support"
   ],
   "tools/requirements_flake8.txt": [
-   "325988ee4e501b6ad64096daae279c0a5b78e4d2",
+   "b134409614cc10f73626883ed5d7eb90f4c950b0",
    "support"
   ],
   "tools/runner/css/bootstrap-theme.min.css": [
@@ -683027,7 +682858,7 @@
    "support"
   ],
   "tools/webdriver/webdriver/client.py": [
-   "29be09bb3c934f7f2e3796f2ed89e507eae90bd6",
+   "52ebc95e84aaea1536d15a7325e2ea62b7f2914c",
    "support"
   ],
   "tools/webdriver/webdriver/error.py": [
@@ -686835,11 +686666,11 @@
    "testharness"
   ],
   "web-animations/interfaces/Animatable/animate.html": [
-   "cbec1b0c57a2e4ff7ca38f38e3c7253f5ba8f53d",
+   "b7c590e67a03d6ae81cbfeb1a80db0e0613f710d",
    "testharness"
   ],
   "web-animations/interfaces/Animatable/getAnimations.html": [
-   "430aa4c15ccadb26f1f90032fd5042b625807dd4",
+   "d834d04efe67be5be7916ca0afcf103f342f6dbc",
    "testharness"
   ],
   "web-animations/interfaces/Animation/cancel.html": [
@@ -686894,6 +686725,10 @@
    "61f76955a398d6286ce08891145efd1f345f63d5",
    "testharness"
   ],
+  "web-animations/interfaces/Animation/style-change-events.html": [
+   "080458660ebaa8b343d5aa93528ebc23efa54e7c",
+   "testharness"
+  ],
   "web-animations/interfaces/AnimationEffect/getComputedTiming.html": [
    "10bd193361e03210c6ac3a976919f0b189db0136",
    "testharness"
@@ -686911,7 +686746,7 @@
    "testharness"
   ],
   "web-animations/interfaces/Document/getAnimations.html": [
-   "6b8534bf035ff4d77f7ae3fca8e9c62fe0ede602",
+   "f5df980cc053e55c05b07992a44a87f7d02826ff",
    "testharness"
   ],
   "web-animations/interfaces/Document/timeline.html": [
@@ -686926,6 +686761,10 @@
    "395d133f482a38a33ea5be061450f0f322be9fc9",
    "testharness"
   ],
+  "web-animations/interfaces/DocumentTimeline/style-change-events.html": [
+   "c1607e6fb92943c580802025e4a4cc617a747144",
+   "testharness"
+  ],
   "web-animations/interfaces/KeyframeEffect/composite.html": [
    "bcca2cad243abb3fe4d43dc2052e08af3e58499d",
    "testharness"
@@ -686958,6 +686797,10 @@
    "675a705891fa6c75c233179e59cc73cc516ff48c",
    "testharness"
   ],
+  "web-animations/interfaces/KeyframeEffect/style-change-events.html": [
+   "af53d2d5e141bf20a1f5e79aeaa5c87520f11e2d",
+   "testharness"
+  ],
   "web-animations/interfaces/KeyframeEffect/target.html": [
    "b8fc05b81d4ad88f528afc1453eef30729ef897f",
    "testharness"
@@ -688779,7 +688622,7 @@
    "support"
   ],
   "webdriver/tests/get_current_url/get.py": [
-   "2497219509dd3d66f97b284d63e406d0f56a12f5",
+   "8efc8f0dd6b7ee7598a4349c5e758037555c72ea",
    "wdspec"
   ],
   "webdriver/tests/get_current_url/user_prompts.py": [
@@ -689003,7 +688846,7 @@
    "support"
   ],
   "webdriver/tests/navigate_to/navigate.py": [
-   "e478e10b76b0953d854416dffdc7a400087aee95",
+   "2ae67d40bcfc08e2edf7ca760d34f6ea50ed65e2",
    "wdspec"
   ],
   "webdriver/tests/navigate_to/user_prompts.py": [
@@ -689223,7 +689066,7 @@
    "support"
   ],
   "webdriver/tests/send_alert_text/send.py": [
-   "6dbc03f94019abf6fc467ae2baf8fb9d21823e64",
+   "3ed5621c08417154833161a7e05a68c422ff0c75",
    "wdspec"
   ],
   "webdriver/tests/set_timeouts/__init__.py": [
@@ -689266,6 +689109,10 @@
    "67711987d4b7cf683ff4e6d1ace3ad0189b7ec91",
    "support"
   ],
+  "webdriver/tests/support/authentication.py": [
+   "6f880f3c85165295bf9e98aa4e4adba2eca88cbd",
+   "support"
+  ],
   "webdriver/tests/support/defaults.py": [
    "8dd171aa64c71fa031e0e14ef4344f4335e368cc",
    "support"
@@ -690107,7 +689954,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-helper.js": [
-   "1ff5f54015e6a65a47cd4a277818acb9c57318bc",
+   "0b25df26190c14a1e3c0a5a1e5cd7514b7eb69f8",
    "support"
   ],
   "webrtc/RTCPeerConnection-iceConnectionState.https.html": [
@@ -690135,11 +689982,11 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-remote-track-mute.https.html": [
-   "095fe50e305f853cb3c76030c0f0cb3cd86e4fff",
+   "c4c6b4fd0410dd45e99d8ae313ede42ae7593e49",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-removeTrack.https.html": [
-   "a955db6895ad1727f1c13a3b8e1ee5f1e8c7c37c",
+   "ffb3fececc48ddff3869ea728b00b94c76380334",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-setDescription-transceiver.html": [
@@ -690191,7 +690038,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html": [
-   "7c565dd1c3baf8a379a5b89cb342e11413c3b032",
+   "4e9568f0bcdb4813d973197640aa7ea200598b56",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-setRemoteDescription.html": [
@@ -690199,11 +690046,11 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-track-stats.https.html": [
-   "e394e63e50d78b96dd8b6815700a0cc8408ce239",
+   "2d0ce302a01bcf15d3f49cb3728e2a45847ece2a",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-transceivers.https.html": [
-   "1f980ea389a77551a33750d33349110e3b02b72a",
+   "f56a170616cca25d2619158a2f3894aeee59b95a",
    "testharness"
   ],
   "webrtc/RTCPeerConnectionIceEvent-constructor.html": [
@@ -690295,7 +690142,7 @@
    "testharness"
   ],
   "webrtc/RTCRtpTransceiver.https.html": [
-   "c200271490eaee404101360768276d9563453c24",
+   "013fe6cf77192f829fbc09a4f1f1564f0e4131aa",
    "testharness"
   ],
   "webrtc/RTCSctpTransport-constructor.html": [
diff --git a/tests/wpt/metadata/WebIDL/ecmascript-binding/constructors.html.ini b/tests/wpt/metadata/WebIDL/ecmascript-binding/constructors.html.ini
new file mode 100644
index 00000000000..6667861bc55
--- /dev/null
+++ b/tests/wpt/metadata/WebIDL/ecmascript-binding/constructors.html.ini
@@ -0,0 +1,25 @@
+[constructors.html]
+  [Subclass constructor in child window]
+    expected: FAIL
+
+  [Constructor in child window with bad NewTarget from parent window]
+    expected: FAIL
+
+  [Subclass constructor in parent window]
+    expected: FAIL
+
+  [Constructor in parent window with normal NewTarget from child window]
+    expected: FAIL
+
+  [Subclass constructor in child window with parent class in parent window]
+    expected: FAIL
+
+  [Constructor in parent window with bad NewTarget from child window]
+    expected: FAIL
+
+  [Constructor in child window with normal NewTarget from parent window]
+    expected: FAIL
+
+  [Subclass constructor in parent window with parent class in child window]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/text/text-indent-wrap-001.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-indent-wrap-001.xht.ini
new file mode 100644
index 00000000000..5cdcdc539a5
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-indent-wrap-001.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-wrap-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-bottom-left-radius-004.xht.ini b/tests/wpt/metadata/css/css-backgrounds/border-bottom-left-radius-004.xht.ini
deleted file mode 100644
index 60388de2a08..00000000000
--- a/tests/wpt/metadata/css/css-backgrounds/border-bottom-left-radius-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-bottom-left-radius-004.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-bottom-left-radius-005.xht.ini b/tests/wpt/metadata/css/css-backgrounds/border-bottom-left-radius-005.xht.ini
deleted file mode 100644
index 74e729aa516..00000000000
--- a/tests/wpt/metadata/css/css-backgrounds/border-bottom-left-radius-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-bottom-left-radius-005.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-bottom-right-radius-004.xht.ini b/tests/wpt/metadata/css/css-backgrounds/border-bottom-right-radius-004.xht.ini
deleted file mode 100644
index 8eee284f23e..00000000000
--- a/tests/wpt/metadata/css/css-backgrounds/border-bottom-right-radius-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-bottom-right-radius-004.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-bottom-right-radius-005.xht.ini b/tests/wpt/metadata/css/css-backgrounds/border-bottom-right-radius-005.xht.ini
deleted file mode 100644
index 7832611f409..00000000000
--- a/tests/wpt/metadata/css/css-backgrounds/border-bottom-right-radius-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-bottom-right-radius-005.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-image-6.html.ini b/tests/wpt/metadata/css/css-backgrounds/border-image-6.html.ini
deleted file mode 100644
index 4e327535805..00000000000
--- a/tests/wpt/metadata/css/css-backgrounds/border-image-6.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-image-6.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-top-left-radius-004.xht.ini b/tests/wpt/metadata/css/css-backgrounds/border-top-left-radius-004.xht.ini
deleted file mode 100644
index b727c420ddd..00000000000
--- a/tests/wpt/metadata/css/css-backgrounds/border-top-left-radius-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-top-left-radius-004.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-top-left-radius-005.xht.ini b/tests/wpt/metadata/css/css-backgrounds/border-top-left-radius-005.xht.ini
deleted file mode 100644
index 9231339781c..00000000000
--- a/tests/wpt/metadata/css/css-backgrounds/border-top-left-radius-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-top-left-radius-005.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-top-right-radius-004.xht.ini b/tests/wpt/metadata/css/css-backgrounds/border-top-right-radius-004.xht.ini
deleted file mode 100644
index 13f5073e4ee..00000000000
--- a/tests/wpt/metadata/css/css-backgrounds/border-top-right-radius-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-top-right-radius-004.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-top-right-radius-005.xht.ini b/tests/wpt/metadata/css/css-backgrounds/border-top-right-radius-005.xht.ini
deleted file mode 100644
index 60dfc4859d7..00000000000
--- a/tests/wpt/metadata/css/css-backgrounds/border-top-right-radius-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-top-right-radius-005.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
index 898bf5ef7ed..e2834d42837 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -107,9 +107,6 @@
   [Matching font-style: 'oblique 10deg' should prefer 'oblique 0deg' over 'oblique -50deg -20deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique 10deg' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 0deg' should prefer 'oblique 0deg' over 'oblique 5deg']
     expected: FAIL
 
@@ -134,9 +131,6 @@
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -60deg -30deg' over 'oblique -50deg -40deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -10deg' should prefer 'oblique -50deg -40deg' over 'italic']
-    expected: FAIL
-
   [Matching font-style: 'oblique -10deg' should prefer 'italic' over 'oblique 0deg 10deg']
     expected: FAIL
 
@@ -317,12 +311,6 @@
   [Matching font-style: 'oblique 0deg' should prefer 'oblique 5deg' over 'oblique 15deg 20deg']
     expected: FAIL
 
-  [Matching font-weight: '399' should prefer '500 501' over '502 510']
-    expected: FAIL
-
-  [Matching font-stretch: '100%' should prefer '100%' over '110% 120%']
-    expected: FAIL
-
   [Matching font-style: 'oblique 0deg' should prefer 'oblique 40deg 50deg' over 'italic']
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-text/white-space/white-space-wrap-after-nowrap-001.html.ini b/tests/wpt/metadata/css/css-text/white-space/white-space-wrap-after-nowrap-001.html.ini
new file mode 100644
index 00000000000..b54652e802f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/white-space-wrap-after-nowrap-001.html.ini
@@ -0,0 +1,2 @@
+[white-space-wrap-after-nowrap-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
index f25f1e05d0b..381fcd872fa 100644
--- a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
+++ b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
@@ -32,7 +32,7 @@
 
 
 [single-byte-decoder.html?XMLHttpRequest]
-  expected: TIMEOUT
+  expected: CRASH
   [ISO-8859-2: iso_8859-2:1987 (XMLHttpRequest)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-string.tentative.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-string.tentative.html.ini
new file mode 100644
index 00000000000..9bacb9f5c4e
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-string.tentative.html.ini
@@ -0,0 +1,4 @@
+[javascript-url-abort-return-value-string.tentative.html]
+  [Aborting fetch for javascript:string navigation]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini
deleted file mode 100644
index 78879bad5f1..00000000000
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[javascript-url-abort-return-value-undefined.tentative.html]
-  expected: TIMEOUT
-  [Not aborting fetch for javascript:undefined navigation]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html.ini
new file mode 100644
index 00000000000..e495b626d2e
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html.ini
@@ -0,0 +1,4 @@
+[navigation-unload-same-origin-fragment.html]
+  [Tests that a fragment navigation in the unload handler will not block the initial navigation]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index 385376c7321..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
new file mode 100644
index 00000000000..ca460dc6867
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
@@ -0,0 +1,4 @@
+[activation-behavior.window.html]
+  [<a> that is not connected should be followed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
new file mode 100644
index 00000000000..178680e5d14
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
@@ -0,0 +1,2 @@
+[script-onerror-insertion-point-2.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini b/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
index d6e39444229..49f489d2a1c 100644
--- a/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
+++ b/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
@@ -1,5 +1,6 @@
 [003.html]
   type: testharness
+  expected: ERROR
   [shared]
     expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini b/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
new file mode 100644
index 00000000000..dbea4f293ad
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
@@ -0,0 +1,2 @@
+[transition_calc_implicit.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/constructors-support.html b/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/constructors-support.html
new file mode 100644
index 00000000000..3b2616170b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/constructors-support.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<script>
+window.badNewTarget = function() {};
+badNewTarget.prototype = 8;
+
+window.DOMParserSubclass = class extends DOMParser {}
+window.ForeignDOMParserSubclass = class extends parent.DOMParser {}
+</script>
diff --git a/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/constructors.html b/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/constructors.html
new file mode 100644
index 00000000000..423e1bed228
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/constructors.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Realm for constructed objects</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+function object_realm(dp) {
+  // Note that browsers use the URL of the relevant global object's associated
+  // Document.
+  // https://github.com/w3c/DOM-Parsing/issues/46
+  var url = DOMParser.prototype.parseFromString.call(dp, "x", "text/html").documentURI;
+  var file = url.slice(url.lastIndexOf("/") + 1);
+  switch (file) {
+  case "constructors.html":
+    return "parent window";
+  case "constructors-support.html":
+    return "child window";
+  default:
+    return "???";
+  }
+}
+
+async_test(function() {
+  var iframe = document.createElement("iframe");
+  iframe.onload = this.step_func_done(function() {
+    var child = iframe.contentWindow;
+    test(function() {
+      var dp = new DOMParser();
+      assert_equals(Object.getPrototypeOf(dp), DOMParser.prototype);
+      assert_equals(object_realm(dp), "parent window");
+    }, "Normal constructor in parent window");
+
+    test(function() {
+      var dp = new child.DOMParser();
+      assert_equals(Object.getPrototypeOf(dp), child.DOMParser.prototype);
+      assert_equals(object_realm(dp), "child window");
+    }, "Normal constructor in child window");
+
+    test(function() {
+      var dp = Reflect.construct(child.DOMParser, [], DOMParser);
+      assert_equals(Object.getPrototypeOf(dp), DOMParser.prototype);
+      assert_equals(object_realm(dp), "child window");
+    }, "Constructor in child window with normal NewTarget from parent window");
+
+    test(function() {
+      var dp = Reflect.construct(DOMParser, [], child.DOMParser);
+      assert_equals(Object.getPrototypeOf(dp), child.DOMParser.prototype);
+      assert_equals(object_realm(dp), "parent window");
+    }, "Constructor in parent window with normal NewTarget from child window");
+
+    test(function() {
+      class DOMParserSubclass extends DOMParser {}
+      var dp = new DOMParserSubclass();
+      assert_equals(Object.getPrototypeOf(dp), DOMParserSubclass.prototype);
+      assert_equals(object_realm(dp), "parent window");
+    }, "Subclass constructor in parent window");
+
+    test(function() {
+      var dp = new child.DOMParserSubclass();
+      assert_equals(Object.getPrototypeOf(dp), child.DOMParserSubclass.prototype);
+      assert_equals(object_realm(dp), "child window");
+    }, "Subclass constructor in child window");
+
+    test(function() {
+      class ForeignDOMParserSubclass extends child.DOMParser {}
+      var dp = new ForeignDOMParserSubclass();
+      assert_equals(Object.getPrototypeOf(dp), ForeignDOMParserSubclass.prototype);
+      assert_equals(object_realm(dp), "child window");
+    }, "Subclass constructor in parent window with parent class in child window");
+
+    test(function() {
+      var dp = new child.ForeignDOMParserSubclass();
+      assert_equals(Object.getPrototypeOf(dp), child.ForeignDOMParserSubclass.prototype);
+      assert_equals(object_realm(dp), "parent window");
+    }, "Subclass constructor in child window with parent class in parent window");
+
+    test(function() {
+      var badNewTarget = function() {};
+      badNewTarget.prototype = 7;
+
+      var dp = Reflect.construct(child.DOMParser, [], badNewTarget);
+      assert_equals(Object.getPrototypeOf(dp), DOMParser.prototype);
+      assert_equals(object_realm(dp), "child window");
+    }, "Constructor in child window with bad NewTarget from parent window");
+
+    test(function() {
+      var dp = Reflect.construct(DOMParser, [], child.badNewTarget);
+      assert_equals(Object.getPrototypeOf(dp), child.DOMParser.prototype);
+      assert_equals(object_realm(dp), "parent window");
+    }, "Constructor in parent window with bad NewTarget from child window");
+  });
+  iframe.src = "constructors-support.html";
+  document.body.appendChild(iframe);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht
index 37852d9253c..fdae290bc6f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht
@@ -2,6 +2,7 @@
 <title>CSS Reftest Reference</title>
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
+<link rel="mismatch" href="text-indent-wrap-001-ref-inline-margin.xht"/>
 <meta name="flags" content="" />
 <style type="text/css">
 p { margin-left: 100px }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-ref-float.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-ref-float.xht
index 18809f0adbf..8c8c4a5e72d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-ref-float.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-ref-float.xht
@@ -2,7 +2,7 @@
 <title>CSS Reftest Reference</title>
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
-<link rel="match" href="text-indent-wrap-001-ref-inline-margin.xht"/>
+<link rel="mismatch" href="text-indent-wrap-001-notref-block-margin.xht"/>
 <meta name="flags" content="" />
 <style type="text/css">
 i { float: left; height: 0.3em; width: 100px; }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001.xht
index dc4c9b3abd2..31c226631ae 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001.xht
@@ -4,7 +4,6 @@
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
 <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#indentation-prop" />
 <link rel="match" href="text-indent-wrap-001-ref-inline-margin.xht"/>
-<link rel="mismatch" href="text-indent-wrap-001-notref-block-margin.xht"/>
 <meta name="flags" content="" />
 <style type="text/css">
 p { text-indent: 100px }
@@ -15,4 +14,4 @@ span { background: yellow }
 <p><span>This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.</span></p>
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-003.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-003.xht
deleted file mode 100644
index 312211138d2..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-003.xht
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-left-radius using two length values: 40px 20px</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <link rel="match" href="border-bottom-left-radius-004.xht" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify border-bottom-left-radius property set to two length values, works as expected" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-			{
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-left-radius: 40px 20px;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded bottom left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom left corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "40px 20px";
-
-        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-004-ref.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-004-ref.xht
new file mode 100644
index 00000000000..15732f1c068
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-004-ref.xht
@@ -0,0 +1,23 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>border-bottom-left-radius: 48px 28px reference</title>
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
+
+          background: orange;
+          border: 20px solid teal;
+          border-bottom-left-radius: 48px 28px;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-bottom-left-radius of 48px 28px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-004.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-004.xht
index 01ff790f9d7..92bcec5d16f 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-004.xht
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-004.xht
@@ -1,64 +1,25 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-left-radius using one percentage value: 20%</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <link rel="match" href="border-bottom-left-radius-003.xht" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify border-bottom-left-radius property set to percentage value, works as expected" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-            {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-left-radius: 20%;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	<p>
-			There should be a box with a rounded bottom left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom left corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
+  <head>
+    <title>border-bottom-left-radius using one percentage</title>
+    <link rel="match" href="border-bottom-left-radius-004-ref.xht" />
+    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
 
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20%";
-
-        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-       </script>
--->
-    </body>
+          background: orange;
+          border: 20px solid teal;
+          border-bottom-left-radius: 20%;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-bottom-left-radius of 48px 28px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
 </html>
 
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-005-ref.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-005-ref.xht
new file mode 100644
index 00000000000..26621b9a75c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-005-ref.xht
@@ -0,0 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>border-bottom-left-radius: 48px 14px reference</title>
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
+
+          background: orange;
+          border: 20px solid teal;
+          border-bottom-left-radius: 48px 14px;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-bottom-left-radius of 48px 14px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-005.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-005.xht
index 04d8a849238..cc9fee12108 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-005.xht
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-005.xht
@@ -1,63 +1,24 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-left-radius using two percentage values: 20% 30%</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <link rel="match" href="border-bottom-left-radius-006.xht" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify border-bottom-left-radius property set to two precentage value, works as expected" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-left-radius: 20% 30%;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	<p>
-			There should be a box with a rounded bottom left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom left corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
+  <head>
+    <title>border-bottom-left-radius using two percentages</title>
+    <link rel="match" href="border-bottom-left-radius-005-ref.xht" />
+    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
 
-         <!-- PLACE TEST CONTENT FROM HERE -->
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20% 30%";
-
-        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-        </script>
--->
-    </body>
+          background: orange;
+          border: 20px solid teal;
+          border-bottom-left-radius: 20% 10%;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-bottom-left-radius of 48px 14px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
 </html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-006.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-006.xht
deleted file mode 100644
index 8f522644c84..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-006.xht
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-left-radius using two values: 40px 30%</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <link rel="match" href="border-bottom-left-radius-005.xht" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify border-bottom-left-radius property set to two values in different unit, works fine" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-           {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-left-radius: 40px 30%;
-        	}
-        /* ]]> */
-      </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	<p>
-			There should be a box with a rounded bottom left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom left corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "40px 30%";
-
-        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-007.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-007.xht
deleted file mode 100644
index 54bd5bd352f..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-007.xht
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-left-radius using two values: 20% 25px</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <link rel="match" href="border-bottom-left-radius-009.xht" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify border-bottom-left-radius property set to two values in different unit, works fine" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-            {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-left-radius: 20% 25px;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	<p>
-			There should be a box with a rounded bottom left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom left corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20% 25px";
-
-        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-       </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-008.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-008.xht
deleted file mode 100644
index 33876eeb3ba..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-008.xht
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-left-radius using two values: 4em 30%</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify border-bottom-left-radius property set to two values in different units, works fine" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-            {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-left-radius: 4em 30%;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	<p>
-			There should be a box with a rounded bottom left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom left corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "64px 30%";
-
-        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-009.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-009.xht
deleted file mode 100644
index 17df815ff45..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-009.xht
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-left-radius using &quot;inherit&quot;</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <link rel="match" href="border-bottom-left-radius-007.xht" />
-       <meta name="flags" content="" />
-        <meta name="assert" content="To verify if inherit feature works, when assigned to border-bottom-left-radius" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	body
-        	{
-        		border-bottom-left-radius: 20% 25px;
-        	}
-        	div
-            {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-left-radius: inherit;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	<p>
-			There should be a box with a rounded bottom left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom left corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20% 25px";
-
-        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-003.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-003.xht
deleted file mode 100644
index ba13706e1fc..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-003.xht
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-right-radius using two length values: 40px 20px</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <link rel="match" href="border-bottom-right-radius-004.xht" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify border-bottom-right-radius property set with two length values, works as expected" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-            {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-right-radius: 40px 20px;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	 <p>
-			There should be a box with a rounded bottom right corner.
-		 </p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom right corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "40px 20px";
-
-        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-       </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-004-ref.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-004-ref.xht
new file mode 100644
index 00000000000..8589ee96b11
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-004-ref.xht
@@ -0,0 +1,23 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>border-bottom-right-radius: 48px 28px reference</title>
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
+
+          background: orange;
+          border: 20px solid teal;
+          border-bottom-right-radius: 48px 28px;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-bottom-right-radius of 48px 28px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-004.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-004.xht
index 907ed8255e6..d9bbcf95900 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-004.xht
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-004.xht
@@ -1,63 +1,25 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-right-radius using one percentage value: 20%</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <link rel="match" href="border-bottom-right-radius-003.xht" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify border-bottom-right-radius property set with one percentage value, works as expected" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-right-radius: 20%;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	<p>
-			There should be a box with a rounded bottom right corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom right corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
+  <head>
+    <title>border-bottom-right-radius using one percentage</title>
+    <link rel="match" href="border-bottom-right-radius-004-ref.xht" />
+    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
 
-         <!-- PLACE TEST CONTENT FROM HERE -->
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20%";
-
-        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-        </script>
--->
-    </body>
+          background: orange;
+          border: 20px solid teal;
+          border-bottom-right-radius: 20%;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-bottom-right-radius of 48px 28px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
 </html>
 
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-005-ref.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-005-ref.xht
new file mode 100644
index 00000000000..9ed21b72227
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-005-ref.xht
@@ -0,0 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>border-bottom-right-radius: 48px 14px reference</title>
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
+
+          background: orange;
+          border: 20px solid teal;
+          border-bottom-right-radius: 48px 14px;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-bottom-right-radius of 48px 14px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-005.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-005.xht
index 899b3b585b1..899125420fa 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-005.xht
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-005.xht
@@ -1,63 +1,24 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-right-radius using two percentage value: 20% 30%</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <link rel="match" href="border-bottom-right-radius-006.xht" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify border-bottom-right-radius property set with two percentage value works as expected" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-            {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-right-radius: 20% 30%;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	<p>
-			There should be a box with a rounded bottom right corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom right corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
+  <head>
+    <title>border-bottom-right-radius using two percentages</title>
+    <link rel="match" href="border-bottom-right-radius-005-ref.xht" />
+    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
 
-         <!-- PLACE TEST CONTENT FROM HERE -->
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20% 30%";
-
-        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-        </script>
--->
-    </body>
+          background: orange;
+          border: 20px solid teal;
+          border-bottom-right-radius: 20% 10%;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-bottom-right-radius of 48px 14px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
 </html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-006.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-006.xht
deleted file mode 100644
index d47009d1197..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-006.xht
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-right-radius using two value: 40px 30%</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <link rel="match" href="border-bottom-right-radius-005.xht" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify border-bottom-right-radius property set to two value with different unit, works as expected"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-            {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-right-radius: 40px 30%;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	<p>
-			There should be a box with a rounded bottom right corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom right corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "40px 30%";
-
-        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-007.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-007.xht
deleted file mode 100644
index c0d5b733b57..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-007.xht
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-right-radius using two value: 20% 25px</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <link rel="match" href="border-bottom-right-radius-009.xht" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify border-bottom-right-radius property set to two value with different unit, works as expected" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-            {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-right-radius: 20% 25px;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	<p>
-			There should be a box with a rounded bottom right corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom right corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20% 25px";
-
-        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-008.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-008.xht
deleted file mode 100644
index b4b7b6e8f7c..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-008.xht
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-right-radius using two values: 4em 30%</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify border-bottom-right-radius property set to two values with different units, works as expected" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-            {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-right-radius: 4em 30%;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	<p>
-			There should be a box with a rounded bottom right corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom right corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "64px 30%";
-
-        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-009.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-009.xht
deleted file mode 100644
index 633caa5ff24..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-009.xht
+++ /dev/null
@@ -1,67 +0,0 @@
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-bottom-right-radius using &quot;inherit&quot;</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-        <meta http-equiv="Content-Script-Type" content="text/javascript" />
-        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
-        <link rel="match" href="border-bottom-right-radius-007.xht" />
-        <meta name="flags" content="" />
-        <meta name="assert" content="To verify if inherit feature works, when assigned to &quot;border&ndash;bottom&ndash;right&ndash;radius&quot; property" />
-        <style type="text/css">
-        /* <![CDATA[ */
-        	body
-        	{
-        		border-bottom-right-radius: 20% 25px;
-        	}
-        	div
-            {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-bottom-right-radius: inherit;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-    	<p>
-			There should be a box with a rounded bottom right corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-				<ul>
-					<li>PASS if only bottom right corner is rounded.</li>
-					<li>FAIL if the output is not as expected.</li>
-				</ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20% 25px";
-
-        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
-
-        	// if (testResult.pass)
-        	  /* This portion of the code has been removed to ensure that the test case is not automated */
-        	// else
-        		/* This portion of the code has been removed to ensure that the test case is not automated */
-
-
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-
-        /* ]]> */
-       </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-5.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-5.html
deleted file mode 100644
index 4fecfc7bf95..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-5.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>
-        CSS Border and Background: border-image #5 border-image-slice
-    </title>
-    <meta name="assert" content="Negative values for the the border-image-slice property should not be supported" />
-
-    <link rel="author" title="Jérémie Patonnier" href="mailto:jeremie@patonnier.net" / >
-
-    <link rel="help" href="http://www.w3.org/TR/css3-background/#border-image-slice">
-
-    <link rel="match" href="support/reftest-border-image-5.png" />
-
-    <style type="text/css">
-
-        #filler {
-            background-color : #009900;
-            width : 40px;
-            height: 40px;
-        }
-
-        #test {
-            border : 10px solid red;
-            width  : 40px;
-            height : 40px;
-
-            border-image-source: url(support/img-ref-1.png);
-            border-image-slice : -10;
-        }
-
-    </style>
-
-</head>
-<body>
-
-    <p>
-        Pass if the green square have smaller green squares at its corners and <strong>no</strong> red.
-    </p>
-
-    <div id="test">
-        <div id="filler"></div>
-    </div>
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-6-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-6-ref.html
new file mode 100644
index 00000000000..f3e3bb79c05
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-6-ref.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>border-image-6-ref</title>
+
+    <style type="text/css">
+      #container {
+          position: relative;
+
+          width: 60px;
+          height: 60px;
+      }
+
+      #filler {
+          position: absolute;
+          top: 10px;
+          left: 10px;
+
+          width: 40px;
+          height: 40px;
+
+          background-color: #090;
+      }
+
+      .small {
+          position: absolute;
+
+          width: 10px;
+          height: 10px;
+
+          /* orange appears here to make it super-clear if this doesn't load */
+          background: url(support/img-ref-1.png) orange;
+      }
+
+      .small.top {
+          top: 0;
+      }
+
+      .small.bottom {
+          bottom: 0;
+      }
+
+      .small.left {
+          left: 0;
+      }
+
+      .small.right {
+          right: 0;
+      }
+    </style>
+
+  </head>
+  <body>
+
+    <p>
+      Pass if the green square have smaller green squares at its corners and <strong>no</strong> red borders.
+    </p>
+
+    <div id="container">
+      <div id="filler"></div>
+      <div class="small top left"></div>
+      <div class="small top right"></div>
+      <div class="small bottom left"></div>
+      <div class="small bottom right"></div>
+    </div>
+
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-6.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-6.html
index 235d263fac8..bc4cb1386b5 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-6.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-6.html
@@ -11,7 +11,7 @@
 
     <link rel="help" href="http://www.w3.org/TR/css3-background/#border-image-slice">
 
-    <link rel="match" href="support/reftest-border-image-5.png" />
+    <link rel="match" href="border-image-6-ref.html" />
 
     <style type="text/css">
 
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-003.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-003.xht
deleted file mode 100644
index deed8ad6ad1..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-003.xht
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-left-radius using two length values: 40px 20px</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <link rel="match" href="border-top-left-radius-004.xht" />
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify border-top-left-radius property set to two length values, works fine"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-left-radius: 40px 20px;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded top left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "40px 20px";
-
-        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-         /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-004-ref.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-004-ref.xht
new file mode 100644
index 00000000000..b9c9cdac882
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-004-ref.xht
@@ -0,0 +1,23 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>border-top-left-radius: 48px 28px reference</title>
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
+
+          background: orange;
+          border: 20px solid teal;
+          border-top-left-radius: 48px 28px;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-top-left-radius of 48px 28px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-004.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-004.xht
index 31e06fc2397..39e636db6bb 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-004.xht
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-004.xht
@@ -1,62 +1,25 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-left-radius using one percentage value: 20%</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <link rel="match" href="border-top-left-radius-003.xht" />
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify border-top-left-radius property set to one percentage value, works fine"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-left-radius: 20%;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded top left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
+  <head>
+    <title>border-top-left-radius using one percentage</title>
+    <link rel="match" href="border-top-left-radius-004-ref.xht" />
+    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
 
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20%";
-
-        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-        /* ]]> */
-        </script>
--->
-    </body>
+          background: orange;
+          border: 20px solid teal;
+          border-top-left-radius: 20%;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-top-left-radius of 48px 28px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
 </html>
 
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-005-ref.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-005-ref.xht
new file mode 100644
index 00000000000..f1a1935aa50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-005-ref.xht
@@ -0,0 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>border-top-left-radius: 48px 14px reference</title>
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
+
+          background: orange;
+          border: 20px solid teal;
+          border-top-left-radius: 48px 14px;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-top-left-radius of 48px 14px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-005.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-005.xht
index e4044300e66..37af580e067 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-005.xht
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-005.xht
@@ -1,62 +1,24 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-left-radius using two percentage values: 20% 30%</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <link rel="match" href="border-top-left-radius-006.xht" />
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify border-top-left-radius property set to two percentage values, works fine"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-left-radius: 20% 30%;
-        	}
-         /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded top left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
+  <head>
+    <title>border-top-left-radius using two percentages</title>
+    <link rel="match" href="border-top-left-radius-005-ref.xht" />
+    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
 
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-         /* <![CDATA[ */
-        	var expectedBorderRadius = "20% 30%";
-
-        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-        /* ]]> */
-        </script>
--->
-    </body>
+          background: orange;
+          border: 20px solid teal;
+          border-top-left-radius: 20% 10%;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-top-left-radius of 48px 14px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
 </html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-006.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-006.xht
deleted file mode 100644
index dc2b9ebfad7..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-006.xht
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-left-radius using two values: 40px 30%</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <link rel="match" href="border-top-left-radius-005.xht" />
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify border-top-left-radius property set to two values with different units, works fine"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-left-radius: 40px 30%;
-        	}
-         /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded top left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "40px 30%";
-
-        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-        /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-007.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-007.xht
deleted file mode 100644
index 7111e538fe2..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-007.xht
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-left-radius using two values: 20% 25px</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <link rel="match" href="border-top-left-radius-009.xht" />
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify border-top-left-radius property set to two values with different units, works fine"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-left-radius: 20% 25px;
-        	}
-         /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded top left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20% 25px";
-
-        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-         /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-008.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-008.xht
deleted file mode 100644
index 724075cae18..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-008.xht
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-left-radius using two values: 4em 30%</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify border-top-left-radius property set to two values with different units, works fine"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-left-radius: 4em 30%;
-        	}
-         /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-        <p id="testdetails">
-        </p>
-        <p>
-            There should be a box with a rounded top left corner.</p>
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
-
-
-    	<div id="test"></div>
-<!--
-    	<script type="text/javascript">
-         /* <![CDATA[ */
-        	var expectedBorderRadius = "64px 30%";
-
-        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-         /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-009.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-009.xht
deleted file mode 100644
index a5589fa9cc4..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-009.xht
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-left-radius using &quot;inherit&quot;</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <link rel="match" href="border-top-left-radius-007.xht" />
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify inherit feature works, when it is assigned to border-top-left-radius."/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	body
-        	{
-        		border-top-left-radius: 20% 25px;
-        	}
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-left-radius: inherit;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded top left corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20% 25px";
-
-        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-         /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-003.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-003.xht
deleted file mode 100644
index 66ac6caf432..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-003.xht
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-right-radius using two length values: 40px 20px</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <link rel="match" href="border-top-right-radius-004.xht" />
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify border-top-right-radius property set to two length values, works fine"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-right-radius: 40px 20px;
-        	}
-         /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded top right corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-         /* <![CDATA[ */
-        	var expectedBorderRadius = "40px 20px";
-
-        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-        /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-004-ref.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-004-ref.xht
new file mode 100644
index 00000000000..ae031513ae2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-004-ref.xht
@@ -0,0 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>border-top-right-radius: 48px 28px reference</title>
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
+
+          background: orange;
+          border: 20px solid teal;
+          border-top-right-radius: 48px 28px;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-top-right-radius of 48px 28px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-004.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-004.xht
index 35bd6193412..cbedad809ba 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-004.xht
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-004.xht
@@ -1,62 +1,24 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-right-radius using one percentage value: 20%</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <link rel="match" href="border-top-right-radius-003.xht" />
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify border-top-right-radius property set to one percentage value, works fine"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-right-radius: 20%;
-        	}
-         /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded top right corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
+  <head>
+    <title>border-top-right-radius using one percentage</title>
+    <link rel="match" href="border-top-right-radius-004-ref.xht" />
+    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
 
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20%";
-
-        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-         /* ]]> */
-        </script>
--->
-    </body>
+          background: orange;
+          border: 20px solid teal;
+          border-top-right-radius: 20%;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-top-right-radius of 48px 28px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
 </html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-005-ref.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-005-ref.xht
new file mode 100644
index 00000000000..a3303b72c77
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-005-ref.xht
@@ -0,0 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>border-top-right-radius: 48px 14px reference</title>
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
+
+          background: orange;
+          border: 20px solid teal;
+          border-top-right-radius: 48px 14px;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-top-right-radius of 48px 14px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-005.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-005.xht
index f44587cef46..8bd3965de5a 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-005.xht
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-005.xht
@@ -1,62 +1,24 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-right-radius using two percentage values: 20% 30%</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <link rel="match" href="border-top-right-radius-006.xht" />
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify border-top-right-radius property set to two percentage values, works fine"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-right-radius: 20% 30%;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded top right corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
+  <head>
+    <title>border-top-right-radius using two percentages</title>
+    <link rel="match" href="border-top-right-radius-005-ref.xht" />
+    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
+    <style type="text/css">
+      div
+      {
+          width: 200px;
+          height: 100px;
 
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20% 30%";
-
-        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-        /* ]]> */
-        </script>
--->
-    </body>
+          background: orange;
+          border: 20px solid teal;
+          border-top-right-radius: 20% 10%;
+      }
+    </style>
+  </head>
+  <body>
+    <p>The box should have a border-top-right-radius of 48px 14px. The
+        horizontal radius should therefore be clearly larger than the
+        vertical radius.</p>
+    <div></div>
+  </body>
 </html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-006.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-006.xht
deleted file mode 100644
index be52dadfc55..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-006.xht
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-right-radius using two values: 40px 30%</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <link rel="match" href="border-top-right-radius-005.xht" />
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify border-top-right-radius property set to two values with different units, works fine"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-right-radius: 40px 30%;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded top right corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "40px 30%";
-
-        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-         /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-007.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-007.xht
deleted file mode 100644
index 5a00a05da79..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-007.xht
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-right-radius using two values: 20% 25px</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <link rel="match" href="border-top-right-radius-009.xht" />
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify border-top-right-radius property set to two values with different units, works fine"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-right-radius: 20% 25px;
-        	}
-        /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded top right corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "20% 25px";
-
-        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-         /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-008.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-008.xht
deleted file mode 100644
index 0fa67dbc92d..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-008.xht
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-right-radius using two values: 4em 30%</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify border-top-right-radius property set to two values with different units, works fine"/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-right-radius: 4em 30%;
-        	}
-         /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-         <p id="testdetails">
-        </p>
-        <p>
-            There should be a box with a rounded top right corner.</p>
-        <ul>
-            <li>PASS if only top right corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
-
-
-    	<div id="test"></div>
-<!--
-    	<script type="text/javascript">
-        /* <![CDATA[ */
-        	var expectedBorderRadius = "64px 30%";
-
-        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-         /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-009.xht b/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-009.xht
deleted file mode 100644
index ec954d6003d..00000000000
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-009.xht
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: Borders. Border-top-right-radius using &quot;inherit&quot;</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta http-equiv="Content-Style-Type" content="text/css"/>
-        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
-        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
-        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
-        <link rel="match" href="border-top-right-radius-007.xht" />
-        <meta name="flags" content=""/>
-        <meta name="assert" content="To verify inherit feature works, when it is assigned to border-top-right-radius."/>
-        <style type="text/css">
-        /* <![CDATA[ */
-        	body
-        	{
-        		border-top-right-radius: 20% 25px;
-        	}
-        	div
-          {
-        		border:2px solid #a1a1a1;
-        		background:#dddddd;
-        		width:200px;
-        		height: 100px;
-        		border-top-right-radius: inherit;
-        	}
-         /* ]]> */
-        </style>
-<!--
-        <script type="text/javascript" src="js/css3_test_helper.js"></script>
--->
-    </head>
-    <body>
-		<p>
-			There should be a box with a rounded top right corner.
-		</p>
-		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
-        <ul>
-            <li>PASS if only top left corner is rounded.</li>
-            <li>FAIL if the output is not as expected.</li>
-        </ul>
-
-         <!-- PLACE TEST CONTENT FROM HERE -->
-
-    	<div id="test"></div>
-    	<p><br/></p>
-<!--
-    	<script type="text/javascript">
-         /* <![CDATA[ */
-        	var expectedBorderRadius = "20% 25px";
-
-        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
-
-        	/* if (testResult.pass)
-        	  // This portion of the code has been removed to ensure that the test case is not automated
-        	else {
-        		// This portion of the code has been removed to ensure that the test case is not automated
-          } */
-
-          if (top.FrameEnabled)	top.fnLog(testResult);
-        /* ]]> */
-        </script>
--->
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-slice-invalid.html b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-slice-invalid.html
index c62a43d6b37..6b6e0e9d610 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-slice-invalid.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-slice-invalid.html
@@ -20,6 +20,8 @@ test_invalid_value("border-image-slice", "-1 2% fill");
 test_invalid_value("border-image-slice", "1 2 3 4 5");
 
 test_invalid_value("border-image-slice", "1% fill 2%");
+
+test_invalid_value("border-image-slice", "-10");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/reftest-border-image-5.png b/tests/wpt/web-platform-tests/css/css-backgrounds/support/reftest-border-image-5.png
deleted file mode 100644
index 01087f13dc1..00000000000
Binary files a/tests/wpt/web-platform-tests/css/css-backgrounds/support/reftest-border-image-5.png and /dev/null differ
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-003.html
index a76e4449fb2..b1a6619363a 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-003.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-003.html
@@ -10,7 +10,7 @@
 <!-- This makes sure that we only see green if the flex items are sized correctly -->
 <div style="position: absolute; width: 100px; height: 100px; background: green;"></div>
 
-<div style="display: flex; flex-direction: column; flex-wrap: wrap; width: 100px; height: 100px; line-height: 20x;">
+<div style="display: flex; flex-direction: column; flex-wrap: wrap; width: 100px; height: 100px; line-height: 20px;">
   <div style="background-color: red; height: 100px;">
     <!-- These zero-height divs give the flex item has a min-content width of
          50px and a max-content width of 250px -->
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-004.html
new file mode 100644
index 00000000000..679f62ae3e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-004.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<link rel="author" title="Google LLC" href="http://www.google.com" />
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#cross-sizing" />
+<title>css-flexbox: Tests that we size items in a wrapping column flexbox as fit-content</title>
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht" />
+<meta name="assert" content="The flexbox here should have one flex line, 100px by 100px. The flex items overflow but are transparent." />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<!-- This makes sure that we only see green if the flex items are sized correctly -->
+<div style="position: absolute; width: 100px; height: 100px; background: green;"></div>
+
+<div style="display: flex; flex-direction: column; flex-wrap: wrap; width: 125px; height: 100px; line-height: 20px;">
+  <!-- The margin-right means that the flex item should be only 100px wide,
+       because it will use the available width of 125px minus the 25px margin. -->
+  <div style="background-color: red; height: 100px; margin-right: 25px;">
+    <!-- These zero-height divs give the flex item has a min-content width of
+         50px and a max-content width of 250px -->
+    <div style="width: 50px; display: inline-block;"></div>
+    <div style="width: 50px; display: inline-block;"></div>
+    <div style="width: 50px; display: inline-block;"></div>
+    <div style="width: 50px; display: inline-block;"></div>
+    <div style="width: 50px; display: inline-block;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-conic.html b/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-conic.html
index d1608c0cfe8..8a7331d08ff 100644
--- a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-conic.html
+++ b/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-conic.html
@@ -2,7 +2,7 @@
 <title>Conic gradient with a two position color stop</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#color-stop-syntax">
 <meta name="assert" content="A color stop with two positions create a hard transition">
-<link rel="match" href="support/100x100-blue-green.html">
+<link rel="match" href="reference/100x100-blue-green.html">
 <style>
 #target {
   width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-linear.html b/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-linear.html
index 2e1f9ed7be4..c739a2a71d2 100644
--- a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-linear.html
+++ b/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-linear.html
@@ -2,7 +2,7 @@
 <title>Linear gradient with a two position color stop</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#color-stop-syntax">
 <meta name="assert" content="A color stop with two positions create a hard transition">
-<link rel="match" href="support/100x100-blue-green.html">
+<link rel="match" href="reference/100x100-blue-green.html">
 <style>
 #target {
   width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-radial.html b/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-radial.html
index 74e25df788b..4b4fd95c4ec 100644
--- a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-radial.html
+++ b/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-radial.html
@@ -2,7 +2,7 @@
 <title>Radial gradient with a two position color stop</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#color-stop-syntax">
 <meta name="assert" content="A color stop with two positions create a hard transition">
-<link rel="match" href="support/100x100-blue-green.html">
+<link rel="match" href="reference/100x100-blue-green.html">
 <style>
 #target {
   width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-images/support/100x100-blue-green.html b/tests/wpt/web-platform-tests/css/css-images/reference/100x100-blue-green.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-images/support/100x100-blue-green.html
rename to tests/wpt/web-platform-tests/css/css-images/reference/100x100-blue-green.html
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-001.xml b/tests/wpt/web-platform-tests/css/css-namespaces/prefix-001.xml
index c40bb7f1132..eb717139e1d 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-001.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/prefix-001.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
-  <link rel="match" href="reftest/ref-lime-1.xml"/>
+  <link rel="match" href="reference/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: prefix case-sensitivity</title>
   <style>
    @namespace Foo "y";
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-002.xml b/tests/wpt/web-platform-tests/css/css-namespaces/prefix-002.xml
index cc78f3f0aaf..49ca7c0a9e1 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-002.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/prefix-002.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
-  <link rel="match" href="reftest/ref-lime-1.xml"/>
+  <link rel="match" href="reference/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: empty string prefix (Explicit element namespace)</title>
   <style>
    @namespace foo "";
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-003.xml b/tests/wpt/web-platform-tests/css/css-namespaces/prefix-003.xml
index 0b6f3293de1..2f23ad4c061 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-003.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/prefix-003.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
-  <link rel="match" href="reftest/ref-lime-1-generic.xml"/>
+  <link rel="match" href="reference/ref-lime-1-generic.xml"/>
   <title>CSS Namespaces Test Suite: empty string prefix (Implied element namespace)</title>
   <style>
    @namespace foo "";
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-004.xml b/tests/wpt/web-platform-tests/css/css-namespaces/prefix-004.xml
index 70c3bd1ed9b..596d4637f9b 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-004.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/prefix-004.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
-  <link rel="match" href="reftest/ref-lime-2-generic.xml"/>
+  <link rel="match" href="reference/ref-lime-2-generic.xml"/>
   <title>CSS Namespaces Test Suite: empty string default namespace</title>
   <style>
    @namespace "";
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-005.xml b/tests/wpt/web-platform-tests/css/css-namespaces/prefix-005.xml
index 458b5aa3ebc..5f7c3cad3d9 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-005.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/prefix-005.xml
@@ -4,7 +4,7 @@
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="author" title="Boris Zbarsky" href="https://bugzilla.mozilla.org/show_bug.cgi?id=458381#c4"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
-  <link rel="match" href="reftest/ref-lime-2-generic.xml"/>
+  <link rel="match" href="reference/ref-lime-2-generic.xml"/>
   <title>CSS Namespaces Test Suite: no default namespace</title>
   <style>
    @namespace x "test";
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-006.xml b/tests/wpt/web-platform-tests/css/css-namespaces/prefix-006.xml
index 0bf59915a45..3cc0ab40f3a 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-006.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/prefix-006.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
-  <link rel="match" href="reftest/ref-lime-2.xml"/>
+  <link rel="match" href="reference/ref-lime-2.xml"/>
   <title>CSS Namespaces Test Suite: no prefix</title>
   <style>
    @namespace "test";
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-1-block.xml b/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-1-block.xml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-1-block.xml
rename to tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-1-block.xml
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-1-generic.xml b/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-1-generic.xml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-1-generic.xml
rename to tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-1-generic.xml
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-1.xml b/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-1.xml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-1.xml
rename to tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-1.xml
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-2-generic.xml b/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-2-generic.xml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-2-generic.xml
rename to tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-2-generic.xml
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-2.xml b/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-2.xml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-2.xml
rename to tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-2.xml
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-3.xml b/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-3.xml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-3.xml
rename to tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-3.xml
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-5.xml b/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-5.xml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-5.xml
rename to tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-5.xml
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-6.xml b/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-6.xml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-namespaces/reftest/ref-lime-6.xml
rename to tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-6.xml
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/scope-001.xml b/tests/wpt/web-platform-tests/css/css-namespaces/scope-001.xml
index bed4171efa1..5271096a964 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/scope-001.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/scope-001.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#scope"/>
-  <link rel="match" href="reftest/ref-lime-1.xml"/>
+  <link rel="match" href="reference/ref-lime-1.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: scope &lt;style></title>
   <style>
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/scope-002.xml b/tests/wpt/web-platform-tests/css/css-namespaces/scope-002.xml
index d25eb81780c..ff5a2fec118 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/scope-002.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/scope-002.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#scope"/>
-  <link rel="match" href="reftest/ref-lime-1.xml"/>
+  <link rel="match" href="reference/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: scope @import</title>
   <style>
    test { background:lime }
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-001.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-001.xml
index 01c57e07c7c..83efb665b66 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-001.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-001.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-1-block.xml"/>
+  <link rel="match" href="reference/ref-lime-1-block.xml"/>
   <title>CSS Namespaces Test Suite: @namespace case-insensitivity</title>
   <style>
    @NAmespace x "http://www.w3.org/1999/xhtml";
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-002.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-002.xml
index cb04b9c8d6b..30fa8aece35 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-002.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-002.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-1-block.xml"/>
+  <link rel="match" href="reference/ref-lime-1-block.xml"/>
   <title>CSS Namespaces Test Suite: @namespace syntax with escapes</title>
   <style>
    @\N\000041 mes\pac\65  x "http://www.w3.org/1999/xhtml";
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-003.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-003.xml
index 256286eeb12..1b2eb5f9c08 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-003.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-003.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-5.xml"/>
+  <link rel="match" href="reference/ref-lime-5.xml"/>
   <title>CSS Namespaces Test Suite: @namespace default namespace syntax</title>
   <style>
    *|test { background:red }
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-004.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-004.xml
index 335bca98d24..c4ce372b09c 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-004.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-004.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-1.xml"/>
+  <link rel="match" href="reference/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: @namespace url() with escape</title>
   <style>
    @namespace u\00072l("test");
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-005.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-005.xml
index 164bea1ece4..9d6b0abe945 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-005.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-005.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-5.xml"/>
+  <link rel="match" href="reference/ref-lime-5.xml"/>
   <title>CSS Namespaces Test Suite: @namespace string and url() syntax</title>
   <style>
    test { background:red }
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-006.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-006.xml
index 1c5975a852a..09ff0d5916e 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-006.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-006.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-1.xml"/>
+  <link rel="match" href="reference/ref-lime-1.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: invalid ordering of @namespace and @import</title>
   <style>
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-007.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-007.xml
index 6022d1c7e1c..0c651f17d78 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-007.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-007.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-1.xml"/>
+  <link rel="match" href="reference/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: @namespace and @charset</title>
   <link rel="stylesheet" href="support/syntax-007.css"/>
  </head>
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-008.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-008.xml
index 4cb4e233979..20284e2247c 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-008.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-008.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-2.xml"/>
+  <link rel="match" href="reference/ref-lime-2.xml"/>
   <title>CSS Namespaces Test Suite: escapes in prefix</title>
   <style>
    @namespace \72x url("test");
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-009.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-009.xml
index 9f69fec67e0..edf2f4c9b48 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-009.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-009.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-1.xml"/>
+  <link rel="match" href="reference/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: escaped vertical bar in qualified name</title>
   <style>
    @namespace x "test";
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-010.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-010.xml
index e175a7bd3ce..06b280da792 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-010.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-010.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-3.xml"/>
+  <link rel="match" href="reference/ref-lime-3.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: duplicate @namespace declarations</title>
   <style>
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-011.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-011.xml
index e60cbe115ea..7d137fc7a54 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-011.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-011.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-6.xml"/>
+  <link rel="match" href="reference/ref-lime-6.xml"/>
   <title>CSS Namespaces Test Suite: string comparison (no URI resolving)</title>
   <style>
    @namespace url("http://example.com/");
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-012.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-012.xml
index 557ba5065ba..43f211b4dd2 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-012.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-012.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-3.xml"/>
+  <link rel="match" href="reference/ref-lime-3.xml"/>
   <title>CSS Namespaces Test Suite: whitespace and comment handling</title>
   <style>
    test { background:red }
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-013.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-013.xml
index 983e2e62d92..a7c63e43e09 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-013.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-013.xml
@@ -4,7 +4,7 @@
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-5.xml"/>
+  <link rel="match" href="reference/ref-lime-5.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: @namespace error handling</title>
   <style>
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-014.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-014.xml
index d57d8991cc8..1bdfc265ef6 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-014.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-014.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-3.xml"/>
+  <link rel="match" href="reference/ref-lime-3.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: @namespace and invalid at-rules</title>
   <style>
diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-015.xml b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-015.xml
index 4460ddf559b..d39eb8b3a48 100644
--- a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-015.xml
+++ b/tests/wpt/web-platform-tests/css/css-namespaces/syntax-015.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reftest/ref-lime-1.xml"/>
+  <link rel="match" href="reference/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: invalid URI</title>
   <style>
    @namespace x url("test");
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html
new file mode 100644
index 00000000000..80b2260cbbe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+div {
+  width: 10ch;
+  border: 2px solid blue;
+  line-height: 1;
+}
+.ideo > div {
+  width: 1em;
+}
+</style>
+<body>
+  <section>
+    <div>12345<br>67890</div>
+    <div>12345<br>67890</div>
+    <div>12345<br>67890</div>
+    <div>12345<br>67890</div>
+
+    <div>12345<br>67890</div>
+    <div>12345<br>67890</div>
+  </section>
+
+  <section class="ideo">
+    <div>国<br>国</div>
+    <div>国<br>国</div>
+    <div>国<br>国</div>
+    <div>国<br>国</div>
+  </section>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-wrap-after-nowrap-001.html b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-wrap-after-nowrap-001.html
new file mode 100644
index 00000000000..a484f1cf916
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-wrap-after-nowrap-001.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Break opportunities after nowrap</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property">
+<link rel="match" href="reference/white-space-wrap-after-nowrap-001-ref.html">
+<meta name="assert" content="This test ensures that break opportunities after nowrap can break lines.">
+<style>
+div {
+  width: 10ch;
+  border: 2px solid blue;
+  line-height: 1;
+}
+.ideo > div {
+  width: 1em;
+}
+.normal {
+  white-space: normal;
+}
+.nowrap {
+  white-space: nowrap;
+}
+</style>
+<body>
+  <section>
+    <div><span class="nowrap">12345</span> 67890</div>
+    <div><span class="nowrap">12345</span><span class="normal"> 67890</span></div>
+    <div><span class="nowrap">12345<span class="normal"> 67890</span></span></div>
+    <div class="nowrap">12345<span class="normal"> 67890</span></div>
+
+    <div class="nowrap"><span class="normal"><span class="nowrap">12345</span> </span>67890</div>
+    <div class="nowrap"><span class="normal"><span class="nowrap">12345 </span> </span>67890</div>
+  </section>
+
+  <section class="ideo">
+    <div><span class="nowrap">国</span>国</div>
+    <div><span class="nowrap">国</span><span class="normal">国</span></div>
+    <div><span class="nowrap">国<span class="normal">国</span></span></div>
+    <div class="nowrap">国<span class="normal">国</span></div>
+  </section>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reftest/transform-3d-rotateY-stair-above-ref-001.xht b/tests/wpt/web-platform-tests/css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-transforms/reftest/transform-3d-rotateY-stair-above-ref-001.xht
rename to tests/wpt/web-platform-tests/css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reftest/transform-applies-to-001-ref.xht b/tests/wpt/web-platform-tests/css/css-transforms/reference/transform-applies-to-001-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-transforms/reftest/transform-applies-to-001-ref.xht
rename to tests/wpt/web-platform-tests/css/css-transforms/reference/transform-applies-to-001-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reftest/transform-applies-to-002-ref.xht b/tests/wpt/web-platform-tests/css/css-transforms/reference/transform-applies-to-002-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-transforms/reftest/transform-applies-to-002-ref.xht
rename to tests/wpt/web-platform-tests/css/css-transforms/reference/transform-applies-to-002-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reftest/transform-origin-01-ref.html b/tests/wpt/web-platform-tests/css/css-transforms/reference/transform-origin-01-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-transforms/reftest/transform-origin-01-ref.html
rename to tests/wpt/web-platform-tests/css/css-transforms/reference/transform-origin-01-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-rotateY-stair-above-001.xht b/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-rotateY-stair-above-001.xht
index 41d8979c455..9a3aac888fe 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-rotateY-stair-above-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-rotateY-stair-above-001.xht
@@ -4,7 +4,7 @@
   <title>CSS Test: rotateY with perspective produces a trapezoid</title>
   <link rel="author" title="Apple Inc." href="http://www.apple.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-transforms-2/#3d-transform-rendering"/>
-  <link rel="match" href="reftest/transform-3d-rotateY-stair-above-ref-001.xht"/>
+  <link rel="match" href="reference/transform-3d-rotateY-stair-above-ref-001.xht"/>
   <meta name="flags" content="" />
   <meta name="assert" content="A rotateY transform with perspective
   should result in a trapezoid."/>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-rotateY-stair-below-001.xht b/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-rotateY-stair-below-001.xht
index 5a1c1d46998..5224da27fd4 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-rotateY-stair-below-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-rotateY-stair-below-001.xht
@@ -4,7 +4,7 @@
   <title>CSS Test: rotateY with perspective produces a trapezoid</title>
   <link rel="author" title="Apple Inc." href="http://www.apple.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-transforms-2/#3d-transform-rendering"/>
-  <link rel="match" href="reftest/transform-3d-rotateY-stair-above-ref-001.xht"/>
+  <link rel="match" href="reference/transform-3d-rotateY-stair-above-ref-001.xht"/>
   <meta name="flags" content="" />
   <meta name="assert" content="A rotateY transform with perspective
   should result in a trapezoid."/>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-applies-to-001.xht b/tests/wpt/web-platform-tests/css/css-transforms/transform-applies-to-001.xht
index 0036e8e1acf..09bb196d533 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-applies-to-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-applies-to-001.xht
@@ -4,7 +4,7 @@
   <title>CSS Test: transform applied to elements with 'display' set to 'block'</title>
   <link rel="author" title="Apple Inc." href="http://www.apple.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property"/>
-  <link rel="match" href="reftest/transform-applies-to-001-ref.xht"/>
+  <link rel="match" href="reference/transform-applies-to-001-ref.xht"/>
   <meta name="flags" content="" />
   <meta name="assert" content="The 'transform' property applies to elements with 'display' set to 'block'."/>
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-applies-to-002.xht b/tests/wpt/web-platform-tests/css/css-transforms/transform-applies-to-002.xht
index 80715d379d4..186d0b74a3a 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-applies-to-002.xht
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-applies-to-002.xht
@@ -4,7 +4,7 @@
   <title>CSS Test: Transform does not apply to non-replaced inline elements</title>
   <link rel="author" title="Apple Inc." href="http://www.apple.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property"/>
-  <link rel="match" href="reftest/transform-applies-to-002-ref.xht"/>
+  <link rel="match" href="reference/transform-applies-to-002-ref.xht"/>
   <meta name="flags" content="ahem" />
   <meta name="assert" content="The 'transform' property does not apply to non-replaced inline elements."/>
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box-mutation.html b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box-mutation.html
index ae602e3509d..1f0dfd01bb9 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box-mutation.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box-mutation.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <title>transform-box: fill-box, shape mutated</title>
-<link rel="match" href="support/greensquare200x200.html">
+<link rel="match" href="reference/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 #target {
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box.html b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box.html
index eaea02a5dfe..7e9b133aead 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>transform-box: fill-box</title>
-<link rel="match" href="support/greensquare200x200.html">
+<link rel="match" href="reference/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 svg {
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/support/greensquare200x200.html b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/reference/greensquare200x200.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/support/greensquare200x200.html
rename to tests/wpt/web-platform-tests/css/css-transforms/transform-box/reference/greensquare200x200.html
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/value-changed.html b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/value-changed.html
index 825403ef7b6..4aca90a61c1 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/value-changed.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/value-changed.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <title>transform-box: value change from 'view-box' to 'fill-box'</title>
-<link rel="match" href="support/greensquare200x200.html">
+<link rel="match" href="reference/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <p>There should be a green 200x200 rectangle below, and no red.</p>
 <svg width="400" height="200">
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-mutation.html b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-mutation.html
index 0d4a0ecdc2f..d0c85fd59d3 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-mutation.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-mutation.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <title>transform-box: view-box, viewport mutated</title>
-<link rel="match" href="support/greensquare200x200.html">
+<link rel="match" href="reference/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 #target {
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-nested.html b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-nested.html
index 7f59777f15b..9e7fc17e2a5 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-nested.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-nested.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>transform-box: view-box, relative to nested viewport</title>
-<link rel="match" href="support/greensquare200x200.html">
+<link rel="match" href="reference/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 #target {
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-viewbox-nested.html b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-viewbox-nested.html
index 4f667e20ba8..fc072363e8a 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-viewbox-nested.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-viewbox-nested.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>transform-box: view-box, relative to viewport defined by nested viewBox</title>
-<link rel="match" href="support/greensquare200x200.html">
+<link rel="match" href="reference/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 #target {
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-viewbox.html b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-viewbox.html
index cd040c1ba33..a69d8092f64 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-viewbox.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-viewbox.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>transform-box: view-box, relative to viewport defined by viewBox</title>
-<link rel="match" href="support/greensquare200x200.html">
+<link rel="match" href="reference/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 #target {
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box.html b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box.html
index 3345467c904..0b5eeda5438 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>transform-box: view-box</title>
-<link rel="match" href="support/greensquare200x200.html">
+<link rel="match" href="reference/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 svg {
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-01.html b/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-01.html
index c1b6f29a52a..d7e1cd34d45 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-01.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-01.html
@@ -4,7 +4,7 @@
     <title>CSS Test: SVG Transform using transform-origin</title>
     <link rel="author" title="CJ Gammon" href="mailto:gammon@adobe.com">
     <link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-origin-property">
-    <link rel="match" href="reftest/transform-origin-01-ref.html">
+    <link rel="match" href="reference/transform-origin-01-ref.html">
     <meta name="assert" content="If only one value is specified, the second value is assumed to be 'center'">
     <style type="text/css">
         #container{
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-origin-001.html b/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-origin-001.html
index 1a81bc1d4da..791d4bd136c 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-origin-001.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-origin-001.html
@@ -9,9 +9,6 @@
     the same as 'perspective-origin: top left', different from no
     'perspective-origin', and different from no perspective or no transform.">
     <link rel="match" href="transform3d-perspective-origin-ref.html">
-    <link rel="mismatch" href="transform3d-rotatex-perspective-001.html">
-    <link rel="mismatch" href="transform3d-rotatex-ref.html">
-    <link rel="mismatch" href="transform-lime-square-ref.html">
   </head>
   <body>
     <div style="perspective: 1000px; perspective-origin: 0 0;">
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-origin-ref.html b/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-origin-ref.html
index dd0026b8fc1..e174d7596f7 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-origin-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-origin-ref.html
@@ -4,6 +4,7 @@
     <title>CSS Reftest Reference</title>
     <link rel="author" title="Matt Woodrow" href="mailto:mwoodrow@mozilla.com">
     <link rel="author" title="Aryeh Gregor" href="mailto:ayg@aryeh.name">
+    <link rel="mismatch" href="transform3d-rotatex-ref.html">
   </head>
   <body>
     <div style="perspective: 1000px; perspective-origin: top left;">
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotate3d-001.html b/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotate3d-001.html
index 185346c333c..93a46f1c6ab 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotate3d-001.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotate3d-001.html
@@ -9,7 +9,6 @@
     <meta name="assert" content="This tests that rotate3d(1, 0, 0, 45deg) is
     the same as rotatex(45deg).">
     <link rel="match" href="transform3d-rotatex-ref.html">
-    <link rel="mismatch" href="transform-lime-square-ref.html">
   </head>
   <body>
     <div style="transform: rotate3d(1, 0, 0, 45deg); width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-001.html b/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-001.html
index 47ad10b388c..2f75f15cd0d 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-001.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-001.html
@@ -10,7 +10,6 @@
     <meta name="assert" content="This tests that rotatex(45deg) rotatey(360deg)
     rotatex(360deg) is the same as rotatex(45deg).">
     <link rel="match" href="transform3d-rotatex-ref.html">
-    <link rel="mismatch" href="transform-lime-square-ref.html">
   </head>
   <body>
     <div style="transform: rotatex(45deg) rotatey(360deg) rotatex(360deg);
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-002.html b/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-002.html
index 472d0aa854b..ecf6a2f8d57 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-002.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-002.html
@@ -11,7 +11,6 @@
     when combined with rotatex() (i.e., is not equivalent to simply omitting
     the perspective).">
     <link rel="mismatch" href="transform3d-rotatex-ref.html">
-    <link rel="mismatch" href="transform-lime-square-ref.html">
   </head>
   <body>
     <div style="perspective: 1000px;">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reftest/writing-mode-vertical-lr-002-ref.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-vertical-lr-002-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-writing-modes/reftest/writing-mode-vertical-lr-002-ref.xht
rename to tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-vertical-lr-002-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reftest/writing-mode-vertical-rl-001-ref.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-vertical-rl-001-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-writing-modes/reftest/writing-mode-vertical-rl-001-ref.xht
rename to tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-vertical-rl-001-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reftest/writing-mode-vertical-rl-002-ref.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-vertical-rl-002-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-writing-modes/reftest/writing-mode-vertical-rl-002-ref.xht
rename to tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-vertical-rl-002-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-lr-002.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-lr-002.xht
index 8086296174c..291dff96d39 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-lr-002.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-lr-002.xht
@@ -6,7 +6,7 @@
     <link rel="author" title="Yoshifumi Kawai" href="mailto:kawai@est.co.jp" />
     <link rel="reviewer" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
     <link rel="help" title="CSS3 Writing modes: 3.1. Block Flow Direction: the 'writing-mode' property" href="http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode" />
-    <link rel="match" href="reftest/writing-mode-vertical-lr-002-ref.xht"/>
+    <link rel="match" href="reference/writing-mode-vertical-lr-002-ref.xht"/>
     <meta name="flags" content="ahem" />
     <meta content="This tests the block flow direction. The writing mode is vertical, and the block flow is left to right." />
     <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-001.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-001.xht
index 0a7839cba0c..5a5c7bf2a4e 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-001.xht
@@ -6,7 +6,7 @@
     <link rel="author" title="Yoshifumi Kawai" href="mailto:kawai@est.co.jp" />
     <link rel="reviewer" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
     <link rel="help" title="CSS3 Writing modes: 3.1. Block Flow Direction: the 'writing-mode' property" href="http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode" />
-    <link rel="match" href="reftest/writing-mode-vertical-rl-001-ref.xht"/>
+    <link rel="match" href="reference/writing-mode-vertical-rl-001-ref.xht"/>
     <meta name="flags" content="ahem" />
     <meta content="This tests the block flow direction. The writing mode is vertical, and the block flow is right to left." />
     <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-002.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-002.xht
index f2d3ab078f9..ac77d439d75 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-002.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-002.xht
@@ -6,7 +6,7 @@
     <link rel="author" title="Yoshifumi Kawai" href="mailto:kawai@est.co.jp" />
     <link rel="reviewer" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
     <link rel="help" title="CSS3 Writing modes: 3.1. Block Flow Direction: the 'writing-mode' property" href="http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode" />
-    <link rel="match" href="reftest/writing-mode-vertical-rl-002-ref.xht"/>
+    <link rel="match" href="reference/writing-mode-vertical-rl-002-ref.xht"/>
     <meta name="flags" content="ahem" />
     <meta content="This tests the block flow direction. The writing mode is vertical, and the block flow is right to left." />
     <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg b/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg
index 7880fcf501c..7ef2655dc91 100644
--- a/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg
+++ b/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg
@@ -3,7 +3,7 @@
      xmlns:h="http://www.w3.org/1999/xhtml">
   <metadata>
     <title>&lt;image&gt; embedding SVG image with viewport units</title>
-    <h:link rel="match" href="support/green-rect-100x100.svg"/>
+    <h:link rel="match" href="reference/green-rect-100x100.svg"/>
   </metadata>
   <image xlink:href="data:image/svg+xml,&lt;svg xmlns='http://www.w3.org/2000/svg'&gt;&lt;rect style='width: 50vw; height: 50vh' fill='green'/&gt;&lt;/svg&gt;"
          width="200" height="200"/>
diff --git a/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-viewport-units.svg b/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-viewport-units.svg
index 6feb54b392f..653856de21b 100644
--- a/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-viewport-units.svg
+++ b/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-viewport-units.svg
@@ -3,7 +3,7 @@
      xmlns:h="http://www.w3.org/1999/xhtml">
   <metadata>
     <title>&lt;image&gt; embedding SVG image with viewport units</title>
-    <h:link rel="match" href="support/green-rect-100x100.svg"/>
+    <h:link rel="match" href="reference/green-rect-100x100.svg"/>
   </metadata>
   <image xlink:href="data:image/svg+xml,&lt;svg xmlns='http://www.w3.org/2000/svg'&gt;&lt;rect width='50vw' height='50vh' fill='green'/&gt;&lt;/svg&gt;"
          width="200" height="200"/>
diff --git a/tests/wpt/web-platform-tests/svg/embedded/support/green-rect-100x100.svg b/tests/wpt/web-platform-tests/svg/embedded/reference/green-rect-100x100.svg
similarity index 100%
rename from tests/wpt/web-platform-tests/svg/embedded/support/green-rect-100x100.svg
rename to tests/wpt/web-platform-tests/svg/embedded/reference/green-rect-100x100.svg
diff --git a/tests/wpt/web-platform-tests/svg/shapes/reftests/disabled-shapes-01.svg b/tests/wpt/web-platform-tests/svg/shapes/reftests/disabled-shapes-01.svg
index d92eea169a6..3091ca7b015 100644
--- a/tests/wpt/web-platform-tests/svg/shapes/reftests/disabled-shapes-01.svg
+++ b/tests/wpt/web-platform-tests/svg/shapes/reftests/disabled-shapes-01.svg
@@ -4,7 +4,7 @@
     <h:link rel="help" href="https://svgwg.org/svg2-draft/shapes.html#RectElement"/>
     <h:link rel="help" href="https://svgwg.org/svg2-draft/shapes.html#CircleElement"/>
     <h:link rel="help" href="https://svgwg.org/svg2-draft/shapes.html#EllipseElement"/>
-    <h:link rel="match" href="support/empty.svg"/>
+    <h:link rel="match" href="reference/empty.svg"/>
   </metadata>
   <g stroke="red" stroke-width="100">
     <g transform="translate(50, 50)">
diff --git a/tests/wpt/web-platform-tests/svg/shapes/reftests/support/empty.svg b/tests/wpt/web-platform-tests/svg/shapes/reftests/reference/empty.svg
similarity index 100%
rename from tests/wpt/web-platform-tests/svg/shapes/reftests/support/empty.svg
rename to tests/wpt/web-platform-tests/svg/shapes/reftests/reference/empty.svg
diff --git a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
index d2e5df85526..f3e49662c1f 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
@@ -335,7 +335,7 @@ class SourceFile(object):
     def name_is_reference(self):
         """Check if the file name matches the conditions for the file to
         be a reference file (not a reftest)"""
-        return "/reference/" in self.url or "/reftest/" in self.url or bool(reference_file_re.search(self.name))
+        return "/reference/" in self.url or bool(reference_file_re.search(self.name))
 
     @property
     def markup_type(self):
diff --git a/tests/wpt/web-platform-tests/tools/requirements_flake8.txt b/tests/wpt/web-platform-tests/tools/requirements_flake8.txt
index 325988ee4e5..b134409614c 100644
--- a/tests/wpt/web-platform-tests/tools/requirements_flake8.txt
+++ b/tests/wpt/web-platform-tests/tools/requirements_flake8.txt
@@ -1,4 +1,4 @@
-flake8==3.7.6
+flake8==3.7.7
 pycodestyle==2.5.0
 pyflakes==2.1.0
 pep8-naming==0.7.0
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
index 29be09bb3c9..52ebc95e84a 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -356,7 +356,7 @@ class UserPrompt(object):
     @text.setter
     @command
     def text(self, value):
-        body = {"value": list(value)}
+        body = {"text": value}
         self.session.send_session_command("POST", "alert/text", body=body)
 
 
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/animate.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/animate.html
index cbec1b0c57a..b7c590e67a0 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/animate.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/animate.html
@@ -202,6 +202,39 @@ test(t => {
   assert_equals(anim.playState, 'running');
 }, 'Element.animate() calls play on the Animation');
 
+promise_test(async t => {
+  const div = createDiv(t);
+
+  let gotTransition = false;
+  div.addEventListener('transitionrun', () => {
+    gotTransition = true;
+  });
+
+  // Setup transition start point.
+  div.style.transition = 'opacity 100s';
+  getComputedStyle(div).opacity;
+
+  // Update specified style but don't flush style.
+  div.style.opacity = '0.5';
+
+  // Trigger a new animation at the same time.
+  const anim = div.animate({ opacity: [0, 1] }, 100 * MS_PER_SEC);
+
+  // If Element.animate() produces a style change event it will have triggered
+  // a transition.
+  //
+  // If it does NOT produce a style change event, the animation will override
+  // the before-change style and after-change style such that a transition is
+  // never triggered.
+
+  // Wait for the animation to start and then for one more animation
+  // frame to give the transitionrun event a chance to be dispatched.
+  await anim.ready;
+  await waitForAnimationFrames(1);
+
+  assert_false(gotTransition, 'A transition should NOT have been triggered');
+}, 'Element.animate() does NOT trigger a style change event');
+
 // Tests on CSSPseudoElement
 
 test(t => {
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html
index 430aa4c15cc..d834d04efe6 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html
@@ -197,5 +197,33 @@ test(t => {
 }, 'Returns animations based on dynamic changes to individual'
    + ' animations\' current time');
 
+promise_test(async t => {
+  const div = createDiv(t);
+  const watcher = EventWatcher(t, div, 'transitionrun');
+
+  // Create a covering animation to prevent transitions from firing after
+  // calling getAnimations().
+  const coveringAnimation = new Animation(
+    new KeyframeEffect(div, { opacity: [0, 1] }, 100 * MS_PER_SEC)
+  );
+
+  // Setup transition start point.
+  div.style.transition = 'opacity 100s';
+  getComputedStyle(div).opacity;
+
+  // Update specified style but don't flush style.
+  div.style.opacity = '0.5';
+
+  // Fetch animations
+  div.getAnimations();
+
+  // Play the covering animation to ensure that only the call to
+  // getAnimations() has a chance to trigger transitions.
+  coveringAnimation.play();
+
+  // If getAnimations() flushed style, we should get a transitionrun event.
+  await watcher.wait_for('transitionrun');
+}, 'Triggers a style change event');
+
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/style-change-events.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/style-change-events.html
new file mode 100644
index 00000000000..080458660eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/style-change-events.html
@@ -0,0 +1,307 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Animation interface: style change events</title>
+<link rel="help"
+      href="https://drafts.csswg.org/web-animations-1/#model-liveness">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+// Test that each property defined in the Animation interface does not produce
+// style change events.
+//
+// There are two types of tests:
+//
+//   PlayAnimationTest
+//
+//     For properties that are able to cause the Animation to start affecting
+//     the target CSS property.
+//
+//     This function takes either:
+//
+//     (a) A function that simply "plays" that passed-in Animation (i.e. makes
+//         it start affecting the target CSS property.
+//
+//     (b) An object with the following format:
+//
+//         {
+//            setup: elem => { /* return Animation */ }
+//            test: animation => { /* play |animation| */ }
+//         }
+//
+//     If the latter form is used, the setup function should return an Animation
+//     that does NOT (yet) have an in-effect AnimationEffect that affects the
+//     'opacity' property. Otherwise, the transition we use to detect if a style
+//     change event has occurred will never have a chance to be triggered (since
+//     the animated style will clobber both before-change and after-change
+//     style).
+//
+//     Examples of valid animations:
+//
+//       - An animation that is idle, or finished but without a fill mode.
+//       - An animation with an effect that that does not affect opacity.
+//
+//  UsePropertyTest
+//
+//    For properties that cannot cause the Animation to start affecting the
+//    target CSS property.
+//
+//    The shape of the parameter to the UsePropertyTest is identical to the
+//    PlayAnimationTest. The only difference is that the function (or 'test'
+//    function of the object format is used) does not need to play the
+//    animation, but simply needs to get/set the property under test.
+
+const PlayAnimationTest = testFuncOrObj => {
+  let test, setup;
+
+  if (typeof testFuncOrObj === 'function') {
+    test = testFuncOrObj;
+  } else {
+    test = testFuncOrObj.test;
+    if (typeof testFuncOrObj.setup === 'function') {
+      setup = testFuncOrObj.setup;
+    }
+  }
+
+  if (!setup) {
+    setup = elem =>
+      new Animation(
+        new KeyframeEffect(elem, { opacity: [0, 1] }, 100 * MS_PER_SEC)
+      );
+  }
+
+  return { test, setup };
+};
+
+const UsePropertyTest = testFuncOrObj => {
+  const { setup, test } = PlayAnimationTest(testFuncOrObj);
+
+  let coveringAnimation;
+  return {
+    setup: elem => {
+      coveringAnimation = new Animation(
+        new KeyframeEffect(elem, { opacity: [0, 1] }, 100 * MS_PER_SEC)
+      );
+
+      return setup(elem);
+    },
+    test: animation => {
+      test(animation);
+      coveringAnimation.play();
+    },
+  };
+};
+
+const tests = {
+  id: UsePropertyTest(animation => (animation.id = 'yer')),
+  get effect() {
+    let effect;
+    return PlayAnimationTest({
+      setup: elem => {
+        // Create a new effect and animation but don't associate them yet
+        effect = new KeyframeEffect(
+          elem,
+          { opacity: [0.5, 1] },
+          100 * MS_PER_SEC
+        );
+        return elem.animate(null, 100 * MS_PER_SEC);
+      },
+      test: animation => {
+        // Read the effect
+        animation.effect;
+
+        // Assign the effect
+        animation.effect = effect;
+      },
+    });
+  },
+  timeline: PlayAnimationTest({
+    setup: elem => {
+      // Create a new animation with no timeline
+      const animation = new Animation(
+        new KeyframeEffect(elem, { opacity: [0.5, 1] }, 100 * MS_PER_SEC),
+        null
+      );
+      // Set the hold time so that once we assign a timeline it will begin to
+      // play.
+      animation.currentTime = 0;
+
+      return animation;
+    },
+    test: animation => {
+      // Get the timeline
+      animation.timeline;
+
+      // Play the animation by setting the timeline
+      animation.timeline = document.timeline;
+    },
+  }),
+  startTime: PlayAnimationTest(animation => {
+    // Get the startTime
+    animation.startTime;
+
+    // Play the animation by setting the startTime
+    animation.startTime = document.timeline.currentTime;
+  }),
+  currentTime: PlayAnimationTest(animation => {
+    // Get the currentTime
+    animation.currentTime;
+
+    // Play the animation by setting the currentTime
+    animation.currentTime = 0;
+  }),
+  playbackRate: UsePropertyTest(animation => {
+    // Get and set the playbackRate
+    animation.playbackRate = animation.playbackRate * 1.1;
+  }),
+  playState: UsePropertyTest(animation => animation.playState),
+  pending: UsePropertyTest(animation => animation.pending),
+  ready: UsePropertyTest(animation => animation.ready),
+  finished: UsePropertyTest(animation => {
+    // Get the finished Promise
+    animation.finished;
+  }),
+  onfinish: UsePropertyTest(animation => {
+    // Get the onfinish member
+    animation.onfinish;
+
+    // Set the onfinish menber
+    animation.onfinish = () => {};
+  }),
+  oncancel: UsePropertyTest(animation => {
+    // Get the oncancel member
+    animation.oncancel;
+
+    // Set the oncancel menber
+    animation.oncancel = () => {};
+  }),
+  cancel: UsePropertyTest({
+    // Animate _something_ just to make the test more interesting
+    setup: elem => elem.animate({ color: ['green', 'blue'] }, 100 * MS_PER_SEC),
+    test: animation => {
+      animation.cancel();
+    },
+  }),
+  finish: PlayAnimationTest({
+    setup: elem =>
+      new Animation(
+        new KeyframeEffect(
+          elem,
+          { opacity: [0.5, 1] },
+          {
+            duration: 100 * MS_PER_SEC,
+            fill: 'both',
+          }
+        )
+      ),
+    test: animation => {
+      animation.finish();
+    },
+  }),
+  play: PlayAnimationTest(animation => animation.play()),
+  pause: PlayAnimationTest(animation => {
+    // Pause animation -- this will cause the animation to transition from the
+    // 'idle' state to the 'paused' (but pending) state with hold time zero.
+    animation.pause();
+  }),
+  updatePlaybackRate: UsePropertyTest(animation => {
+    animation.updatePlaybackRate(1.1);
+  }),
+  // We would like to use a PlayAnimationTest here but reverse() is async and
+  // doesn't start applying its result until the animation is ready.
+  reverse: UsePropertyTest({
+    setup: elem => {
+      // Create a new animation and seek it to the end so that it no longer
+      // affects style (since it has no fill mode).
+      const animation = elem.animate({ opacity: [0.5, 1] }, 100 * MS_PER_SEC);
+      animation.finish();
+      return animation;
+    },
+    test: animation => {
+      animation.reverse();
+    },
+  }),
+  get ['Animation constructor']() {
+    let originalElem;
+    return UsePropertyTest({
+      setup: elem => {
+        originalElem = elem;
+        // Return a dummy animation so the caller has something to wait on
+        return elem.animate(null);
+      },
+      test: () =>
+        new Animation(
+          new KeyframeEffect(
+            originalElem,
+            { opacity: [0.5, 1] },
+            100 * MS_PER_SEC
+          )
+        ),
+    });
+  },
+};
+
+// Check that each enumerable property and the constructor follow the
+// expected behavior with regards to triggering style change events.
+const properties = [
+  ...Object.keys(Animation.prototype),
+  'Animation constructor',
+];
+
+test(() => {
+  for (const property of Object.keys(tests)) {
+    assert_in_array(
+      property,
+      properties,
+      `Test property '${property}' should be one of the properties on ` +
+        ' Animation'
+    );
+  }
+}, 'All property keys are recognized');
+
+for (const key of properties) {
+  promise_test(async t => {
+    assert_own_property(tests, key, `Should have a test for '${key}' property`);
+    const { setup, test } = tests[key];
+
+    // Setup target element
+    const div = createDiv(t);
+    let gotTransition = false;
+    div.addEventListener('transitionrun', () => {
+      gotTransition = true;
+    });
+
+    // Setup animation
+    const animation = setup(div);
+
+    // Setup transition start point
+    div.style.transition = 'opacity 100s';
+    getComputedStyle(div).opacity;
+
+    // Update specified style but don't flush
+    div.style.opacity = '0.5';
+
+    // Trigger the property
+    test(animation);
+
+    // If the test function produced a style change event it will have triggered
+    // a transition.
+
+    // Wait for the animation to start and then for at least one animation
+    // frame to give the transitionrun event a chance to be dispatched.
+    assert_true(
+      typeof animation.ready !== 'undefined',
+      'Should have a valid animation to wait on'
+    );
+    await animation.ready;
+    await waitForAnimationFrames(1);
+
+    assert_false(gotTransition, 'A transition should NOT have been triggered');
+  }, `Animation.${key} does NOT trigger a style change event`);
+}
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Document/getAnimations.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Document/getAnimations.html
index 6b8534bf035..f5df980cc05 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Document/getAnimations.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Document/getAnimations.html
@@ -64,26 +64,56 @@ test(t => {
                 'elements in this document');
 }, 'Test document.getAnimations with null target');
 
-async_test(t => {
+promise_test(async t => {
   const iframe = document.createElement('iframe');
 
-  iframe.addEventListener("load", t.step_func_done(function() {
-    const div = createDiv(t, iframe.contentDocument)
-    const effect = new KeyframeEffect(div, null, 100 * MS_PER_SEC);
-    const anim = new Animation(effect, document.timeline);
-    anim.play();
-
-    // The animation's timeline is from the main document, but the effect's
-    // target element is part of the iframe document and that is what matters
-    // for getAnimations.
-    assert_equals(document.getAnimations().length, 0);
-    assert_equals(iframe.contentDocument.getAnimations().length, 1);
-    anim.finish();
-  }));
+  const eventWatcher = new EventWatcher(t, iframe, ['load']);
 
   document.body.appendChild(iframe);
-  t.add_cleanup(function() { document.body.removeChild(iframe); });
+  t.add_cleanup(() => { document.body.removeChild(iframe); });
+
+  await eventWatcher.wait_for('load');
+
+  const div = createDiv(t, iframe.contentDocument)
+  const effect = new KeyframeEffect(div, null, 100 * MS_PER_SEC);
+  const anim = new Animation(effect, document.timeline);
+  anim.play();
+
+  // The animation's timeline is from the main document, but the effect's
+  // target element is part of the iframe document and that is what matters
+  // for getAnimations.
+  assert_equals(document.getAnimations().length, 0);
+  assert_equals(iframe.contentDocument.getAnimations().length, 1);
+  anim.finish();
 }, 'Test document.getAnimations for elements inside same-origin iframes');
 
+promise_test(async t => {
+  const div = createDiv(t);
+  const watcher = EventWatcher(t, div, 'transitionrun');
+
+  // Create a covering animation to prevent transitions from firing after
+  // calling getAnimations().
+  const coveringAnimation = new Animation(
+    new KeyframeEffect(div, { opacity: [0, 1] }, 100 * MS_PER_SEC)
+  );
+
+  // Setup transition start point.
+  div.style.transition = 'opacity 100s';
+  getComputedStyle(div).opacity;
+
+  // Update specified style but don't flush style.
+  div.style.opacity = '0.5';
+
+  // Fetch animations
+  document.getAnimations();
+
+  // Play the covering animation to ensure that only the call to
+  // getAnimations() has a chance to trigger transitions.
+  coveringAnimation.play();
+
+  // If getAnimations() flushed style, we should get a transitionrun event.
+  await watcher.wait_for('transitionrun');
+}, 'Triggers a style change event');
+
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/DocumentTimeline/style-change-events.html b/tests/wpt/web-platform-tests/web-animations/interfaces/DocumentTimeline/style-change-events.html
new file mode 100644
index 00000000000..c1607e6fb92
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/DocumentTimeline/style-change-events.html
@@ -0,0 +1,92 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>DocumentTimeline interface: style change events</title>
+<link rel="help"
+      href="https://drafts.csswg.org/web-animations-1/#model-liveness">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+// NOTE: If more members are added to the DocumentTimeline interface it might be
+// better to rewrite these test in the same style as:
+//
+//  web-animations/interfaces/Animation/style-change-events.html
+//  web-animations/interfaces/KeyframeEffect/style-change-events.html
+
+promise_test(async t => {
+  const div = createDiv(t);
+
+  let gotTransition = false;
+  div.addEventListener('transitionrun', () => {
+    gotTransition = true;
+  });
+
+  // Create a covering animation but don't play it yet.
+  const coveringAnimation = new Animation(
+    new KeyframeEffect(div, { opacity: [0, 1] }, 100 * MS_PER_SEC)
+  );
+
+  // Setup transition start point.
+  div.style.transition = 'opacity 100s';
+  getComputedStyle(div).opacity;
+
+  // Update specified style but don't flush style.
+  div.style.opacity = '0.5';
+
+  // Get the currentTime
+  document.timeline.currentTime;
+
+  // Run the covering animation
+  coveringAnimation.play();
+
+  // If getting DocumentTimeline.currentTime produced a style change event it
+  // will trigger a transition. Otherwise, the covering animation will cause
+  // the before-change and after-change styles to be the same such that no
+  // transition is triggered on the next restyle.
+
+  // Wait for a couple of animation frames to give the transitionrun event
+  // a chance to be dispatched.
+  await waitForAnimationFrames(2);
+
+  assert_false(gotTransition, 'A transition should NOT have been triggered');
+}, 'DocumentTimeline.currentTime does NOT trigger a style change event');
+
+promise_test(async t => {
+  const div = createDiv(t);
+
+  let gotTransition = false;
+  div.addEventListener('transitionrun', () => {
+    gotTransition = true;
+  });
+
+  // Create a covering animation but don't play it yet.
+  const coveringAnimation = new Animation(
+    new KeyframeEffect(div, { opacity: [0, 1] }, 100 * MS_PER_SEC)
+  );
+
+  // Setup transition start point.
+  div.style.transition = 'opacity 100s';
+  getComputedStyle(div).opacity;
+
+  // Update specified style but don't flush style.
+  div.style.opacity = '0.5';
+
+  // Create a new DocumentTimeline
+  new DocumentTimeline();
+
+  // Run the covering animation
+  coveringAnimation.play();
+
+  // Wait for a couple of animation frames to give the transitionrun event
+  // a chance to be dispatched.
+  await waitForAnimationFrames(2);
+
+  assert_false(gotTransition, 'A transition should NOT have been triggered');
+}, 'DocumentTimeline constructor does NOT trigger a style change event');
+
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/style-change-events.html b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/style-change-events.html
new file mode 100644
index 00000000000..af53d2d5e14
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/style-change-events.html
@@ -0,0 +1,233 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>KeyframeEffect interface: style change events</title>
+<link rel="help"
+      href="https://drafts.csswg.org/web-animations-1/#model-liveness">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+// Test that each property defined in the KeyframeEffect interface does not
+// produce style change events.
+//
+// There are two types of tests:
+//
+//   MakeInEffectTest
+//
+//     For properties that are able to cause the KeyframeEffect to start
+//     affecting the CSS 'opacity' property.
+//
+//     This function takes either:
+//
+//     (a) A function that makes the passed-in KeyframeEffect affect the
+//         'opacity' property.
+//
+//     (b) An object with the following format:
+//
+//         {
+//            setup: elem => { /* return Animation */ }
+//            test: effect => { /* make |effect| affect 'opacity' */ }
+//         }
+//
+//     If the latter form is used, the setup function should return an Animation
+//     whose KeyframeEffect does NOT (yet) affect the 'opacity' property (or is
+//     NOT yet in-effect). Otherwise, the transition we use to detect if a style
+//     change event has occurred will never have a chance to be triggered (since
+//     the animated style will clobber both before-change and after-change
+//     style).
+//
+//  UsePropertyTest
+//
+//    For properties that cannot cause the KeyframeEffect to start affecting the
+//    CSS 'opacity' property.
+//
+//    The shape of the parameter to the UsePropertyTest is identical to the
+//    MakeInEffectTest. The only difference is that the function (or 'test'
+//    function of the object format is used) does not need to make the
+//    KeyframeEffect affect the CSS 'opacity' property, but simply needs to
+//    get/set the property under test.
+
+const MakeInEffectTest = testFuncOrObj => {
+  let test, setup;
+
+  if (typeof testFuncOrObj === 'function') {
+    test = testFuncOrObj;
+  } else {
+    test = testFuncOrObj.test;
+    if (typeof testFuncOrObj.setup === 'function') {
+      setup = testFuncOrObj.setup;
+    }
+  }
+
+  if (!setup) {
+    setup = elem =>
+      elem.animate({ color: ['blue', 'green'] }, 100 * MS_PER_SEC);
+  }
+
+  return { test, setup };
+};
+
+const UsePropertyTest = testFuncOrObj => {
+  const { test, setup } = MakeInEffectTest(testFuncOrObj);
+
+  let coveringAnimation;
+  return {
+    setup: elem => {
+      coveringAnimation = new Animation(
+        new KeyframeEffect(elem, { opacity: [0, 1] }, 100 * MS_PER_SEC)
+      );
+
+      return setup(elem);
+    },
+    test: effect => {
+      test(effect);
+      coveringAnimation.play();
+    },
+  };
+};
+
+const tests = {
+  getTiming: UsePropertyTest(effect => effect.getTiming()),
+  getComputedTiming: UsePropertyTest(effect => effect.getComputedTiming()),
+  updateTiming: MakeInEffectTest({
+    // Initially put the effect in its before phase (with no fill mode)...
+    setup: elem =>
+      elem.animate(
+        { opacity: [0.5, 1] },
+        {
+          duration: 100 * MS_PER_SEC,
+          delay: 100 * MS_PER_SEC,
+        }
+      ),
+    // ... so that when the delay is removed, it begins to affect the opacity.
+    test: effect => {
+      effect.updateTiming({ delay: 0 });
+    },
+  }),
+  get target() {
+    let targetElem;
+    return MakeInEffectTest({
+      setup: (elem, t) => {
+        targetElem = elem;
+        const targetB = createDiv(t);
+        return targetB.animate({ opacity: [0.5, 1] }, 100 * MS_PER_SEC);
+      },
+      test: effect => {
+        effect.target = targetElem;
+      },
+    });
+  },
+  iterationComposite: UsePropertyTest(effect => {
+    // Get iterationComposite
+    effect.iterationComposite;
+
+    // Set iterationComposite
+    effect.iterationComposite = 'accumulate';
+  }),
+  composite: UsePropertyTest(effect => {
+    // Get composite
+    effect.composite;
+
+    // Set composite
+    effect.composite = 'add';
+  }),
+  getKeyframes: UsePropertyTest(effect => effect.getKeyframes()),
+  setKeyframes: MakeInEffectTest(effect =>
+    effect.setKeyframes({ opacity: [0.5, 1] })
+  ),
+  get ['KeyframeEffect constructor']() {
+    let originalElem;
+    let animation;
+    return UsePropertyTest({
+      setup: elem => {
+        originalElem = elem;
+        // Return a dummy animation so the caller has something to wait on
+        return elem.animate(null);
+      },
+      test: () =>
+        new KeyframeEffect(
+          originalElem,
+          { opacity: [0.5, 1] },
+          100 * MS_PER_SEC
+        ),
+    });
+  },
+  get ['KeyframeEffect copy constructor']() {
+    let effectToClone;
+    return UsePropertyTest({
+      setup: elem => {
+        effectToClone = new KeyframeEffect(
+          elem,
+          { opacity: [0.5, 1] },
+          100 * MS_PER_SEC
+        );
+        // Return a dummy animation so the caller has something to wait on
+        return elem.animate(null);
+      },
+      test: () => new KeyframeEffect(effectToClone),
+    });
+  },
+};
+
+// Check that each enumerable property and the constructors follow the
+// expected behavior with regards to triggering style change events.
+const properties = [
+  ...Object.keys(AnimationEffect.prototype),
+  ...Object.keys(KeyframeEffect.prototype),
+  'KeyframeEffect constructor',
+  'KeyframeEffect copy constructor',
+];
+
+test(() => {
+  for (const property of Object.keys(tests)) {
+    assert_in_array(
+      property,
+      properties,
+      `Test property '${property}' should be one of the properties on ` +
+      ' KeyframeEffect'
+    );
+  }
+}, 'All property keys are recognized');
+
+for (const key of properties) {
+  promise_test(async t => {
+    assert_own_property(tests, key, `Should have a test for '${key}' property`);
+    const { setup, test } = tests[key];
+
+    // Setup target element
+    const div = createDiv(t);
+    let gotTransition = false;
+    div.addEventListener('transitionrun', () => {
+      gotTransition = true;
+    });
+
+    // Setup animation
+    const animation = setup(div, t);
+
+    // Setup transition start point
+    div.style.transition = 'opacity 100s';
+    getComputedStyle(div).opacity;
+
+    // Update specified style but don't flush
+    div.style.opacity = '0.5';
+
+    // Trigger the property
+    test(animation.effect);
+
+    // If the test function produced a style change event it will have triggered
+    // a transition.
+
+    // Wait for the animation to start and then for at least one animation
+    // frame to give the transitionrun event a chance to be dispatched.
+    await animation.ready;
+    await waitForAnimationFrames(1);
+
+    assert_false(gotTransition, 'A transition should NOT have been triggered');
+  }, `KeyframeEffect.${key} does NOT trigger a style change event`);
+}
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py
index 2497219509d..8efc8f0dd6b 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py
@@ -1,7 +1,4 @@
-import json
-import pytest
-import types
-
+from tests.support import platform_name
 from tests.support.inline import inline
 from tests.support.asserts import assert_error, assert_success
 from tests.support.sync import Poll
@@ -25,33 +22,36 @@ def test_no_browsing_context(session, closed_window):
 def test_get_current_url_matches_location(session):
     url = session.execute_script("return window.location.href")
 
-    result = get_current_url(session)
-    assert_success(result, url)
+    response = get_current_url(session)
+    assert_success(response, url)
 
 
 def test_get_current_url_payload(session):
     session.start()
 
-    result = get_current_url(session)
-    assert result.status == 200
-    assert isinstance(result.body["value"], basestring)
+    response = get_current_url(session)
+    assert response.status == 200
+    assert isinstance(response.body["value"], basestring)
 
 
 def test_get_current_url_special_pages(session):
     session.url = "about:blank"
 
-    result = get_current_url(session)
-    assert_success(result, "about:blank")
+    response = get_current_url(session)
+    assert_success(response, "about:blank")
 
 
-# TODO(ato): This test requires modification to pass on Windows
-def test_get_current_url_file_protocol(session):
+def test_get_current_url_file_protocol(session, server_config):
     # tests that the browsing context remains the same
     # when navigated privileged documents
-    session.url = "file:///"
+    path = server_config["doc_root"]
+    if platform_name == "windows":
+        path = path.replace("\\", "/")
+    url = u"file:///{}".format(path)
+    session.url = url
 
-    result = get_current_url(session)
-    assert_success(result, "file:///")
+    response = get_current_url(session)
+    assert_success(response, url)
 
 
 # TODO(ato): Test for http:// and https:// protocols.
@@ -60,27 +60,30 @@ def test_get_current_url_file_protocol(session):
 
 
 def test_set_malformed_url(session):
-    result = session.transport.send("POST",
-                                    "session/%s/url" % session.session_id,
-                                    {"url": "foo"})
+    response = session.transport.send(
+        "POST",
+        "session/%s/url" % session.session_id, {"url": "foo"})
+
+    assert_error(response, "invalid argument")
 
-    assert_error(result, "invalid argument")
 
 def test_get_current_url_after_modified_location(session):
     start = get_current_url(session)
     session.execute_script("window.location.href = 'about:blank#wd_test_modification'")
     Poll(session, message="URL did not change").until(
-         lambda s: get_current_url(s).body["value"] != start.body["value"])
+        lambda s: get_current_url(s).body["value"] != start.body["value"])
+
+    response = get_current_url(session)
+    assert_success(response, "about:blank#wd_test_modification")
 
-    result = get_current_url(session)
-    assert_success(result, "about:blank#wd_test_modification")
 
 def test_get_current_url_nested_browsing_context(session, create_frame):
     session.url = "about:blank#wd_from_within_frame"
     session.switch_frame(create_frame())
 
-    result = get_current_url(session)
-    assert_success(result, "about:blank#wd_from_within_frame")
+    response = get_current_url(session)
+    assert_success(response, "about:blank#wd_from_within_frame")
+
 
 def test_get_current_url_nested_browsing_contexts(session):
     session.url = two_frames_doc
@@ -92,5 +95,5 @@ def test_get_current_url_nested_browsing_contexts(session):
     inner_frame = session.find.css("iframe", all=False)
     session.switch_frame(inner_frame)
 
-    result = get_current_url(session)
-    assert_success(result, top_level_url)
+    response = get_current_url(session)
+    assert_success(response, top_level_url)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/navigate_to/navigate.py b/tests/wpt/web-platform-tests/webdriver/tests/navigate_to/navigate.py
index e478e10b76b..2ae67d40bcf 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/navigate_to/navigate.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/navigate_to/navigate.py
@@ -1,3 +1,4 @@
+from tests.support import platform_name
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_success
@@ -25,3 +26,17 @@ def test_null_response_value(session):
 def test_no_browsing_context(session, closed_window):
     response = navigate_to(session, "foo")
     assert_error(response, "no such window")
+
+
+def test_file_protocol(session, server_config):
+    # tests that the browsing context remains the same
+    # when navigated privileged documents
+    path = server_config["doc_root"]
+    if platform_name == "windows":
+        path = path.replace("\\", "/")
+    url = u"file:///{}".format(path)
+
+    response = navigate_to(session, url)
+    assert_success(response)
+
+    assert session.url == url
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py b/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py
index 6dbc03f9401..3ed5621c084 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py
@@ -3,6 +3,7 @@ import pytest
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_success
+from tests.support.authentication import basic_authentication
 from tests.support.inline import inline
 
 
@@ -55,7 +56,14 @@ def test_alert_element_not_interactable(session, dialog_type):
     assert_error(response, "element not interactable")
 
 
-@pytest.mark.parametrize("text", ["", "Federer", " Fed erer "])
+def test_alert_unsupported_operation(session):
+    session.url = basic_authentication()
+
+    response = send_alert_text(session, "Federer")
+    assert_error(response, "unsupported operation")
+
+
+@pytest.mark.parametrize("text", ["", "Federer", " Fed erer ", "Fed\terer"])
 def test_send_alert_text(session, page, text):
     send_response = send_alert_text(session, text)
     assert_success(send_response)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/authentication.py b/tests/wpt/web-platform-tests/webdriver/tests/support/authentication.py
new file mode 100644
index 00000000000..6f880f3c851
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/authentication.py
@@ -0,0 +1,28 @@
+import urllib
+
+
+def basic_authentication(username=None, password=None, protocol="http"):
+    from .fixtures import server_config, url
+    build_url = url(server_config())
+
+    query = {}
+
+    return build_url("/webdriver/tests/support/authentication.py",
+                     query=urllib.urlencode(query),
+                     protocol=protocol)
+
+
+def main(request, response):
+    user = request.auth.username
+    password = request.auth.password
+
+    if user == "user" and password == "password":
+        return "Authentication done"
+
+    realm = "test"
+    if "realm" in request.GET:
+        realm = request.GET.first("realm")
+
+    return ((401, "Unauthorized"),
+            [("WWW-Authenticate", 'Basic realm="' + realm + '"')],
+            "Please login with credentials 'user' and 'password'")
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
index 1ff5f54015e..0b25df26190 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
@@ -601,7 +601,7 @@ function createPeerConnectionWithCleanup(t) {
 async function createTrackAndStreamWithCleanup(t, kind = 'audio') {
   let constraints = {};
   constraints[kind] = true;
-  const stream = await navigator.mediaDevices.getUserMedia(constraints);
+  const stream = await getNoiseStream(constraints);
   const [track] = stream.getTracks();
   t.add_cleanup(() => track.stop());
   return [track, stream];
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-remote-track-mute.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-remote-track-mute.https.html
index 095fe50e305..c4c6b4fd041 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-remote-track-mute.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-remote-track-mute.https.html
@@ -50,9 +50,13 @@ promise_test(async t => {
   exchangeIceCandidates(pc1, pc2);
 
   const e = await exchangeOfferAndListenToOntrack(t, pc1, pc2);
+  // Need to wait for the initial unmute event before renegotiating, otherwise
+  // there will be no transition from unmuted->muted.
+  const muteWatcher = new EventWatcher(t, e.track, ['mute', 'unmute']);
+  const unmutePromise = muteWatcher.wait_for('unmute');
   await exchangeAnswer(pc1, pc2);
+  await unmutePromise;
 
-  const muteWatcher = new EventWatcher(t, e.track, ['mute']);
   const mutePromise = muteWatcher.wait_for('mute');
   localTransceiver.direction = 'inactive';
   await exchangeOfferAnswer(pc1, pc2);
@@ -88,8 +92,13 @@ promise_test(async t => {
   exchangeIceCandidates(pc1, pc2);
 
   const e = await exchangeOfferAndListenToOntrack(t, pc1, pc2);
+  // Need to wait for the initial unmute event before closing, otherwise
+  // there will be no transition from unmuted->muted.
+  const muteWatcher = new EventWatcher(t, e.track, ['mute', 'unmute']);
+  const unmutePromise = muteWatcher.wait_for('unmute');
   await exchangeAnswer(pc1, pc2);
-  const muteWatcher = new EventWatcher(t, e.track, ['mute']);
+  await unmutePromise;
+
   const mutePromise = muteWatcher.wait_for('mute');
   pc2.close();
   await mutePromise;
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-removeTrack.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-removeTrack.https.html
index a955db6895a..ffb3fececc4 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-removeTrack.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-removeTrack.https.html
@@ -61,6 +61,7 @@
 
   promise_test(async t => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const stream = await navigator.mediaDevices.getUserMedia({audio: true});
     t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
     const [track] = stream.getTracks();
@@ -92,6 +93,7 @@
    */
   promise_test(async t => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const stream = await navigator.mediaDevices.getUserMedia({audio: true});
     t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
     const [track] = stream.getTracks();
@@ -99,6 +101,7 @@
     const { sender } = transceiver;
 
     const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc2.close());
     assert_throws('InvalidAccessError', () => pc2.removeTrack(sender));
   }, 'addTransceiver - Calling removeTrack on different connection should throw InvalidAccessError');
 
@@ -112,6 +115,7 @@
     const sender = pc.addTrack(track, stream);
 
     const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc2.close());
     assert_throws('InvalidAccessError', () => pc2.removeTrack(sender));
   }, 'addTrack - Calling removeTrack on different connection should throw InvalidAccessError')
 
@@ -121,6 +125,7 @@
    */
   promise_test(async t => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const stream = await navigator.mediaDevices.getUserMedia({audio: true});
     t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
     const [track] = stream.getTracks();
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html
index 7c565dd1c3b..4e9568f0bcd 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html
@@ -142,6 +142,7 @@
       if (!remoteStreams.includes(e.streams[0]))
         remoteStreams.push(e.streams[0]);
     };
+    exchangeIceCandidates(caller, callee);
     await exchangeOfferAnswer(caller, callee);
     assert_equals(remoteStreams.length, 1, 'One remote stream created.');
     assert_equals(remoteStreams[0].getTracks()[0].id,
@@ -176,6 +177,7 @@
       if (!remoteStreams.includes(e.streams[0]))
         remoteStreams.push(e.streams[0]);
     };
+    exchangeIceCandidates(caller, callee);
     await exchangeOfferAnswer(caller, callee);
     assert_equals(remoteStreams.length, 1, 'One remote stream created.');
     const onaddtrackPromise =
@@ -247,6 +249,7 @@
     t.add_cleanup(() => localStream.getTracks().forEach(track => track.stop()));
     const sender = caller.addTrack(localStream.getTracks()[0], localStream);
     const ontrackPromise = addEventListenerPromise(t, callee, 'track');
+    exchangeIceCandidates(caller, callee);
     await exchangeOfferAnswer(caller, callee);
     await ontrackPromise;
     assert_equals(callee.getReceivers().length, 1, 'One receiver created.');
@@ -269,6 +272,7 @@
       assert_equals(e.streams.length, 1);
       return e.streams[0];
     });
+    exchangeIceCandidates(caller, callee);
     await exchangeOfferAnswer(caller, callee);
     const remoteStream = await ontrackPromise;
     const remoteTrack = remoteStream.getTracks()[0];
@@ -297,6 +301,7 @@
       assert_equals(e.streams.length, 1);
       return e.streams[0];
     });
+    exchangeIceCandidates(caller, callee);
     await exchangeOfferAnswer(caller, callee);
     const remoteStream = await ontrackPromise;
     const remoteTrack = remoteStream.getTracks()[0];
@@ -320,13 +325,19 @@
         await getNoiseStream({audio: true});
     t.add_cleanup(() => localStream.getTracks().forEach(track => track.stop()));
     const sender = caller.addTrack(localStream.getTracks()[0], localStream);
-    const ontrackPromise = addEventListenerPromise(t, callee, 'track', e => {
-      assert_equals(e.streams.length, 1);
-      return e.streams[0];
+    exchangeIceCandidates(caller, callee);
+    const e = await exchangeOfferAndListenToOntrack(t, caller, callee);
+    const remoteTrack = e.track;
+
+    // Need to wait for unmute, otherwise there's no event for the transition
+    // back to muted.
+    const onunmutePromise =
+        addEventListenerPromise(t, remoteTrack, 'unmute', () => {
+      assert_false(remoteTrack.muted);
     });
-    await exchangeOfferAnswer(caller, callee);
-    const remoteStream = await ontrackPromise;
-    const remoteTrack = remoteStream.getTracks()[0];
+    await exchangeAnswer(caller, callee);
+    await onunmutePromise;
+
     const onmutePromise =
         addEventListenerPromise(t, remoteTrack, 'mute', () => {
       assert_true(remoteTrack.muted);
@@ -350,9 +361,19 @@
       assert_equals(e.streams.length, 1);
       return e.streams[0];
     });
-    await exchangeOfferAnswer(caller, callee);
-    const remoteStream = await ontrackPromise;
-    const remoteTrack = remoteStream.getTracks()[0];
+    exchangeIceCandidates(caller, callee);
+    const e = await exchangeOfferAndListenToOntrack(t, caller, callee);
+    const remoteTrack = e.track;
+
+    // Need to wait for unmute, otherwise there's no event for the transition
+    // back to muted.
+    const onunmutePromise =
+        addEventListenerPromise(t, remoteTrack, 'unmute', () => {
+      assert_false(remoteTrack.muted);
+    });
+    await exchangeAnswer(caller, callee);
+    await onunmutePromise;
+
     const onmutePromise =
         addEventListenerPromise(t, remoteTrack, 'mute', () => {
       eventSequence += 'track.onmute;';
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-track-stats.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-track-stats.https.html
index e394e63e50d..2d0ce302a01 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-track-stats.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-track-stats.https.html
@@ -25,6 +25,7 @@
     let track;
     return getUserMediaTracksAndStreams(1)
     .then(t.step_func(([tracks, streams]) => {
+      t.add_cleanup(() => tracks.forEach(track => track.stop()));
       track = tracks[0];
       pc.addTrack(track, streams[0]);
       return pc.getStats();
@@ -50,6 +51,7 @@
     let stream;
     return getUserMediaTracksAndStreams(1)
     .then(t.step_func(([tracks, streams]) => {
+      t.add_cleanup(() => tracks.forEach(track => track.stop()));
       let track = tracks[0];
       stream = streams[0];
       pc.addTrack(track, stream);
@@ -72,6 +74,7 @@
     let track;
     return getUserMediaTracksAndStreams(1)
     .then(t.step_func(([tracks, streams]) => {
+      t.add_cleanup(() => tracks.forEach(track => track.stop()));
       track = tracks[0];
       pc.addTrack(track, streams[0]);
       return pc.createOffer();
@@ -99,6 +102,7 @@
     let stream;
     return getUserMediaTracksAndStreams(1)
     .then(t.step_func(([tracks, streams]) => {
+      t.add_cleanup(() => tracks.forEach(track => track.stop()));
       let track = tracks[0];
       stream = streams[0];
       pc.addTrack(track, stream);
@@ -128,6 +132,7 @@
     let stream;
     return getUserMediaTracksAndStreams(1)
     .then(t.step_func(([tracks, streams]) => {
+      t.add_cleanup(() => tracks.forEach(track => track.stop()));
       track = tracks[0];
       stream = streams[0];
       pc.addTrack(track, stream);
@@ -162,6 +167,7 @@
     let stream;
     return getUserMediaTracksAndStreams(1)
     .then(t.step_func(([tracks, streams]) => {
+      t.add_cleanup(() => tracks.forEach(track => track.stop()));
       track = tracks[0];
       stream = streams[0];
       stream.addTrack(track);
@@ -199,6 +205,7 @@
     let sendingTrack;
     return getUserMediaTracksAndStreams(1)
     .then(t.step_func(([tracks, streams]) => {
+      t.add_cleanup(() => tracks.forEach(track => track.stop()));
       sendingTrack = tracks[0];
       caller.addTrack(sendingTrack, streams[0]);
       return doSignalingHandshake(caller, callee);
@@ -233,6 +240,7 @@
     };
     return getUserMediaTracksAndStreams(1)
     .then(t.step_func(([tracks, streams]) => {
+      t.add_cleanup(() => tracks.forEach(track => track.stop()));
       caller.addTrack(tracks[0], streams[0]);
       return doSignalingHandshake(caller, callee);
     }))
@@ -265,6 +273,7 @@
     let sender;
     return getUserMediaTracksAndStreams(2)
     .then(t.step_func(([tracks, streams]) => {
+      t.add_cleanup(() => tracks.forEach(track => track.stop()));
       sendingTrack1 = tracks[0];
       sendingTrack2 = tracks[1];
       sender = caller.addTrack(sendingTrack1, streams[0]);
@@ -294,6 +303,7 @@
     let sender;
     return getUserMediaTracksAndStreams(2)
     .then(t.step_func(([tracks, streams]) => {
+      t.add_cleanup(() => tracks.forEach(track => track.stop()));
       sendingTrack1 = tracks[0];
       sendingTrack2 = tracks[1];
       sender = caller.addTrack(sendingTrack1, streams[0]);
@@ -331,6 +341,7 @@
     let sender;
     return getUserMediaTracksAndStreams(2)
     .then(t.step_func(([tracks, streams]) => {
+      t.add_cleanup(() => tracks.forEach(track => track.stop()));
       sendingTrack1 = tracks[0];
       sendingTrack2 = tracks[1];
       sender = caller.addTrack(sendingTrack1, streams[0]);
@@ -367,6 +378,7 @@
     let sender;
     return getUserMediaTracksAndStreams(2)
     .then(t.step_func(([tracks, streams]) => {
+      t.add_cleanup(() => tracks.forEach(track => track.stop()));
       sendingTrack1 = tracks[0];
       sendingTrack2 = tracks[1];
       sender = caller.addTrack(sendingTrack1, streams[0]);
@@ -400,6 +412,7 @@
     const callee = new RTCPeerConnection();
     t.add_cleanup(() => callee.close());
     let [tracks, streams] = await getUserMediaTracksAndStreams(2);
+    t.add_cleanup(() => tracks.forEach(track => track.stop()));
     let sender = caller.addTrack(tracks[0], streams[0]);
     callee.addTrack(tracks[1], streams[1]);
     exchangeIceCandidates(caller, callee);
@@ -448,6 +461,7 @@
     const callee = new RTCPeerConnection();
     t.add_cleanup(() => callee.close());
     let [tracks, streams] = await getUserMediaTracksAndStreams(2);
+    t.add_cleanup(() => tracks.forEach(track => track.stop()));
     let sender = caller.addTrack(tracks[0], streams[0]);
     callee.addTrack(tracks[1], streams[1]);
     exchangeIceCandidates(caller, callee);
@@ -496,6 +510,7 @@
     const callee = new RTCPeerConnection();
     t.add_cleanup(() => callee.close());
     let [tracks, streams] = await getUserMediaTracksAndStreams(2);
+    t.add_cleanup(() => tracks.forEach(track => track.stop()));
     let sender = caller.addTrack(tracks[0], streams[0]);
     callee.addTrack(tracks[1], streams[1]);
     exchangeIceCandidates(caller, callee);
@@ -527,6 +542,7 @@
     const callee = new RTCPeerConnection();
     t.add_cleanup(() => callee.close());
     let [tracks, streams] = await getUserMediaTracksAndStreams(2);
+    t.add_cleanup(() => tracks.forEach(track => track.stop()));
     let sender = caller.addTrack(tracks[0], streams[0]);
     callee.addTrack(tracks[1], streams[1]);
     exchangeIceCandidates(caller, callee);
@@ -557,6 +573,7 @@
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
     let [tracks, streams] = await getUserMediaTracksAndStreams(1);
+    t.add_cleanup(() => tracks.forEach(track => track.stop()));
     await promise_rejects(t, 'InvalidAccessError', pc.getStats(tracks[0]));
   }, 'RTCPeerConnection.getStats(track) throws InvalidAccessError when there ' +
      'are zero senders or receivers for the track');
@@ -565,6 +582,7 @@
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
     let [tracks, streams] = await getUserMediaTracksAndStreams(2);
+    t.add_cleanup(() => tracks.forEach(track => track.stop()));
     let sender1 = pc.addTrack(tracks[0], streams[0]);
     let sender2 = pc.addTrack(tracks[1], streams[1]);
     await sender2.replaceTrack(sender1.track);
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-transceivers.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-transceivers.https.html
index 1f980ea389a..f56a170616c 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-transceivers.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-transceivers.https.html
@@ -1,4 +1,5 @@
 <!doctype html>
+<meta name="timeout" content="long"/>
 <meta charset=utf-8>
 <title>RTCPeerConnection-transceivers.https.html</title>
 <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
index c200271490e..013fe6cf771 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
@@ -215,7 +215,7 @@
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true, video: true});
+    const stream = await getNoiseStream({audio: true, video: true});
     t.add_cleanup(() => stopTracks(stream));
     const audio = stream.getAudioTracks()[0];
     const video = stream.getVideoTracks()[0];
@@ -248,7 +248,7 @@
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true, video: true});
+    const stream = await getNoiseStream({audio: true, video: true});
     t.add_cleanup(() => stopTracks(stream));
     const audio = stream.getAudioTracks()[0];
     const video = stream.getVideoTracks()[0];
@@ -311,7 +311,7 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTransceiver(track, {streams: [stream]});
@@ -346,7 +346,7 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTransceiver(track);
@@ -392,7 +392,7 @@
     const pc2 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -413,7 +413,7 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -474,7 +474,7 @@
     t.add_cleanup(() => pc2.close());
     pc1.addTransceiver("audio");
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc2.addTransceiver(track);
@@ -504,7 +504,7 @@
     pc1.addTransceiver("audio");
     pc2.addTransceiver("audio");
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc2.getTransceivers()[0].sender.replaceTrack(track);
@@ -534,7 +534,7 @@
     pc1.addTransceiver("audio");
     pc2.addTransceiver("audio");
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc2.addTrack(track, stream);
@@ -562,7 +562,7 @@
     t.add_cleanup(() => pc2.close());
     pc1.addTransceiver("audio");
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc2.addTrack(track, stream);
@@ -590,7 +590,7 @@
     t.add_cleanup(() => pc2.close());
     pc1.addTransceiver("audio");
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc2.addTrack(track, stream);
@@ -617,7 +617,7 @@
     const pc2 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -685,7 +685,7 @@
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
     pc.addTransceiver("audio");
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     const audio = stream.getAudioTracks()[0];
     let sender = pc.addTrack(audio, stream);
     pc.removeTrack(sender);
@@ -705,7 +705,7 @@
     const pc2 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true, video: true});
+    const stream = await getNoiseStream({audio: true, video: true});
     t.add_cleanup(() => stopTracks(stream));
     const audio = stream.getAudioTracks()[0];
     pc1.addTrack(audio, stream);
@@ -860,7 +860,7 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -962,7 +962,7 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTransceiver("audio");
@@ -1026,7 +1026,7 @@
   const checkMute = async t => {
     const pc1 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
-    const stream1 = await navigator.mediaDevices.getUserMedia({audio: true, video: true});
+    const stream1 = await getNoiseStream({audio: true, video: true});
     t.add_cleanup(() => stopTracks(stream1));
     const audio1 = stream1.getAudioTracks()[0];
     pc1.addTrack(audio1, stream1);
@@ -1040,7 +1040,7 @@
 
     const pc2 = new RTCPeerConnection();
     t.add_cleanup(() => pc2.close());
-    const stream2 = await navigator.mediaDevices.getUserMedia({audio: true, video: true});
+    const stream2 = await getNoiseStream({audio: true, video: true});
     t.add_cleanup(() => stopTracks(stream2));
     const audio2 = stream2.getAudioTracks()[0];
     pc2.addTrack(audio2, stream2);
@@ -1152,7 +1152,7 @@
   const checkStop = async t => {
     const pc1 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -1197,7 +1197,7 @@
                         transceiver.sender.getParameters()),
                 "InvalidStateError", "setParameters on stopped transceiver");
 
-    const stream2 = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream2 = await getNoiseStream({audio: true});
     const track2 = stream.getAudioTracks()[0];
     checkThrows(() => transceiver.sender.replaceTrack(track2),
                 "InvalidStateError", "replaceTrack on stopped transceiver");
@@ -1251,7 +1251,7 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -1321,7 +1321,7 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -1391,7 +1391,7 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -1426,7 +1426,7 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -1496,7 +1496,7 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -1566,7 +1566,7 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -1589,7 +1589,7 @@
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc.addTrack(track, stream);
@@ -1610,7 +1610,7 @@
 
     // Verify that rollback doesn't stomp things it should not
     pc.getTransceivers()[0].direction = "sendonly";
-    const stream2 = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream2 = await getNoiseStream({audio: true});
     const track2 = stream2.getAudioTracks()[0];
     await pc.getTransceivers()[0].sender.replaceTrack(track2);
 
@@ -1641,7 +1641,7 @@
     const pc1 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
 
-    const audioStream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const audioStream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(audioStream));
     const audioTrack = audioStream.getAudioTracks()[0];
     pc1.addTrack(audioTrack, audioStream);
@@ -1649,7 +1649,7 @@
     const pc2 = new RTCPeerConnection();
     t.add_cleanup(() => pc2.close());
 
-    const videoStream = await navigator.mediaDevices.getUserMedia({video: true});
+    const videoStream = await getNoiseStream({video: true});
     t.add_cleanup(() => stopTracks(videoStream));
     const videoTrack = videoStream.getVideoTracks()[0];
     pc2.addTrack(videoTrack, videoStream);
@@ -1720,7 +1720,7 @@
     const pc1 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -1777,7 +1777,7 @@
     const mid0 = pc2.getTransceivers()[0].mid;
 
     // Give pc2 a track with replaceTrack
-    const stream2 = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream2 = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream2));
     const track2 = stream2.getAudioTracks()[0];
     await pc2.getTransceivers()[0].sender.replaceTrack(track2);
@@ -1937,7 +1937,7 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    const stream = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream));
     const track = stream.getAudioTracks()[0];
     pc1.addTrack(track, stream);
@@ -1973,7 +1973,7 @@
       ]);
 
     // Check that m-section is reused on both ends
-    const stream2 = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream2 = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream2));
     const track2 = stream2.getAudioTracks()[0];
 
@@ -2044,7 +2044,7 @@
     // new one for the new track)
     const stoppedMid1 = pc1.getTransceivers()[1].mid;
     pc1.getTransceivers()[1].stop();
-    const stream3 = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream3 = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream3));
     const track3 = stream3.getAudioTracks()[0];
     pc1.addTrack(track3, stream3);
@@ -2114,7 +2114,7 @@
       ]);
 
     // Add _another_ track; this should reuse the disabled m-section
-    const stream4 = await navigator.mediaDevices.getUserMedia({audio: true});
+    const stream4 = await getNoiseStream({audio: true});
     t.add_cleanup(() => stopTracks(stream4));
     const track4 = stream4.getAudioTracks()[0];
     pc2.addTrack(track4, stream4);