diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index cab531bcc1e..1a16a86c8eb 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -107857,6 +107857,18 @@
      {}
     ]
    ],
+   "css/css-backgrounds/border-image-repeat-005.html": [
+    [
+     "/css/css-backgrounds/border-image-repeat-005.html",
+     [
+      [
+       "/css/css-backgrounds/reference/border-image-repeat-005-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-backgrounds/border-image-repeat-round.html": [
     [
      "/css/css-backgrounds/border-image-repeat-round.html",
@@ -119745,12 +119757,24 @@
      {}
     ]
    ],
-   "css/css-fonts/font-display/font-display-feature-policy.tentative.html": [
+   "css/css-fonts/font-display/font-display-feature-policy-01.tentative.html": [
     [
-     "/css/css-fonts/font-display/font-display-feature-policy.tentative.html",
+     "/css/css-fonts/font-display/font-display-feature-policy-01.tentative.html",
      [
       [
-       "/css/css-fonts/font-display/font-display-feature-policy.tentative-ref.html",
+       "/css/css-fonts/font-display/font-display-feature-policy-01.tentative-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/font-display/font-display-feature-policy-02.tentative.html": [
+    [
+     "/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html",
+     [
+      [
+       "/css/css-fonts/font-display/font-display-feature-policy-02.tentative-ref.html",
        "=="
       ]
      ],
@@ -254159,6 +254183,11 @@
      {}
     ]
    ],
+   "css/css-backgrounds/reference/border-image-repeat-005-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-backgrounds/reference/border-image-repeat-round-ref.html": [
     [
      {}
@@ -257184,12 +257213,32 @@
      {}
     ]
    ],
-   "css/css-fonts/font-display/font-display-feature-policy.tentative-ref.html": [
+   "css/css-fonts/font-display/font-display-feature-policy-01.tentative-ref.html": [
     [
      {}
     ]
    ],
-   "css/css-fonts/font-display/font-display-feature-policy.tentative.html.headers": [
+   "css/css-fonts/font-display/font-display-feature-policy-01.tentative.html.headers": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts/font-display/font-display-feature-policy-02.tentative-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.headers": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html.headers": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html.headers": [
     [
      {}
     ]
@@ -343744,6 +343793,18 @@
      {}
     ]
    ],
+   "css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html": [
+    [
+     "/css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html",
+     {}
+    ]
+   ],
+   "css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html": [
+    [
+     "/css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html",
+     {}
+    ]
+   ],
    "css/css-fonts/font-feature-settings-serialization-001.html": [
     [
      "/css/css-fonts/font-feature-settings-serialization-001.html",
@@ -424310,6 +424371,12 @@
      {}
     ]
    ],
+   "webxr/xrSession_identity_referenceSpace.https.html": [
+    [
+     "/webxr/xrSession_identity_referenceSpace.https.html",
+     {}
+    ]
+   ],
    "webxr/xrSession_mode.https.html": [
     [
      "/webxr/xrSession_mode.https.html",
@@ -452870,7 +452937,7 @@
    "testharness"
   ],
   "CODEOWNERS": [
-   "e35f9232079afd605290616111ca2d662abb52e2",
+   "fe7c29709473cf2f7b535fdbb836128752a37a77",
    "support"
   ],
   "CONTRIBUTING.md": [
@@ -545597,6 +545664,10 @@
    "acf7cfa7b842b96c70a57dda047e834e8649f594",
    "visual"
   ],
+  "css/css-backgrounds/border-image-repeat-005.html": [
+   "f5078fc322c936d65415a4bfec5d022357cb714c",
+   "reftest"
+  ],
   "css/css-backgrounds/border-image-repeat-round.html": [
    "d6e6e6810309bed33f17d57d1869f17555dea5e6",
    "reftest"
@@ -546529,6 +546600,10 @@
    "fe42b5325785950f31e2eb2d6cca9a15410af061",
    "support"
   ],
+  "css/css-backgrounds/reference/border-image-repeat-005-ref.html": [
+   "0a372e088baa0045bb972c7398085da56a216d03",
+   "support"
+  ],
   "css/css-backgrounds/reference/border-image-repeat-round-ref.html": [
    "bfc2efbfa0bf419c13530e6c7d2ffcb324b05e35",
    "support"
@@ -554805,15 +554880,43 @@
    "00b528298b583cc74e013cdeff917f22290f908b",
    "testharness"
   ],
-  "css/css-fonts/font-display/font-display-feature-policy.tentative-ref.html": [
-   "5b707e5b43abc0ee1bc28088f1bfb3d23508f308",
+  "css/css-fonts/font-display/font-display-feature-policy-01.tentative-ref.html": [
+   "7928438702c9b2096eba088603ac4b936051aac3",
    "support"
   ],
-  "css/css-fonts/font-display/font-display-feature-policy.tentative.html": [
-   "558f5b8aa8a827f19f2aa3e099654c28fa4f3c16",
+  "css/css-fonts/font-display/font-display-feature-policy-01.tentative.html": [
+   "56b040d8faf6dee3740a288af5c1bf486b1c9e08",
    "reftest"
   ],
-  "css/css-fonts/font-display/font-display-feature-policy.tentative.html.headers": [
+  "css/css-fonts/font-display/font-display-feature-policy-01.tentative.html.headers": [
+   "0c3e29db99f07ddc1bb3c07cac24e2904e546b1b",
+   "support"
+  ],
+  "css/css-fonts/font-display/font-display-feature-policy-02.tentative-ref.html": [
+   "7f6f56a93abb4d200bd83403367d90aad192d5fb",
+   "support"
+  ],
+  "css/css-fonts/font-display/font-display-feature-policy-02.tentative.html": [
+   "65f76b07846faf193e2b0900f45211303aa290f9",
+   "reftest"
+  ],
+  "css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.headers": [
+   "e6c4898d5d3d28fa225e834674dfb768dbcf55d7",
+   "support"
+  ],
+  "css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html": [
+   "ff3a7f197835370a2eaaf96cf920b0f09d3d8405",
+   "testharness"
+  ],
+  "css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html.headers": [
+   "e6c4898d5d3d28fa225e834674dfb768dbcf55d7",
+   "support"
+  ],
+  "css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html": [
+   "6f6a51a28fda5c9f5816bf6c54dc7fba5f462475",
+   "testharness"
+  ],
+  "css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html.headers": [
    "0c3e29db99f07ddc1bb3c07cac24e2904e546b1b",
    "support"
   ],
@@ -561782,7 +561885,7 @@
    "support"
   ],
   "css/css-fonts/support/fonts/makegsubfonts.py": [
-   "42b97bdd9b01e81eed943d29f26e02419e7b3c3d",
+   "cd39e91d462ccc9b94adb0bed7f83250a1283961",
    "support"
   ],
   "css/css-fonts/support/fonts/pass.woff": [
@@ -603306,7 +603409,7 @@
    "support"
   ],
   "css/tools/apiclient/test.py": [
-   "be99780d6cb5026a93924d4571a8ca1a149a4ff7",
+   "e485367f8402807d0feb6b6e519ee5dbd04aa651",
    "support"
   ],
   "css/tools/apiclient/test/corners.json": [
@@ -603342,7 +603445,7 @@
    "support"
   ],
   "css/tools/w3ctestlib/Sources.py": [
-   "8af95dba09bbdf3773574f9ad46be6de54bdfbe2",
+   "1528cbb83414220ed374e6a4fb24743952c7a45e",
    "support"
   ],
   "css/tools/w3ctestlib/Suite.py": [
@@ -641278,7 +641381,7 @@
    "support"
   ],
   "interfaces/mediasession.idl": [
-   "d2d16c232b7c72704b2648f844b64b4482ff2072",
+   "0fc9ff05f9475cd7f48fde6c22765d431b51310c",
    "support"
   ],
   "interfaces/mediastream-recording.idl": [
@@ -641514,7 +641617,7 @@
    "support"
   ],
   "interfaces/webrtc.idl": [
-   "dc51e2f2f3ae8f33b2cde6aa005efa34f46648aa",
+   "d60139ad946ee625ed61f598a96f71d0680511c2",
    "support"
   ],
   "interfaces/webusb.idl": [
@@ -641906,7 +642009,7 @@
    "support"
   ],
   "lint.whitelist": [
-   "765256d05cafd33777d181e42ddadb8aad424784",
+   "64ff0296a46f3f8302dd71a9894144c6988e24b0",
    "support"
   ],
   "loading/preloader-css-import-no-quote.tentative.html": [
@@ -670814,7 +670917,7 @@
    "testharness"
   ],
   "streams/writable-streams/write.any.js": [
-   "85c7f8ceb969b02f1928ad9992c31b94527e369e",
+   "28fcf650e9f5660279ca7485c7f6478bbd1c97ce",
    "testharness"
   ],
   "subresource-integrity/META.yml": [
@@ -675362,7 +675465,7 @@
    "support"
   ],
   "tools/pywebsocket/example/echo_client.py": [
-   "943ce64e8b886562fc69209834bf92b1399142f7",
+   "7395f51a77100bc0c9a708fc540da671c2c6de03",
    "support"
   ],
   "tools/pywebsocket/example/echo_noext_wsh.py": [
@@ -675622,7 +675725,7 @@
    "support"
   ],
   "tools/pywebsocket/test/test_msgutil.py": [
-   "9dbbb5d8d4b9ac23e9c877bbcedb929ce0908cf1",
+   "234735c63047d2edb238cb5255ad474a2e4d0a83",
    "support"
   ],
   "tools/pywebsocket/test/test_mux.py": [
@@ -675638,7 +675741,7 @@
    "support"
   ],
   "tools/pywebsocket/test/test_util.py": [
-   "20f4ab059652c5869ec205a128df93914ca8c71e",
+   "64ba3f47737a331ef0390cc6b0c81c2d34a42833",
    "support"
   ],
   "tools/pywebsocket/test/testdata/README": [
@@ -679834,7 +679937,7 @@
    "support"
   ],
   "tools/wptrunner/requirements.txt": [
-   "b220a01b67d56b9d4a2debeedf93c5c2a2d2e827",
+   "24a7d3d7e0341472dd032c71d7abfd1f10425ca8",
    "support"
   ],
   "tools/wptrunner/requirements_chrome.txt": [
@@ -679882,7 +679985,7 @@
    "support"
   ],
   "tools/wptrunner/setup.py": [
-   "63d3edde244d0b9e88abbdaa8c579a4a8807236a",
+   "0a16aa537b33b211622ef7799c149a135c7c4660",
    "support"
   ],
   "tools/wptrunner/test/metadata/testharness/firefox/__dir__.ini": [
@@ -679938,7 +680041,7 @@
    "support"
   ],
   "tools/wptrunner/test/test.py": [
-   "9960dcd1e28120e1c9bb3a0ccdf40d8ec9a99904",
+   "8f323a3386c997cbcfa013e6585086471ddfa208",
    "support"
   ],
   "tools/wptrunner/test/testdata/testharness/firefox/subdir/test_pref_inherit.html": [
@@ -680022,7 +680125,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/edge.py": [
-   "9a746819021c14807dcb3549893bcd7105a5a4cc",
+   "25309617ad00813cfb79ce385e0e8d5c806de82d",
    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/edge_webdriver.py": [
@@ -680118,11 +680221,11 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorselenium.py": [
-   "fce1a5bc0d98b689eeeed97f0893f226bf371352",
+   "1ec1393a26b3d360a0ce0d35d3c1367bc7a9f052",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorservo.py": [
-   "b6975da7b4203a5fca4cea2f3c416ee3d1c268a5",
+   "654b5733f09b0e8d3abe37efd8f812e6e8396dbe",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorservodriver.py": [
@@ -680130,7 +680233,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorwebdriver.py": [
-   "dcab4b045291c77a154ba4a61e85a9845d1fb19c",
+   "92d5576a6e7156603c66589c255d1788e06c0e12",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executorwebkit.py": [
@@ -680162,7 +680265,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/reftest.js": [
-   "5bd5c609cbd5e799787c93bac673fb8e392a7c30",
+   "97b3cacafc286cd23e082f8024800bf2c29e6310",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/runner.js": [
@@ -680198,11 +680301,11 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/manifestupdate.py": [
-   "90bcd593edec91d506d41aef2467859ba5d95c77",
+   "86ac55f7915728d914c98a1ef292875578b5d7a8",
    "support"
   ],
   "tools/wptrunner/wptrunner/metadata.py": [
-   "26dc71e64e4187b9595eb5f5d1729884763b36f2",
+   "3a92491aa22202e21041a258220afae6bda13a92",
    "support"
   ],
   "tools/wptrunner/wptrunner/products.py": [
@@ -680326,7 +680429,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/wptcommandline.py": [
-   "1d6909daaca68e78083327915c0c30e2f9d1c34e",
+   "710f26ae81b438bfd8df8b936248f0bf0eb69770",
    "support"
   ],
   "tools/wptrunner/wptrunner/wptlogging.py": [
@@ -680386,7 +680489,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/wptrunner.py": [
-   "ec9a3fe838e14f20cc2bb0012c4a8e294353382c",
+   "dca35f5563d27387a5d8229cba1e68700b218061",
    "support"
   ],
   "tools/wptrunner/wptrunner/wpttest.py": [
@@ -691457,6 +691560,10 @@
    "2719bdd7dd1b4a73e8b2004f477beecf03d131bb",
    "testharness"
   ],
+  "webxr/xrSession_identity_referenceSpace.https.html": [
+   "6f4f1e805a060853eaa557a16111acd73d78fe42",
+   "testharness"
+  ],
   "webxr/xrSession_mode.https.html": [
    "4b54d9480211b3641997f78a61dfdc7058592ecd",
    "testharness"
@@ -691478,7 +691585,7 @@
    "testharness"
   ],
   "webxr/xrSession_requestReferenceSpace.https.html": [
-   "1eb49e0b875b1c686c9f5474c007af8c9d4790d0",
+   "bf4ec677655bf8e8440824cbfd311a2f0c444f7c",
    "testharness"
   ],
   "workers/META.yml": [
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-image-repeat-005.html.ini b/tests/wpt/metadata/css/css-backgrounds/border-image-repeat-005.html.ini
new file mode 100644
index 00000000000..eb0e43ace65
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/border-image-repeat-005.html.ini
@@ -0,0 +1,2 @@
+[border-image-repeat-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/font-display/font-display-feature-policy-01.tentative.html.ini b/tests/wpt/metadata/css/css-fonts/font-display/font-display-feature-policy-01.tentative.html.ini
new file mode 100644
index 00000000000..d19959b9c59
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/font-display/font-display-feature-policy-01.tentative.html.ini
@@ -0,0 +1,2 @@
+[font-display-feature-policy-01.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.ini b/tests/wpt/metadata/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.ini
new file mode 100644
index 00000000000..bbb51cbf380
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.ini
@@ -0,0 +1,2 @@
+[font-display-feature-policy-02.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html.ini b/tests/wpt/metadata/css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html.ini
new file mode 100644
index 00000000000..64e43bcc512
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html.ini
@@ -0,0 +1,5 @@
+[font-display-feature-policy-report-only.tentative.html]
+  expected: ERROR
+  [font-display-late-swap Report Format]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html.ini b/tests/wpt/metadata/css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html.ini
new file mode 100644
index 00000000000..60bd3dd7e05
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html.ini
@@ -0,0 +1,5 @@
+[font-display-feature-policy-reporting.tentative.html]
+  expected: ERROR
+  [font-display-late-swap Report Format]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/css/cssom-view/scroll-behavior-smooth.html.ini b/tests/wpt/metadata/css/cssom-view/scroll-behavior-smooth.html.ini
index 8e2ceeddfbe..bcd187f508c 100644
--- a/tests/wpt/metadata/css/cssom-view/scroll-behavior-smooth.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/scroll-behavior-smooth.html.ini
@@ -6,6 +6,3 @@
   [Instant scrolling while doing history navigation.]
     expected: FAIL
 
-  [Smooth scrolling while doing history navigation.]
-    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 572ff903ddd..1f22caf8238 100644
--- a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
+++ b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
@@ -75,9 +75,6 @@
   [windows-1258: x-cp1258 (XMLHttpRequest)]
     expected: TIMEOUT
 
-  [windows-1257: windows-1257 (XMLHttpRequest)]
-    expected: TIMEOUT
-
   [windows-1254: windows-1254 (XMLHttpRequest)]
     expected: TIMEOUT
 
@@ -120,5 +117,11 @@
   [windows-1256: windows-1256 (XMLHttpRequest)]
     expected: TIMEOUT
 
+  [windows-1254: iso-ir-148 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [x-mac-cyrillic: x-mac-cyrillic (XMLHttpRequest)]
+    expected: TIMEOUT
+
 
 [single-byte-decoder.html?TextDecoder]
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index ee4765a0d8c..b7bde2f8b95 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,9 +312,18 @@
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;charset=gbk text/plain text/html]
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/plain;charset=gbk text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index ef3edb78985..87c807a49ff 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    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
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[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_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
index dc2e45516de..75d75b4cda2 100644
--- 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_2.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_2.html]
   [Multiple history traversals, last would be aborted]
     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/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
deleted file mode 100644
index a9677391662..00000000000
--- a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[DOMContentLoaded-defer.html]
-  [The end: DOMContentLoaded and defer scripts]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
new file mode 100644
index 00000000000..6cf9d13975c
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html.ini
@@ -0,0 +1,4 @@
+[iframe_005.html]
+  [document.write external script into iframe write back into parent]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
index 650c91da4a6..333edb3a26e 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
@@ -1,5 +1,4 @@
 [sharedworker-in-worker.html]
-  expected: ERROR
   [Base URL in workers: new SharedWorker()]
     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
deleted file mode 100644
index dbea4f293ad..00000000000
--- a/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[transition_calc_implicit.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/mozilla/meta/mozilla/paint_timing.html.ini b/tests/wpt/mozilla/meta/mozilla/paint_timing.html.ini
deleted file mode 100644
index 14a9e778f39..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/paint_timing.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[paint_timing.html]
-  [Performance entries observer]
-    expected: FAIL
-
diff --git a/tests/wpt/web-platform-tests/CODEOWNERS b/tests/wpt/web-platform-tests/CODEOWNERS
index e35f9232079..fe7c2970947 100644
--- a/tests/wpt/web-platform-tests/CODEOWNERS
+++ b/tests/wpt/web-platform-tests/CODEOWNERS
@@ -1,2 +1,5 @@
-# Prevent accidentially touching CSS submodules
-/css/tools/ @plinss @kojiishi @jgraham @gsnedders
+# Prevent accidentially touching CSS subtree
+/css/tools/apiclient/ @plinss @jgraham @gsnedders
+
+# Prevent accidentally touching tools/third_party
+/tools/third_party/ @jgraham @gsnedders
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-005.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-005.html
new file mode 100644
index 00000000000..f5078fc322c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-005.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>'border-image-repeat' with 'space' and 'round'</title>
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds-3/#border-image-repeat">
+<link rel="match" href="reference/border-image-repeat-005-ref.html">
+<style>
+#target {
+  width: 255px;
+  height: 80px;
+  border: 10px solid red;
+  border-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='100' height='100'><rect width='100' height='100' fill='green'/></svg>") 0 fill / 0px space round;
+}
+</style>
+<p>There should be two green rectangles below:</p>
+<div id="target"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-repeat-005-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-repeat-005-ref.html
new file mode 100644
index 00000000000..0a372e088ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-repeat-005-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<title>Reference: 'border-image-repeat' with 'space' and 'round'</title>
+<style>
+  .green {
+    width: 100px;
+    height: 100px;
+    background-color: green;
+    position: absolute;
+  }
+</style>
+<p>There should be two green rectangles below:</p>
+<div style="position: relative">
+  <div class="green" style="left: 25px"></div>
+  <div class="green" style="left: 150px"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy.tentative-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-01.tentative-ref.html
similarity index 85%
rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy.tentative-ref.html
rename to tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-01.tentative-ref.html
index 5b707e5b43a..7928438702c 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy.tentative-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-01.tentative-ref.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<title>Test for font-display-late-swap feature policy</title>
+<title>Test for font-display-late-swap feature policy behavior when set to reporting</title>
 <style>
 .ahem {
   font-family: 'Ahem';
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy.tentative.html b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-01.tentative.html
similarity index 89%
rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy.tentative.html
rename to tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-01.tentative.html
index 558f5b8aa8a..56b040d8faf 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-01.tentative.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
-<title>Test for font-display-late-swap feature policy</title>
+<title>Test for font-display-late-swap feature policy behavior when set to reporting</title>
 <link rel="help" href="https://github.com/w3c/webappsec-feature-policy/blob/master/policies/font-display-late-swap.md">
-<link rel="match" href="font-display-feature-policy.tentative-ref.html">
+<link rel="match" href="font-display-feature-policy-01.tentative-ref.html">
 <style>
 </style>
 <p>Tests if font-display is set to optional for each option except for when it is set to fallback</p>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy.tentative.html.headers b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-01.tentative.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy.tentative.html.headers
rename to tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-01.tentative.html.headers
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative-ref.html
new file mode 100644
index 00000000000..7f6f56a93ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<title>Test for font-display-late-swap feature policy behavior when set to report-only</title>
+<style>
+.ahem {
+  font-family: 'Ahem';
+}
+.arial {
+  font-family: 'Arial';
+}
+</style>
+<p>None of the font-display values should be changed</p>
+<table id="container">
+ <tr>
+  <th>not-set</th>
+  <th>auto</th>
+  <th>block</th>
+  <th>swap</th>
+  <th>fallback</th>
+  <th>optional</th>
+ </tr>
+ <tr>
+  <td class="ahem">a</td>
+  <td class="ahem">a</td>
+  <td class="ahem">a</td>
+  <td class="ahem">a</td>
+  <td class="ahem">a</td>
+  <td class="arial">a</td>
+ </tr>
+</table>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html
new file mode 100644
index 00000000000..65f76b07846
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Test for font-display-late-swap feature policy behavior when set to report-only</title>
+<link rel="help" href="https://github.com/w3c/webappsec-feature-policy/blob/master/policies/font-display-late-swap.md">
+<link rel="match" href="font-display-feature-policy-02.tentative-ref.html">
+<style>
+</style>
+<p>None of the font-display values should be changed</p>
+<table id="container">
+ <tr>
+  <th>not-set</th>
+  <th>auto</th>
+  <th>block</th>
+  <th>swap</th>
+  <th>fallback</th>
+  <th>optional</th>
+ </tr>
+</table>
+<script>
+const fontDisplayValues = ['', 'auto', 'block', 'swap', 'fallback', 'optional'];
+const table = document.getElementById('container');
+
+function makeFontFaceDeclaration(family, display) {
+    url = '/fonts/Ahem.ttf?pipe=trickle(d1)'; // Before the swap period is over
+    return '@font-face { font-family: ' + family + '; src: url("' + url + '"); font-display: ' + display + '; }';
+}
+
+window.onload = () => {
+    let tr = document.createElement('tr');
+    for (let display of fontDisplayValues) {
+        const family = display + '-face';
+        const rule = makeFontFaceDeclaration(family, display);
+        document.styleSheets[0].insertRule(rule, 0);
+        let td = document.createElement('td');
+        td.textContent = 'a';
+        td.style.fontFamily = family + ', Arial';
+        tr.appendChild(td);
+    }
+    table.appendChild(tr);
+    const timeoutMilliSec = 1500; // After the font is loaded
+    setTimeout(() => {
+        document.documentElement.classList.remove("reftest-wait");
+    }, timeoutMilliSec);
+}
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.headers b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.headers
new file mode 100644
index 00000000000..e6c4898d5d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.headers
@@ -0,0 +1 @@
+Feature-Policy-Report-Only: font-display-late-swap 'none';
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html
new file mode 100644
index 00000000000..ff3a7f19783
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Test for font-display-late-swap feature policy set to report-only</title>
+    <link rel="help" href="https://w3c.github.io/webappsec-feature-policy/#reporting">
+    <script src='/resources/testharness.js'></script>
+    <script src='/resources/testharnessreport.js'></script>
+    <style>
+    </style>
+  </head>
+  <body>
+    <p>
+      Tests if the correct number of violation reports are generated and each report corresponds to this feature.
+      4 reports should be created out of the 6 options below (reports for all except for 'fallback' and 'optional').
+    </p>
+    <table id="container">
+     <tr>
+      <th>not-set</th>
+      <th>auto</th>
+      <th>block</th>
+      <th>swap</th>
+      <th>fallback</th>
+      <th>optional</th>
+     </tr>
+    </table>
+    <script>
+const fontDisplayValues = ['', 'auto', 'block', 'swap', 'fallback', 'optional'];
+const table = document.getElementById('container');
+
+function makeFontFaceDeclaration(family, display) {
+    url = '/fonts/Ahem.ttf?pipe=trickle(d1)'; // Before the swap period is over
+    return '@font-face { font-family: ' + family + '; src: url("' + url + '"); font-display: ' + display + '; }';
+}
+
+window.onload = () => {
+    let tr = document.createElement('tr');
+    for (let display of fontDisplayValues) {
+        const family = display + '-face';
+        const rule = makeFontFaceDeclaration(family, display);
+        document.styleSheets[0].insertRule(rule, 0);
+        let td = document.createElement('td');
+        td.textContent = 'a';
+        td.style.fontFamily = family + ', Arial';
+        tr.appendChild(td);
+    }
+    table.appendChild(tr);
+}
+
+let reportCounter = 4;
+let t = async_test('font-display-late-swap Report Format');
+
+let check_report_format = (reports, observer) => {
+  reportCounter -= reports.length;
+  for (let report of reports) {
+    assert_equals(report.type, 'feature-policy-violation');
+    assert_equals(report.url, document.location.href, 'Report URL');
+    assert_equals(report.body.featureId, 'font-display-late-swap');
+    assert_equals(report.body.disposition, 'report');
+    assert_true('sourceFile' in report.body);
+    assert_true('lineNumber' in report.body);
+    assert_true('columnNumber' in report.body);
+  }
+  // Test is done when we have exactly 4 reports for the following
+  // font-display values: not set, 'auto', 'block', 'swap'
+  if (reportCounter == 0) t.done();
+};
+
+new ReportingObserver(t.step_func(check_report_format),
+                      {types: ['feature-policy-violation'], buffered: true}).observe();
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html.headers b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html.headers
new file mode 100644
index 00000000000..e6c4898d5d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-report-only.tentative.html.headers
@@ -0,0 +1 @@
+Feature-Policy-Report-Only: font-display-late-swap 'none';
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html
new file mode 100644
index 00000000000..6f6a51a28fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Test for font-display-late-swap feature policy set to reporting</title>
+    <link rel="help" href="https://w3c.github.io/webappsec-feature-policy/#reporting">
+    <script src='/resources/testharness.js'></script>
+    <script src='/resources/testharnessreport.js'></script>
+    <style>
+    </style>
+  </head>
+  <body>
+    <p>
+      Tests if the correct number of violation reports are generated and each report corresponds to this feature.
+      4 reports should be created out of the 6 options below (reports for all except for 'fallback' and 'optional').
+    </p>
+    <table id="container">
+     <tr>
+      <th>not-set</th>
+      <th>auto</th>
+      <th>block</th>
+      <th>swap</th>
+      <th>fallback</th>
+      <th>optional</th>
+     </tr>
+    </table>
+    <script>
+const fontDisplayValues = ['', 'auto', 'block', 'swap', 'fallback', 'optional'];
+const table = document.getElementById('container');
+
+function makeFontFaceDeclaration(family, display) {
+    url = '/fonts/Ahem.ttf?pipe=trickle(d1)'; // Before the swap period is over
+    return '@font-face { font-family: ' + family + '; src: url("' + url + '"); font-display: ' + display + '; }';
+}
+
+window.onload = () => {
+    let tr = document.createElement('tr');
+    for (let display of fontDisplayValues) {
+        const family = display + '-face';
+        const rule = makeFontFaceDeclaration(family, display);
+        document.styleSheets[0].insertRule(rule, 0);
+        let td = document.createElement('td');
+        td.textContent = 'a';
+        td.style.fontFamily = family + ', Arial';
+        tr.appendChild(td);
+    }
+    table.appendChild(tr);
+}
+
+let reportCounter = 4;
+let t = async_test('font-display-late-swap Report Format');
+
+let check_report_format = (reports, observer) => {
+  reportCounter -= reports.length;
+  for (let report of reports) {
+    assert_equals(report.type, 'feature-policy-violation');
+    assert_equals(report.url, document.location.href, 'Report URL');
+    assert_equals(report.body.featureId, 'font-display-late-swap');
+    assert_equals(report.body.disposition, 'enforce');
+    assert_true('sourceFile' in report.body);
+    assert_true('lineNumber' in report.body);
+    assert_true('columnNumber' in report.body);
+  }
+  // Test is done when we have exactly 4 reports for the following
+  // font-display values: not set, 'auto', 'block', 'swap'
+  if (reportCounter == 0) t.done();
+};
+
+new ReportingObserver(t.step_func(check_report_format),
+                      {types: ['feature-policy-violation'], buffered: true}).observe();
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html.headers b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html.headers
new file mode 100644
index 00000000000..0c3e29db99f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-reporting.tentative.html.headers
@@ -0,0 +1 @@
+Feature-Policy: font-display-late-swap 'none';
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/makegsubfonts.py b/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/makegsubfonts.py
index 42b97bdd9b0..cd39e91d462 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/makegsubfonts.py
+++ b/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/makegsubfonts.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 
 import os
 import textwrap
@@ -474,13 +475,13 @@ def makeJavascriptData():
 
 # build fonts
 
-print "Making lookup type 1 font..."
+print("Making lookup type 1 font...")
 makeLookup1()
 
-print "Making lookup type 3 font..."
+print("Making lookup type 3 font...")
 makeLookup3()
 
 # output javascript data
 
-print "Making javascript data file..."
+print("Making javascript data file...")
 makeJavascriptData()
diff --git a/tests/wpt/web-platform-tests/css/tools/apiclient/test.py b/tests/wpt/web-platform-tests/css/tools/apiclient/test.py
index be99780d6cb..e485367f840 100755
--- a/tests/wpt/web-platform-tests/css/tools/apiclient/test.py
+++ b/tests/wpt/web-platform-tests/css/tools/apiclient/test.py
@@ -11,6 +11,7 @@
 #  [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 #
 
+from __future__ import print_function
 import sys
 import os
 import glob
@@ -24,11 +25,11 @@ from apiclient import apiclient
 
 def runTests(testFileSearch):
     for testFilePath in glob.glob(testFileSearch):
-        print 'Running tests from: ' + testFilePath
+        print('Running tests from: ' + testFilePath)
         with open(testFilePath) as testFile:
             testData = json.load(testFile, object_pairs_hook = collections.OrderedDict)
             for testSetName in testData:
-                print testSetName + ':'
+                print(testSetName + ':')
                 testSet = testData[testSetName]
                 vars = testSet['variables']
                 for test in testSet['testcases']:
@@ -37,31 +38,31 @@ def runTests(testFileSearch):
                         template = uritemplate.URITemplate(test[0])
                     except Exception as e:
                         if (expectedResult):
-                            print '* FAIL: "' + test[0] + '" got: None, expected "' + expectedResult + '"'
+                            print('* FAIL: "' + test[0] + '" got: None, expected "' + expectedResult + '"')
                         else:
-                            print '  PASS: "' + test[0] + '" == None'
+                            print('  PASS: "' + test[0] + '" == None')
                         continue
                     
                     result = template.expand(**vars)
                     if (isinstance(expectedResult, basestring)):
                         if (expectedResult != result):
-                            print '* FAIL: "' + test[0] + '" got: "' + unicode(result) + '", expected "' + expectedResult + '"'
+                            print('* FAIL: "' + test[0] + '" got: "' + unicode(result) + '", expected "' + expectedResult + '"')
                             continue
                     elif (isinstance(expectedResult, list)):
                         for possibleResult in expectedResult:
                             if (possibleResult == result):
                                 break
                         else:
-                            print '* FAIL: "' + test[0] + '" got: "' + unicode(result) + '", expected:'
-                            print " or\n".join(['    "' + possibleResult + '"' for possibleResult in expectedResult])
+                            print('* FAIL: "' + test[0] + '" got: "' + unicode(result) + '", expected:')
+                            print(" or\n".join(['    "' + possibleResult + '"' for possibleResult in expectedResult]))
                             continue
                     elif (not expectedResult):
                         if (result):
-                            print '* FAIL "' + test[0] + '" got: "' + unicode(result) + '", expected None'
+                            print('* FAIL "' + test[0] + '" got: "' + unicode(result) + '", expected None')
                             continue
                     else:
-                        print '** Unknown expected result type: ' + repr(expectedResult)
-                    print '  PASS: "' + test[0] + '" == "' + result + '"'
+                        print('** Unknown expected result type: ' + repr(expectedResult))
+                    print('  PASS: "' + test[0] + '" == "' + result + '"')
 
 def debugHook(type, value, tb):
     if hasattr(sys, 'ps1') or not sys.stderr.isatty():
@@ -72,7 +73,7 @@ def debugHook(type, value, tb):
         import traceback, pdb
         # we are NOT in interactive mode, print the exception...
         traceback.print_exception(type, value, tb)
-        print
+        print()
         # ...then start the debugger in post-mortem mode.
         pdb.pm()
 
@@ -88,18 +89,18 @@ if __name__ == "__main__":      # called from the command line
 
 
     github = apiclient.APIClient('https://api.github.com/', version = 'vnd.github.beta')
-    print github.get('user_url', user = 'plinss').data
+    print(github.get('user_url', user = 'plinss').data)
 
 #    shepherd = apiclient.APIClient('https://api.csswg.org/shepherd/', version = 'vnd.csswg.shepherd.v1')
     shepherd = apiclient.APIClient('https://test.linss.com/shepherd/api', version = 'vnd.csswg.shepherd.v1')
-    print shepherd.resourceNames
+    print(shepherd.resourceNames)
     specs = shepherd.resource('specifications')
-    print specs.variables
+    print(specs.variables)
 #    print specs.hints.docs
-    print shepherd.get('specifications', spec = 'compositing-1', anchors = False).data
+    print(shepherd.get('specifications', spec = 'compositing-1', anchors = False).data)
 
     suites = shepherd.resource('test_suites')
-    print suites.variables
-    print shepherd.get('test_suites', spec = 'css-shapes-1').data
+    print(suites.variables)
+    print(shepherd.get('test_suites', spec = 'css-shapes-1').data)
 
 
diff --git a/tests/wpt/web-platform-tests/css/tools/w3ctestlib/Sources.py b/tests/wpt/web-platform-tests/css/tools/w3ctestlib/Sources.py
index 8af95dba09b..1528cbb8341 100644
--- a/tests/wpt/web-platform-tests/css/tools/w3ctestlib/Sources.py
+++ b/tests/wpt/web-platform-tests/css/tools/w3ctestlib/Sources.py
@@ -3,6 +3,7 @@
 # Initial code by fantasai, joint copyright 2010 W3C and Microsoft
 # Licensed under BSD 3-Clause: <http://www.w3.org/Consortium/Legal/2008/03-bsd-license>
 
+from __future__ import print_function
 from os.path import basename, exists, join
 import os
 import filecmp
@@ -965,7 +966,7 @@ class XMLSource(FileSource):
       if ((not self.metadata) and self.tree and (not self.errors)):
         self.extractMetadata(self.tree)
     except etree.ParseError as e:
-      print "PARSE ERROR: " + self.sourcepath
+      print("PARSE ERROR: " + self.sourcepath)
       self.cacheAsParseError(self.sourcepath, e)
       e.W3CTestLibErrorLocation = self.sourcepath
       self.errors = [str(e)]
@@ -1375,7 +1376,7 @@ class HTMLSource(XMLSource):
       if ((not self.metadata) and self.tree and (not self.errors)):
         self.extractMetadata(self.tree)
     except Exception as e:
-      print "PARSE ERROR: " + self.sourcepath
+      print("PARSE ERROR: " + self.sourcepath)
       e.W3CTestLibErrorLocation = self.sourcepath
       self.errors = [str(e)]
       self.encoding = 'utf-8'
diff --git a/tests/wpt/web-platform-tests/interfaces/mediasession.idl b/tests/wpt/web-platform-tests/interfaces/mediasession.idl
index d2d16c232b7..0fc9ff05f94 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediasession.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediasession.idl
@@ -21,7 +21,7 @@ enum MediaSessionAction {
   "seekforward",
   "previoustrack",
   "nexttrack",
-  "skip-ad",
+  "skipad",
 };
 
 callback MediaSessionActionHandler = void();
diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc.idl b/tests/wpt/web-platform-tests/interfaces/webrtc.idl
index dc51e2f2f3a..d60139ad946 100644
--- a/tests/wpt/web-platform-tests/interfaces/webrtc.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webrtc.idl
@@ -628,7 +628,7 @@ enum RTCErrorDetailType {
           };
 
 [Exposed=Window,
- Constructor(DOMString type, RTCErrorEventInit eventInitDict)]
+ Constructor(DOMString type, optional RTCErrorEventInit eventInitDict)]
 interface RTCErrorEvent : Event {
     readonly        attribute RTCError? error;
 };
diff --git a/tests/wpt/web-platform-tests/lint.whitelist b/tests/wpt/web-platform-tests/lint.whitelist
index 765256d05ca..64ff0296a46 100644
--- a/tests/wpt/web-platform-tests/lint.whitelist
+++ b/tests/wpt/web-platform-tests/lint.whitelist
@@ -294,7 +294,8 @@ GENERATE_TESTS: shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/w
 SET TIMEOUT: css/css-fonts/font-display/font-display.html
 SET TIMEOUT: css/css-fonts/font-display/font-display-change.html
 SET TIMEOUT: css/css-fonts/font-display/font-display-change-ref.html
-SET TIMEOUT: css/css-fonts/font-display/font-display-feature-policy.tentative.html
+SET TIMEOUT: css/css-fonts/font-display/font-display-feature-policy-01.tentative.html
+SET TIMEOUT: css/css-fonts/font-display/font-display-feature-policy-02.tentative.html
 SET TIMEOUT: css/css-fonts/font-display/font-display-preload.html
 SET TIMEOUT: html/browsers/windows/auxiliary-browsing-contexts/resources/close-opener.html
 SET TIMEOUT: html/dom/documents/dom-tree-accessors/Document.currentScript.html
diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/write.any.js b/tests/wpt/web-platform-tests/streams/writable-streams/write.any.js
index 85c7f8ceb96..28fcf650e9f 100644
--- a/tests/wpt/web-platform-tests/streams/writable-streams/write.any.js
+++ b/tests/wpt/web-platform-tests/streams/writable-streams/write.any.js
@@ -251,3 +251,27 @@ promise_test(() => {
   });
   return ws.getWriter().write('a').then(() => assert_true(thenCalled, 'thenCalled should be true'));
 }, 'returning a thenable from write() should work');
+
+promise_test(() => {
+  const stream = new WritableStream();
+  const writer = stream.getWriter();
+  const WritableStreamDefaultWriter = writer.constructor;
+  assert_throws(new TypeError(), () => new WritableStreamDefaultWriter(stream),
+                'should not be able to construct on locked stream');
+  // If stream.[[writer]] no longer points to |writer| then the closed Promise
+  // won't work properly.
+  return Promise.all([writer.close(), writer.closed]);
+}, 'failing DefaultWriter constructor should not release an existing writer');
+
+promise_test(t => {
+  const ws = new WritableStream({
+    start() {
+      return Promise.reject(error1);
+    }
+  }, { highWaterMark: 0 });
+  const writer = ws.getWriter();
+  return Promise.all([
+    promise_rejects(t, error1, writer.ready, 'ready should be rejected'),
+    promise_rejects(t, error1, writer.write(), 'write() should be rejected')
+  ]);
+}, 'write() on a stream with HWM 0 should not cause the ready Promise to resolve');
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_client.py b/tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_client.py
index 943ce64e8b8..7395f51a771 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_client.py
+++ b/tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_client.py
@@ -51,6 +51,7 @@ or
 # run echo client to test IETF HyBi 00 protocol
  run with --protocol-version=hybi00
 """
+from __future__ import print_function
 
 
 import base64
@@ -940,15 +941,15 @@ class EchoClient(object):
             for line in self._options.message.split(','):
                 self._stream.send_message(line)
                 if self._options.verbose:
-                    print 'Send: %s' % line
+                    print('Send: %s' % line)
                 try:
                     received = self._stream.receive_message()
 
                     if self._options.verbose:
-                        print 'Recv: %s' % received
+                        print('Recv: %s' % received)
                 except Exception, e:
                     if self._options.verbose:
-                        print 'Error: %s' % e
+                        print('Error: %s' % e)
                     raise
 
             self._do_closing_handshake()
@@ -964,15 +965,15 @@ class EchoClient(object):
             self._logger.info('Wait for server-initiated closing handshake')
             message = self._stream.receive_message()
             if message is None:
-                print 'Recv close'
-                print 'Send ack'
+                print('Recv close')
+                print('Send ack')
                 self._logger.info(
                     'Received closing handshake and sent ack')
                 return
-        print 'Send close'
+        print('Send close')
         self._stream.close_connection()
         self._logger.info('Sent closing handshake')
-        print 'Recv ack'
+        print('Recv ack')
         self._logger.info('Received ack')
 
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_msgutil.py b/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_msgutil.py
index 9dbbb5d8d4b..234735c6304 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_msgutil.py
+++ b/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_msgutil.py
@@ -31,6 +31,7 @@
 
 
 """Tests for msgutil module."""
+from __future__ import print_function
 
 
 import array
@@ -884,7 +885,7 @@ class PerMessageDeflateTest(unittest.TestCase):
         compressed_empty = compressed_empty[:-4]
         expected += '\x80%c' % len(compressed_empty)
         expected += compressed_empty
-        print '%r' % expected
+        print('%r' % expected)
         self.assertEqual(expected, request.connection.written_data())
 
     def test_send_message_fragmented_empty_last_frame(self):
@@ -1064,7 +1065,7 @@ class PerMessageDeflateTest(unittest.TestCase):
 
             frame_count += 1
 
-        print "Chunk sizes: %r" % chunk_sizes
+        print("Chunk sizes: %r" % chunk_sizes)
         self.assertTrue(len(chunk_sizes) > 10)
 
         # Close frame
@@ -1167,9 +1168,9 @@ class PerMessageDeflateTest(unittest.TestCase):
                     compress = None
                     finish_used = True
 
-        print "Chunk sizes: %r" % chunk_sizes
+        print("Chunk sizes: %r" % chunk_sizes)
         self.assertTrue(len(chunk_sizes) > 10)
-        print "Methods: %r" % methods
+        print("Methods: %r" % methods)
         self.assertTrue(sync_used)
         self.assertTrue(finish_used)
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_util.py b/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_util.py
index 20f4ab05965..64ba3f47737 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_util.py
+++ b/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_util.py
@@ -31,6 +31,7 @@
 
 
 """Tests for util module."""
+from __future__ import print_function
 
 
 import os
@@ -172,7 +173,7 @@ class InflaterDeflaterTest(unittest.TestCase):
             [chr(random.randint(0, 255)) for i in xrange(100 * 1024)])
 
         chunked_input = get_random_section(source, 10)
-        print "Input chunk sizes: %r" % [len(c) for c in chunked_input]
+        print("Input chunk sizes: %r" % [len(c) for c in chunked_input])
 
         deflater = util._Deflater(15)
         compressed = []
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
index b220a01b67d..24a7d3d7e03 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
@@ -1,5 +1,5 @@
 html5lib == 1.0.1
 mozinfo == 0.10
-mozlog==3.10
+mozlog==4.0
 mozdebug==0.1.1
 urllib3[secure]==1.24.1
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/setup.py b/tests/wpt/web-platform-tests/tools/wptrunner/setup.py
index 63d3edde244..0a16aa537b3 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/setup.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/setup.py
@@ -2,6 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import print_function
+
 import glob
 import os
 import sys
@@ -60,12 +62,12 @@ setup(name=PACKAGE_NAME,
 
 if "install" in sys.argv:
     path = os.path.relpath(os.path.join(sys.prefix, "requirements"), os.curdir)
-    print textwrap.fill("""In order to use with one of the built-in browser
+    print(textwrap.fill("""In order to use with one of the built-in browser
 products, you will need to install the extra dependencies. These are provided
 as requirements_[name].txt in the %s directory and can be installed using
-e.g.""" % path, 80)
+e.g.""" % path, 80))
 
-    print """
+    print("""
 
 pip install -r %s/requirements_firefox.txt
-""" % path
+""" % path)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/test/test.py b/tests/wpt/web-platform-tests/tools/wptrunner/test/test.py
index 9960dcd1e28..8f323a3386c 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/test/test.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/test/test.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import ConfigParser
 import argparse
 import os
@@ -153,7 +154,7 @@ def main():
         if args.pdb:
             import pdb
             import traceback
-            print traceback.format_exc()
+            print(traceback.format_exc())
             pdb.post_mortem()
         else:
             raise
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge.py
index 9a746819021..25309617ad0 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 from .base import Browser, ExecutorBrowser, require_arg
 from ..webdriver_server import EdgeDriverServer
 from ..executors import executor_kwargs as base_executor_kwargs
@@ -76,7 +77,7 @@ class EdgeBrowser(Browser):
 
 
     def start(self, **kwargs):
-        print self.server.url
+        print(self.server.url)
         self.server.start()
 
     def stop(self, force=False):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
index fce1a5bc0d9..1ec1393a26b 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py
@@ -372,7 +372,7 @@ class SeleniumRefTestExecutor(RefTestExecutor):
             """return [window.outerWidth - window.innerWidth,
                        window.outerHeight - window.innerHeight];"""
         )
-        self.protocol.webdriver.set_window_size(600 + width_offset, 600 + height_offset)
+        self.protocol.webdriver.set_window_rect(0, 0, 600 + width_offset, 600 + height_offset)
 
         result = self.implementation.run_test(test)
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py
index b6975da7b42..654b5733f09 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import base64
 import json
 import os
@@ -136,7 +137,7 @@ class ServoTestharnessExecutor(ProcessTestExecutor):
             self.result_flag.set()
         else:
             if self.interactive:
-                print line
+                print(line)
             else:
                 self.logger.process_output(self.proc.pid,
                                            line,
@@ -267,7 +268,7 @@ class ServoRefTestExecutor(ProcessTestExecutor):
     def on_output(self, line):
         line = line.decode("utf8", "replace")
         if self.interactive:
-            print line
+            print(line)
         else:
             self.logger.process_output(self.proc.pid,
                                        line,
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index dcab4b04529..92d5576a6e7 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -405,6 +405,7 @@ class WebDriverRefTestExecutor(RefTestExecutor):
             """return [window.outerWidth - window.innerWidth,
                        window.outerHeight - window.innerHeight];"""
         )
+        self.protocol.webdriver.window.position = (0, 0)
         self.protocol.webdriver.window.size = (600 + width_offset, 600 + height_offset)
 
         result = self.implementation.run_test(test)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/reftest.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/reftest.js
index 5bd5c609cbd..97b3cacafc2 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/reftest.js
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/reftest.js
@@ -1 +1 @@
-var win = window.open("about:blank", "test", "width=600,height=600");
+var win = window.open("about:blank", "test", "left=0,top=0,width=600,height=600");
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestupdate.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestupdate.py
index 90bcd593ede..86ac55f7915 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestupdate.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestupdate.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import itertools
 import os
 import urlparse
@@ -89,7 +90,7 @@ class ExpectedManifest(ManifestItem):
     def append(self, child):
         ManifestItem.append(self, child)
         if child.id in self.child_map:
-            print "Warning: Duplicate heading %s" % child.id
+            print("Warning: Duplicate heading %s" % child.id)
         self.child_map[child.id] = child
 
     def _remove_child(self, child):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py
index 26dc71e64e4..3a92491aa22 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import array
 import os
 import shutil
@@ -49,9 +50,9 @@ def update_expected(test_paths, serve_root, log_file_names,
             for test in updated_ini.iterchildren():
                 for subtest in test.iterchildren():
                     if subtest.new_disabled:
-                        print "disabled: %s" % os.path.dirname(subtest.root.test_path) + "/" + subtest.name
+                        print("disabled: %s" % os.path.dirname(subtest.root.test_path) + "/" + subtest.name)
                     if test.new_disabled:
-                        print "disabled: %s" % test.root.test_path
+                        print("disabled: %s" % test.root.test_path)
 
 
 def do_delayed_imports(serve_root):
@@ -359,7 +360,7 @@ class ExpectedUpdater(object):
         try:
             test_data = self.id_test_map[test_id]
         except KeyError:
-            print "Test not found %s, skipping" % test_id
+            print("Test not found %s, skipping" % test_id)
             return
 
         if self.ignore_existing:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
index 1d6909daaca..710f26ae81b 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import argparse
 import os
 import sys
@@ -29,7 +30,7 @@ def require_arg(kwargs, name, value_func=None):
         value_func = lambda x: x is not None
 
     if name not in kwargs or not value_func(kwargs[name]):
-        print >> sys.stderr, "Missing required argument %s" % name
+        print("Missing required argument %s" % name, file=sys.stderr)
         sys.exit(1)
 
 
@@ -417,7 +418,7 @@ def check_paths(kwargs):
     for test_paths in kwargs["test_paths"].itervalues():
         if not ("tests_path" in test_paths and
                 "metadata_path" in test_paths):
-            print "Fatal: must specify both a test path and metadata path"
+            print("Fatal: must specify both a test path and metadata path")
             sys.exit(1)
         if "manifest_path" not in test_paths:
             test_paths["manifest_path"] = os.path.join(test_paths["metadata_path"],
@@ -431,11 +432,11 @@ def check_paths(kwargs):
                 path = os.path.dirname(path)
 
             if not os.path.exists(path):
-                print "Fatal: %s path %s does not exist" % (name, path)
+                print("Fatal: %s path %s does not exist" % (name, path))
                 sys.exit(1)
 
             if not os.path.isdir(path):
-                print "Fatal: %s path %s is not a directory" % (name, path)
+                print("Fatal: %s path %s is not a directory" % (name, path))
                 sys.exit(1)
 
 
@@ -488,7 +489,7 @@ def check_args(kwargs):
 
     if kwargs["binary"] is not None:
         if not os.path.exists(kwargs["binary"]):
-            print >> sys.stderr, "Binary path %s does not exist" % kwargs["binary"]
+            print("Binary path %s does not exist" % kwargs["binary"], file=sys.stderr)
             sys.exit(1)
 
     if kwargs["ssl_type"] is None:
@@ -507,14 +508,14 @@ def check_args(kwargs):
     elif kwargs["ssl_type"] == "openssl":
         path = exe_path(kwargs["openssl_binary"])
         if path is None:
-            print >> sys.stderr, "openssl-binary argument missing or not a valid executable"
+            print("openssl-binary argument missing or not a valid executable", file=sys.stderr)
             sys.exit(1)
         kwargs["openssl_binary"] = path
 
     if kwargs["ssl_type"] != "none" and kwargs["product"] == "firefox" and kwargs["certutil_binary"]:
         path = exe_path(kwargs["certutil_binary"])
         if path is None:
-            print >> sys.stderr, "certutil-binary argument missing or not a valid executable"
+            print("certutil-binary argument missing or not a valid executable", file=sys.stderr)
             sys.exit(1)
         kwargs["certutil_binary"] = path
 
@@ -524,7 +525,7 @@ def check_args(kwargs):
             kwargs['extra_prefs'] = [kwargs['extra_prefs']]
         missing = any('=' not in prefarg for prefarg in kwargs['extra_prefs'])
         if missing:
-            print >> sys.stderr, "Preferences via --setpref must be in key=value format"
+            print("Preferences via --setpref must be in key=value format", file=sys.stderr)
             sys.exit(1)
         kwargs['extra_prefs'] = [tuple(prefarg.split('=', 1)) for prefarg in
                                  kwargs['extra_prefs']]
@@ -551,7 +552,7 @@ def check_args_update(kwargs):
 
     for item in kwargs["run_log"]:
         if os.path.isdir(item):
-            print >> sys.stderr, "Log file %s is a directory" % item
+            print("Log file %s is a directory" % item, file=sys.stderr)
             sys.exit(1)
 
     return kwargs
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
index ec9a3fe838e..dca35f5563d 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+from __future__ import print_function, unicode_literals
 
 import json
 import os
@@ -91,7 +91,7 @@ def list_test_groups(test_paths, product, **kwargs):
                                        run_info_extras=run_info_extras, **kwargs)
 
     for item in sorted(test_loader.groups(kwargs["test_types"])):
-        print item
+        print(item)
 
 
 def list_disabled(test_paths, product, **kwargs):
@@ -107,7 +107,7 @@ def list_disabled(test_paths, product, **kwargs):
     for test_type, tests in test_loader.disabled_tests.iteritems():
         for test in tests:
             rv.append({"test": test.id, "reason": test.disabled()})
-    print json.dumps(rv, indent=2)
+    print(json.dumps(rv, indent=2))
 
 
 def list_tests(test_paths, product, **kwargs):
@@ -119,7 +119,7 @@ def list_tests(test_paths, product, **kwargs):
                                        run_info_extras=run_info_extras, **kwargs)
 
     for test in test_loader.test_ids:
-        print test
+        print(test)
 
 
 def get_pause_after_test(test_loader, **kwargs):
@@ -361,7 +361,7 @@ def main():
         if kwargs["pdb"]:
             import pdb
             import traceback
-            print traceback.format_exc()
+            print(traceback.format_exc())
             pdb.post_mortem()
         else:
             raise
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_identity_referenceSpace.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_identity_referenceSpace.https.html
new file mode 100644
index 00000000000..6f4f1e805a0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_identity_referenceSpace.https.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src="resources/webxr_util.js"></script>
+  <canvas></canvas>
+
+  <script>
+
+    let immersiveTestName =
+      "Identity reference space provides correct poses for immersive sessions";
+    let inlineTestName =
+      "Identity reference space provides correct poses for inline sessions";
+
+    let fakeDeviceInitParams = { supportsImmersive: true };
+
+    let immersiveSessionOptions = { mode: 'immersive-vr' };
+    let inlineSessionOptions = { outputContext: getOutputContext() };
+
+    const identityMatrix = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
+
+    // Valid matrices for  when we don't care about specific values
+    const validPoseMatrix = [0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1];
+    const validProjectionMatrix = [1, 0, 0, 0, 0, 1, 0, 0, 3, 2, -1, -1, 0, 0, -0.2, 0];
+    const validViewMatrix = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 4, 3, 2, 1];
+
+    let testFunction = function(session, fakeDeviceController, t) {
+      return session.requestReferenceSpace({ type: 'identity' })
+        .then((referenceSpace) => new Promise((resolve, reject) => {
+          let counter = 0;
+          function onFrame(time, xrFrame) {
+            session.requestAnimationFrame(onFrame);
+            if (counter == 0) {
+              t.step( () => {
+                // Expect to always get a pose, even if none has been supplied.
+                let pose = xrFrame.getViewerPose(referenceSpace);
+                assert_not_equals(pose, null);
+
+                let poseMatrix = pose.poseModelMatrix;
+                assert_not_equals(poseMatrix, null);
+
+                for(let i = 0; i < poseMatrix.length; i++) {
+                  assert_equals(poseMatrix[i], identityMatrix[i]);
+                }
+
+                fakeDeviceController.setXRPresentationFrameData(
+                  validPoseMatrix, [{
+                    eye:"left",
+                    projectionMatrix: validProjectionMatrix,
+                    viewMatrix: validViewMatrix
+                  }, {
+                    eye:"right",
+                    projectionMatrix: validProjectionMatrix,
+                    viewMatrix: validViewMatrix
+                  }]);
+              });
+            } else {
+              t.step( () => {
+                // Assert that the identity matrix is always given as the pose
+                // even when a valid pose is set by the device.
+                let pose = xrFrame.getViewerPose(referenceSpace);
+                assert_not_equals(pose, null);
+
+                let poseMatrix = pose.poseModelMatrix;
+                assert_not_equals(poseMatrix, null);
+
+                for(let i = 0; i < poseMatrix.length; i++) {
+                  assert_equals(poseMatrix[i], identityMatrix[i]);
+                }
+              });
+
+              // Finished.
+              resolve();
+            }
+            counter++;
+          }
+
+          session.requestAnimationFrame(onFrame);
+        }));
+    };
+
+    xr_session_promise_test(inlineTestName, testFunction,
+      fakeDeviceInitParams, inlineSessionOptions);
+    xr_session_promise_test(immersiveTestName, testFunction,
+      fakeDeviceInitParams, immersiveSessionOptions);
+
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html
index 1eb49e0b875..bf4ec677655 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html
@@ -21,6 +21,14 @@
         .then(() => promise_rejects(t, "NotSupportedError", session.requestReferenceSpace({ type: "stationary" })))
         .then(() => promise_rejects(t, new TypeError(), session.requestReferenceSpace({ type: "stationary", subtype: "bar" })))
         .then(() => Promise.all([
+        session.requestReferenceSpace({ type: "identity" }).then( (referenceSpace) => {
+            t.step(() => {
+              assert_true(referenceSpace instanceof XRSpace,
+                "identity reference space is not correct type.");
+              assert_true(referenceSpace instanceof XRReferenceSpace,
+                "identity reference space is not correct type.");
+            });
+          }),
           session.requestReferenceSpace({ type: "stationary", subtype: "position-disabled" }).then( (referenceSpace) => {
             t.step(() => {
               assert_true(referenceSpace instanceof XRSpace,