--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -398470,25 +398470,25 @@
    "cfedb92777a36954d6e285461bf224cb6d2b5407",
    "support"
   ],
   "./LICENSE.md": [
    "722729a1062b97ad2fdd43896b2c6a45b1fff144",
    "support"
   ],
   "./README.md": [
-   "8ab843e17aa153bcf91282be3770ed2009061b11",
+   "ce5fb6c1b9f899ffab603cbfc4086b00dbff5384",
    "support"
   ],
   "./check_stability.ini": [
    "5addd67f09e895336644c5a9f5049c03e1ffe615",
    "support"
   ],
   "./lint.whitelist": [
-   "0992e710e33823c6fb6be2725ec1e7f3c7eaa330",
+   "808677b142f2245d3127428fb75caea24db8bc00",
    "support"
   ],
   "./serve.py": [
    "0efa39b1f26f86d73f2fce4f9e46003d62057b41",
    "support"
   ],
   "./server-side.md": [
    "c51b17fbac2a2e3121dc74f7badbd2873ce92f61",
@@ -402462,17 +402462,17 @@
    "c712cdec9ced8da63eb6b8dfce17906a4210883e",
    "support"
   ],
   "2dcontext/tools/gentest.py": [
    "49951605ab640deeb16f2b0aebf2396237fc727e",
    "support"
   ],
   "2dcontext/tools/gentestutils.py": [
-   "e72428dc8c3b103f00d613c4db9d22ecb1ba9c40",
+   "2471935912843b23a345279ac2cef5130ca06923",
    "support"
   ],
   "2dcontext/tools/name2dir.yaml": [
    "3a852f1cc85eae2a17e67d56ce0c9bb5e4e69b41",
    "support"
   ],
   "2dcontext/tools/spec.yaml": [
    "232dbb047756e3cef85089de215e492c3550f927",
@@ -406126,17 +406126,17 @@
    "0b3417b7e88f77777d124793e2179eac0e5e5b4d",
    "testharness"
   ],
   "annotation-model/.editorconfig": [
    "18e9e31b4beb20bcfa5ad281584d816204a3f531",
    "support"
   ],
   "annotation-model/CONTRIBUTING.md": [
-   "9e995a09f036f5e03c933d94c154fb53e8f4a1ad",
+   "4454f6104eeec3c20ae3c5469613015b9253dd44",
    "support"
   ],
   "annotation-model/OWNERS": [
    "a64a1f5959fed0805f1bcb3a41440bdfb9ed7df2",
    "support"
   ],
   "annotation-model/README.md": [
    "390a60a8be9bfbc12175b92f0001e0261a8ba83a",
@@ -426650,17 +426650,17 @@
    "91b559057efd232878bd0107e1bf9c6434510fc6",
    "support"
   ],
   "conformance-checkers/tools/picture.py": [
    "fb2394a528fcfaa5722803682b8bd1c16623f506",
    "support"
   ],
   "conformance-checkers/tools/url.py": [
-   "ee47cdb8f49f00b4bb9d27c85749b4e3e48271a1",
+   "5e7382a775385a86dff494d5928b116109cc1169",
    "support"
   ],
   "conformance-checkers/xhtml/attributes/accesskey/003-novalid.xhtml": [
    "cffc0ea1c48013af92de8a327b3ac42e3ba0bc65",
    "support"
   ],
   "conformance-checkers/xhtml/attributes/accesskey/004-novalid.xhtml": [
    "17d10c4171c1d97ab3ce60c5275b3b5335732156",
@@ -427134,17 +427134,17 @@
    "f478084fb2b04fe93435b3c33e9791bf613ba7f8",
    "support"
   ],
   "content-security-policy/README.css": [
    "5d86efff22b5d791302cccd8cade79ccd2960e18",
    "support"
   ],
   "content-security-policy/README.html": [
-   "9834273e9d9f9bf5ca645497955dc5375091938f",
+   "aeb2e94bc9c1bb33fdac474b5a603e418f64e73f",
    "support"
   ],
   "content-security-policy/base-uri/base-uri-allow.sub.html": [
    "f529a5f663471743f84b0d6db986a67227dcdcab",
    "testharness"
   ],
   "content-security-policy/base-uri/base-uri-deny.sub.html": [
    "3b77edcd9a327a7cb7120ee0fb4975f936430211",
@@ -429502,77 +429502,77 @@
    "9e68d9eb0784e10786bd8b0c6009afb42516acdc",
    "support"
   ],
   "cookie-store/README.md": [
    "40595162d15dec7e315ef16f94646045596d7b1c",
    "support"
   ],
   "cookie-store/cookieStore_delete_arguments.tentative.window.js": [
-   "f33ce9a975c759ce6da8a5caa371ca026dd537c4",
+   "a2a3b036e62ed11e8013f7e255bbc418576dd451",
    "testharness"
   ],
   "cookie-store/cookieStore_delete_basic.tentative.window.js": [
    "c0a5c01ffcdd3755eb3db3dc4a6ec398fd2aba37",
    "testharness"
   ],
   "cookie-store/cookieStore_event_arguments.tenative.window.js": [
    "a61074b6062928c29a83e0f7d456fdce9e3a3d47",
    "testharness"
   ],
   "cookie-store/cookieStore_event_basic.tentative.window.js": [
-   "33faf57882e558a54d6cbf181141e03f1b3cd871",
+   "f6f20c4b587ed51d31ffc9f8bed1dfb7d092a064",
    "testharness"
   ],
   "cookie-store/cookieStore_event_delete.tenative.window.js": [
-   "3fa86e521919eac1f89ff00f449f8c01500e170e",
+   "b492c6567ef91ea0def4195b049f9553bbc8271d",
    "testharness"
   ],
   "cookie-store/cookieStore_event_overwrite.tentative.window.js": [
-   "f7f3989aaaa0003693c043c582f0c78ecd1bbad0",
+   "cd238bae3c79a5f3c6e385466fe29487bf0e4c70",
    "testharness"
   ],
   "cookie-store/cookieStore_getAll_arguments.tentative.window.js": [
-   "cf818fe92c16dfe42f0ac778f665094533d8ab10",
+   "4804767f6398c3d10d726d21895ae3b72c8f23f3",
    "testharness"
   ],
   "cookie-store/cookieStore_getAll_set_basic.tentative.window.js": [
-   "e6349dab874b99050cbbf5012db93de50612ce56",
+   "d3c3430fa08d8573e6d95c56e0b91604286eb632",
    "testharness"
   ],
   "cookie-store/cookieStore_get_arguments.tentative.window.js": [
-   "944e71f01e0d9b9b00f36fff2b84d6a9b93538e1",
+   "1f63b8fc5b9e6a1e0a4aa925d2d3084cb1ea093a",
    "testharness"
   ],
   "cookie-store/cookieStore_get_delete_basic.tentative.window.js": [
-   "0b8c7725e0824d82c049a45e428a332212419bfd",
+   "a5f91a2bbe6c619b01a9e3deb473645a36c85b44",
    "testharness"
   ],
   "cookie-store/cookieStore_get_set_basic.tentative.window.js": [
-   "7439e63ae3e5b06a43ab168ece73123f90712f25",
+   "475f0cdc18f63a0b3a710800a7a4ed82fd7b8ee8",
    "testharness"
   ],
   "cookie-store/cookieStore_has_arguments.tentative.window.js": [
-   "7512c46b8c7ec0b3ce33e3182671cc8c726a5e4e",
+   "2a73b3ce79da4a3a49cd1580a1c8796b5c54c3a1",
    "testharness"
   ],
   "cookie-store/cookieStore_has_basic.tentative.window.js": [
-   "c53d313cebc3970e28d87c69a5d13a1b5e81529b",
+   "e258d62c411d54d7d5cf016adf78132bb9aa9fae",
    "testharness"
   ],
   "cookie-store/cookieStore_in_detached_frame.tentative.html": [
    "600452c1a496b8335b27bd24943b8834e37bf4d5",
    "testharness"
   ],
   "cookie-store/cookieStore_set_arguments.tentative.window.js": [
-   "27019d0e79b6754715a292f40e064de53daaf5e8",
+   "33e7ed082d0e461147eb01dfabf305022952401f",
    "testharness"
   ],
   "cookie-store/cookieStore_set_expires_option.tentative.window.js": [
-   "1eb72c6868686177a34fdb69158d184f096887b5",
+   "1425be76976edef1e9c8ef222ab90e956eb21bae",
    "testharness"
   ],
   "cookie-store/cookieStore_special_names.tentative.html": [
    "f839e2825dd18a6f54639fc2b7d4a18ce9906b25",
    "testharness"
   ],
   "cookie-store/cookieStore_special_names.tentative.https.html": [
    "4d53aaecbf9fea2865ca6492bc69b2ec3a47af79",
@@ -429582,17 +429582,17 @@
    "23916c5325b2c98875eac4ab7291622b44974daf",
    "testharness"
   ],
   "cookie-store/document_cookie.tentative.https.html": [
    "447ba96e7bb23a0def44817e584891097bb81998",
    "testharness"
   ],
   "cookie-store/document_getAll_multiple.tentative.html": [
-   "179f3ffe69715f9767ec2d2ef661c429fef52bc6",
+   "270700a50ac04a995665700688297b81c372ce37",
    "testharness"
   ],
   "cookie-store/http_cookie_and_set_cookie_headers.tentative.html": [
    "7fb04dc519bafed5f35493f65664b51e23131a1d",
    "testharness"
   ],
   "cookie-store/http_cookie_and_set_cookie_headers.tentative.https.html": [
    "2ccfc03ad6fedb063e2cd3ff9726b8d482ab5cf0",
@@ -429686,25 +429686,25 @@
    "38fe0bc6fbf08e5387f81e32348252c481af03c0",
    "support"
   ],
   "cookie-store/serviceworker_cookieStore_basic.tentative.https.html": [
    "0700dc72bc1e00832546d4a6826a5474600af06c",
    "testharness"
   ],
   "cookie-store/serviceworker_cookieStore_subscriptions.js": [
-   "932a140052fdd95c256bb8a7dfa24522774b569e",
+   "4fb3574d207f1dc09e488830714eb70b8bda55b4",
    "support"
   ],
   "cookie-store/serviceworker_cookieStore_subscriptions.tentative.https.html": [
    "4389e108fcbad909506ce6ea0d30e32f5973bfce",
    "testharness"
   ],
   "cookie-store/serviceworker_cookieStore_subscriptions_basic.js": [
-   "90300c01688cfecd10140078bf36d3801566c2ea",
+   "9de2007372d39f2c8552d476582a482b6a4bd1b4",
    "support"
   ],
   "cookie-store/serviceworker_cookieStore_subscriptions_basic.tentative.https.html": [
    "3836f1d36746ae11b76ee420ba34d902d48bc0af",
    "testharness"
   ],
   "cookies/OWNERS": [
    "15417c1a9e90762ae826b0258fe3619cc6a78b0e",
@@ -516142,17 +516142,17 @@
    "956e5156fd8c0e75b1c0f3b8b3b900b653663f74",
    "support"
   ],
   "css/css-regions/support/test-tr.png": [
    "078e1dd6dd61d36cec239ed75d02051f61fe60a5",
    "support"
   ],
   "css/css-regions/test-plan/index.html": [
-   "944891619b6abec0bd86a82253e4734edfb4534e",
+   "9cc66fa0dcb6bea78221133ac4f12acaa37d1046",
    "support"
   ],
   "css/css-regions/transforms/reference/regions-transforms-001-ref.html": [
    "3baa1915d5fd1d1e03e8dcc667ff10bfd9e974b0",
    "support"
   ],
   "css/css-regions/transforms/reference/regions-transforms-008-ref.html": [
    "bbe2558f884838e96cd4f03b31e367b94a5c529c",
@@ -539422,17 +539422,17 @@
    "aa52e04f368e535ca6bbd9931f8c5ad148241ed4",
    "support"
   ],
   "css/css-writing-modes/test-plan/img/stripe_triple.svg": [
    "3588204fc3899909510a54008833825084e574db",
    "support"
   ],
   "css/css-writing-modes/test-plan/index.html": [
-   "d8052e30e0242c0a1cec6fdf72dc4cdf68ebd930",
+   "ef508dabe6562d9c734335dd0a11d27e147d6522",
    "support"
   ],
   "css/css-writing-modes/test-plan/req-tcu-font.html": [
    "94244d93ce6d7c99d2315b657585ba56b419d596",
    "support"
   ],
   "css/css-writing-modes/text-align-vlr-003.xht": [
    "ff41d51a74d280e2f9a7010ccdd908c569e7877e",
@@ -553474,17 +553474,17 @@
    "aeebae31cec9dcf7a29f11858f6e67e03366e876",
    "support"
   ],
   "docs/OWNERS": [
    "8b8fcd1bcd07619951c92029a3f5cad01fa75d44",
    "support"
   ],
   "docs/_appendix/github-intro.md": [
-   "bd8e2b050f6e034759cd7eef234af699858cd372",
+   "88acb0045765901cb373625480200d0373a95aeb",
    "support"
   ],
   "docs/_appendix/index.md": [
    "eb9d13a352bcecf35ce0e78f593eecac33f858cd",
    "support"
   ],
   "docs/_appendix/test-templates.md": [
    "7dd354e2935ae85d867a069eac4a1ca4225d4140",
@@ -553498,17 +553498,17 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "docs/_includes/head.html": [
    "cf56bf94617badf479be3946ed1026f501623c6e",
    "support"
   ],
   "docs/_includes/header.html": [
-   "faa044875fe2a159030203db9400ea18ed385da8",
+   "cae15e78d4c1cd7287e7e0671d7a2799e9992627",
    "support"
   ],
   "docs/_includes/svg/octicons/LICENSE": [
    "b575eaf3c174e2406fca94f232f1a6048b905878",
    "support"
   ],
   "docs/_includes/svg/octicons/git-pull-request.svg": [
    "24da0c5d055b4b75290f1debdbeecac2d14334ef",
@@ -553526,41 +553526,41 @@
    "d9eae8adc1d2bd34a51177d4de466b6ea777eb3d",
    "support"
   ],
   "docs/_includes/svg/triangle-right.svg": [
    "9a22b3a576af7f6058284ad46448e54d4615c6c4",
    "support"
   ],
   "docs/_reviewing-tests/checklist.md": [
-   "c3f14eb28a73ec65fe80396c89fe94cd49a698ed",
+   "29bcd23855e07bd7117d27b7cae8b0ca47b18763",
    "support"
   ],
   "docs/_reviewing-tests/index.md": [
    "e1b4b49cbd7ea1fd703c7ab3814deee0669e9336",
    "support"
   ],
   "docs/_running-tests/chrome.md": [
-   "a09c8a0ea4d5d2abfd93843176b3c81e22fdbf22",
+   "05a3e2e99355e96fcdb52086c24f2687ef26fa73",
    "support"
   ],
   "docs/_running-tests/chrome_android.md": [
-   "f1e09247c9f41cf3c55aa087b063e42d48d88319",
+   "d9dd8f101594ea83a67bf9629aa5ab17f7879edb",
    "support"
   ],
   "docs/_running-tests/index.md": [
    "350437f8d19af554887d519013b4bed38fcb1a62",
    "support"
   ],
   "docs/_running-tests/safari.md": [
-   "cc0d20587edd9d0e8550b4fa2666d056061d02ee",
+   "e6eb8bf12b9d01ab452ac315efaf6865d8267f6e",
    "support"
   ],
   "docs/_writing-tests/ahem.md": [
-   "97ee326d501aea007b5f87ee98d0ee6ca303cbb1",
+   "ea2a8de04400ddd5efdd89203b9fdd10fb708e86",
    "support"
   ],
   "docs/_writing-tests/assumptions.md": [
    "8bb7a1cda9084f179e1373b8600d597d1072c08c",
    "support"
   ],
   "docs/_writing-tests/css-metadata.md": [
    "a7606cd41a6211a9e24850ae4c35a0621961230e",
@@ -553602,21 +553602,21 @@
    "ec1533df5a1bc5a13b9ceaac1265c0784ccd0a27",
    "support"
   ],
   "docs/_writing-tests/server-features.md": [
    "31af790d058eda13ec0ecf06e1c65d13419e4920",
    "support"
   ],
   "docs/_writing-tests/submission-process.md": [
-   "62747b6d0328445778050f3e4d6ec46dbdc3a18c",
+   "b105a3add28e7f1cad88f304beba1a94c92e6bb5",
    "support"
   ],
   "docs/_writing-tests/testdriver-tutorial.md": [
-   "f98be71f37dad3a469de5f4b55b99b8392255476",
+   "70c63a4ba676db565a4044d674da1beb1dd059ce",
    "support"
   ],
   "docs/_writing-tests/testdriver.md": [
    "2ffb3871fb13e6acd3171205bf80517dca06bcfe",
    "support"
   ],
   "docs/_writing-tests/testharness-api.md": [
    "6e49764657b4aa160f3db1a85f92910bfccae1e2",
@@ -553698,17 +553698,17 @@
    "8a28f329253f3293cd8798d53672bd5a85c260ce",
    "support"
   ],
   "docs/index.html": [
    "12c7175a4d6c486ca9ebea4c6a43d2aec9845d8b",
    "support"
   ],
   "docs/introduction.md": [
-   "0e7e19e553874040f954d81ca85b06a212126c11",
+   "e0ee31449296aeb6710a19ba265e96fc2d29b01f",
    "support"
   ],
   "dom/OWNERS": [
    "8c6222f056d7e5b318f37a80774f40889558df3f",
    "support"
   ],
   "dom/abort/event.any.js": [
    "d41904ddfc56e5ef3e89d965a4e5fa392e996ef9",
@@ -558206,17 +558206,17 @@
    "1b993f3a10b39a76f209a4beb6191a83c769eb8f",
    "support"
   ],
   "eventsource/resources/reconnect-fail.py": [
    "69571dcc7a756fe02d4f59d22cc5db45e5b4da34",
    "support"
   ],
   "eventsource/resources/status-error.py": [
-   "2a79947e7c0da4621a0299fbc279bc7eaefb2c0f",
+   "9a182b1bdb8b1e870f925a61f18f784fa8573eee",
    "support"
   ],
   "eventsource/resources/status-reconnect.py": [
    "96ec5d58d8558ca3b78c351c3fdf6835f709f4ca",
    "support"
   ],
   "eventsource/shared-worker/eventsource-close.htm": [
    "196601fcbfdb216fdf99730986e796a0f8164ddb",
@@ -559066,17 +559066,17 @@
    "97463bf3078c8579b074ab2a178710daf8502a41",
    "support"
   ],
   "fetch/api/request/request-clone.sub.html": [
    "64903370f5ae73c38dbab16b07b502a3f84367cb",
    "testharness"
   ],
   "fetch/api/request/request-consume-empty.html": [
-   "0b7f4d7e51825b125b9ebcc56f6bcaf0b6791faf",
+   "164a0a8ad16ea94fb53c74f8495bc060512c7bee",
    "testharness"
   ],
   "fetch/api/request/request-consume.html": [
    "9525e1c130e6660020c5fedb434fa0efdf62db81",
    "testharness"
   ],
   "fetch/api/request/request-disturbed.html": [
    "62d53aaa3cefd7f76f315ab3f3aa1cd5d5a4e4a0",
@@ -560606,29 +560606,29 @@
    "b2432e7ea263fb80be42e7eecf93a9d885c0205d",
    "manual"
   ],
   "generic-sensor/OWNERS": [
    "b1349055762c7d44414c0c11fb8500d5eee9a75f",
    "support"
   ],
   "generic-sensor/README.md": [
-   "48615c1b9e70e02c02ea0246eb7ca1953bab0c68",
+   "50ae2c420d8532b51509c281e72d8541f5e66391",
    "support"
   ],
   "generic-sensor/SensorErrorEvent-constructor.https.html": [
    "99bcfb42c91e084a3b847ab4bab2bad80e548540",
    "testharness"
   ],
   "generic-sensor/generic-sensor-feature-policy-test.sub.js": [
    "f90a08bd96c729c5c166fd628e69f01c3413a78c",
    "support"
   ],
   "generic-sensor/generic-sensor-tests.js": [
-   "a23c776f7536e3f406c78a5aa02359c7dde8c745",
+   "3a427e0ebd3191c2a6b982b74d139250d8fb085a",
    "support"
   ],
   "generic-sensor/idlharness.https.html": [
    "02c734b907075c8abb7504fc7e2b93730ac80a0c",
    "testharness"
   ],
   "geolocation-API/OWNERS": [
    "84c4182ceed0f75ada11e63c3dfc2acc2939cbb6",
@@ -564270,17 +564270,17 @@
    "6a0a46450d2b203592763e74998aeab5c40a0535",
    "testharness"
   ],
   "html/dom/dynamic-markup-insertion/document-write/051.html": [
    "e7c9064ba73547f25e0c7f202f14d51ee4e10fd1",
    "testharness"
   ],
   "html/dom/dynamic-markup-insertion/document-write/contentType.window.js": [
-   "f39e34dec9f0a9ca12e76085a26b567dff96dc55",
+   "3f1218b65f930ba0a31044163fb995527c020fa8",
    "testharness"
   ],
   "html/dom/dynamic-markup-insertion/document-write/document.write-01.xhtml": [
    "3b309503bf8f002712eafba1d5e7a1f3f743d7e1",
    "testharness"
   ],
   "html/dom/dynamic-markup-insertion/document-write/document.write-02.html": [
    "f4c6db3136e0860d38fe21193a0012eb5e4842ef",
@@ -570114,17 +570114,17 @@
    "ac4bab3d195d554570b3b035093a2750a4fdfa01",
    "support"
   ],
   "html/infrastructure/urls/resolving-urls/query-encoding/resources/page-using-manifest.py": [
    "349a5e8aec778ee6cabac210226a01f14be904e1",
    "support"
   ],
   "html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js": [
-   "d0eac1b59b0514b526be649a28d9fbd54e47db99",
+   "af372062048142740f83dd95feded927cf3a225b",
    "support"
   ],
   "html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py": [
    "1fe80369b002489cec48913f0a59c8099cef6461",
    "support"
   ],
   "html/infrastructure/urls/resolving-urls/query-encoding/resources/stash.py": [
    "0d599936f6a0baf6d9cce8d3236c146a159f1add",
@@ -580810,17 +580810,17 @@
    "bb4c385873deafd746f186058b111193c8aebf01",
    "support"
   ],
   "interfaces/css-font-loading.idl": [
    "a0d53cc4e88f38cce9fd45759963e5da9a6f3dc3",
    "support"
   ],
   "interfaces/css-typed-om.idl": [
-   "59bd8e2c3c1bf8fded9a5523b5bd3b59761eacef",
+   "36526913c07a04f9fd329a5650430db82407d766",
    "support"
   ],
   "interfaces/cssom-view.idl": [
    "3f575def818098d376ddf069673692530fcf8896",
    "support"
   ],
   "interfaces/cssom.idl": [
    "42c8e1cb0e7fbc5bb6f8a811b73554e3b72a6abd",
@@ -582578,25 +582578,25 @@
    "69591fe91d93bf0a6b171734b119274a8c69bbde",
    "support"
   ],
   "mimesniff/README.md": [
    "d0b95d2e21e80df8b65d5bc8217f79d862229ae2",
    "support"
   ],
   "mimesniff/mime-types/README.md": [
-   "f3cd8bf009de6ceb297af8bfdecb851f817fa02d",
+   "d073a81e538a5667b917ec3434ed8c6a6e47af2f",
    "support"
   ],
   "mimesniff/mime-types/charset-parameter.window.js": [
-   "baa985ca1fd0aed6644d9d1cef21764cfe826a8b",
+   "76e101bc321eabc022e4635bd92b615edf35a3a5",
    "testharness"
   ],
   "mimesniff/mime-types/parsing.any.js": [
-   "b40a3e56406cd6f3303877b1da07a74d0d2f9deb",
+   "654a5f93865b6be570c9c268c7ef9b686aaf15da",
    "testharness"
   ],
   "mimesniff/mime-types/resources/generated-mime-types.json": [
    "e4610646e4a1a417e9fccf868150aed3c5688942",
    "support"
   ],
   "mimesniff/mime-types/resources/generated-mime-types.py": [
    "1a3357e9bd14bc90cfa45f6844a270b7b3b93db4",
@@ -590754,17 +590754,17 @@
    "b46f1952420558f315241b048ebf68568c6f4fd6",
    "support"
   ],
   "payment-method-basic-card/OWNERS": [
    "ee0b02c59588d15b6efdb983c492ebbf50127e1c",
    "support"
   ],
   "payment-method-basic-card/empty-data-manual.https.html": [
-   "f58fecb7d70aac64befe54f403208da14e479b1b",
+   "6952f470ea4beb3aa879b3b847d920647b80eafb",
    "manual"
   ],
   "payment-method-basic-card/payment-request-canmakepayment-method.https.html": [
    "70f2de7b94ca8e22fdbfed6d39f6f1627b5bf3b0",
    "testharness"
   ],
   "payment-method-id/OWNERS": [
    "78f6ac38657ede306b767f1156cebd44bebbfb8e",
@@ -590774,57 +590774,57 @@
    "20d0e6d34a096a9e8c59a8e6ae7d0bfeaa0e6344",
    "support"
   ],
   "payment-request/OWNERS": [
    "60cf95eb7b2e583315fe8539d2caf38667412d19",
    "support"
   ],
   "payment-request/PaymentAddress/attributes-and-toJSON-method-manual.https.html": [
-   "46cac5ba402841a8bc311b1a11de4a82589ee567",
+   "9fafc1a7866fc2a0415de7a22bf55f5816c6ee75",
    "manual"
   ],
   "payment-request/PaymentItem/type_member.https.html": [
    "5568f96eac7b0ebf1d91d468bb30b9eaa8b1a9f0",
    "testharness"
   ],
   "payment-request/PaymentRequestUpdateEvent/constructor.http.html": [
    "017f1f1aca43171083833ddb27ff66e39902e85d",
    "testharness"
   ],
   "payment-request/PaymentRequestUpdateEvent/constructor.https.html": [
    "2b47979bae7fcc90fa5162dd597d6e55c96f2c15",
    "testharness"
   ],
   "payment-request/PaymentRequestUpdateEvent/updateWith-call-immediate-manual.https.html": [
-   "300c0740bdbeadcc7aad94e759ec8eff4256b7c8",
+   "d5a7ffd23844248ca67b8419a0ca1bb01285cad3",
    "manual"
   ],
   "payment-request/PaymentRequestUpdateEvent/updateWith-duplicate-shipping-options-manual.https.html": [
-   "6d139db4c12f85981ea3d1e6dc167e21510847fb",
+   "253db2eeff197ca1db58d72c13d01611a05d86cd",
    "manual"
   ],
   "payment-request/PaymentRequestUpdateEvent/updateWith-incremental-update-manual.https.html": [
-   "072a3a37d57fcc14c61f6ef74ac164d3a26cf985",
+   "d3192d90cbfd0faabb712cac7a8d8f95a068d6a3",
    "manual"
   ],
   "payment-request/PaymentRequestUpdateEvent/updateWith-method-abort-update-manual.https.html": [
-   "4a166673c699656849c0dc4eba9076b9cdc613ff",
+   "dad7d651a5b2b3cc04ca7c5f1cf9bd6d872949e4",
    "manual"
   ],
   "payment-request/PaymentRequestUpdateEvent/updateWith-state-checks-manual.https.html": [
-   "d05ca169a1766893613ba546e60259e8dc848f96",
+   "fdb6f08618941c416fc9a1bc8f47a346b5fd767b",
    "manual"
   ],
   "payment-request/PaymentRequestUpdateEvent/updatewith-method.https.html": [
    "08e63c4605bfa4838984aff13a82458ca2a6bdf8",
    "testharness"
   ],
   "payment-request/algorithms-manual.https.html": [
-   "6b1c0579e14eadb2daf3ece2443c605a1d8bb57b",
+   "66ff86a10c34c5301e1033f53788c2a0e28ab8b3",
    "manual"
   ],
   "payment-request/allowpaymentrequest/active-document-cross-origin.https.sub.html": [
    "e96ac343e8533e8e90d3cbd4113a902b9e93e0bc",
    "testharness"
   ],
   "payment-request/allowpaymentrequest/active-document-same-origin.https.html": [
    "8bbacc77b15f179bfc7ec4e08809e07181675030",
@@ -590866,37 +590866,37 @@
    "d92b607f67ce478d505544bb43cd015b4bc89987",
    "testharness"
   ],
   "payment-request/allowpaymentrequest/setting-allowpaymentrequest.https.sub.html": [
    "6e4028440fff617d6a0e9abb06625891eb53b28a",
    "testharness"
   ],
   "payment-request/change-shipping-option-manual.https.html": [
-   "9285ebf2cd716ea072c18fe668e95cf6ce4ec3de",
+   "f237de7c6a1b78d2f1c8eb55c473c7c57d1ae54a",
    "manual"
   ],
   "payment-request/change-shipping-option-select-last-manual.https.html": [
-   "2f219eaf8287790fc73700b1cd92fd4fd1970aca",
+   "cd9a9076f0eaf8a204de121e296a70adc7b209ca",
    "manual"
   ],
   "payment-request/historical.https.html": [
    "6695acdcd1647fdd37702a7f63658dcd50f25596",
    "testharness"
   ],
   "payment-request/interfaces.https.html": [
    "2280f0ef821cdc3093e10c2162d3756f5eeb78de",
    "testharness"
   ],
   "payment-request/payment-request-abort-method.https.html": [
    "a9d811dc41487ba7a8e5d55319574364b93362aa",
    "testharness"
   ],
   "payment-request/payment-request-canmakepayment-method-manual.https.html": [
-   "40e5bf0445eedb6bb78bd61fa4a468652462a14d",
+   "7531ea3b11f6e8de8cf71666b19861dbc5267cf7",
    "manual"
   ],
   "payment-request/payment-request-constructor-crash.https.html": [
    "383d1c3f9505ee63d504bee87e13efa90ba49f3d",
    "testharness"
   ],
   "payment-request/payment-request-constructor.https.html": [
    "511c4d25939d344f187fe4a8daa4a8ff926b613d",
@@ -590938,101 +590938,101 @@
    "4dbafc96c5effd3b697026aa9a29095e8f4a9296",
    "testharness"
   ],
   "payment-request/payment-request-shippingType-attribute.https.html": [
    "27ecc7e10e50bf2df07f84a15972c3b913ebf32f",
    "testharness"
   ],
   "payment-request/payment-request-show-method-manual.https.html": [
-   "1df34a1d4ae403ef4853af6850a3f2e9521703f7",
+   "539262a608731c0ffecbb333c9701b8db255817c",
    "manual"
   ],
   "payment-request/payment-request-show-method.https.html": [
    "d11b121987240d9d2cb4a5f3f6814f83d45f52e6",
    "testharness"
   ],
   "payment-request/payment-response/complete-method-manual.https.html": [
-   "dc083332294137bd562060c7bf13f0664e6e038f",
+   "5db1508a5e71a3af5b369f516555e791bc4254e2",
    "manual"
   ],
   "payment-request/payment-response/helpers.js": [
    "992e5ce9af876e7d3f76168f15691afd43b41791",
    "support"
   ],
   "payment-request/payment-response/methodName-attribute-manual.https.html": [
-   "88c5c390ad6396a7ffd5f11948adddfb2458b4fd",
+   "c3aa1efe27e18bdd261e669b0f23be1d49247e4d",
    "manual"
   ],
   "payment-request/payment-response/payerEmail-attribute-manual.https.html": [
-   "d2aa361068844ac6fc95dd694a19eb093df399b0",
+   "b2d661bdb17ad6e34ce04c1bdee283a3a1f00f55",
    "manual"
   ],
   "payment-request/payment-response/payerName-attribute-manual.https.html": [
-   "3e18addaac52270128e3c4dd6e3f5d421816a67e",
+   "290cccfa03cd294d59551b7a75da76c20d2302c3",
    "manual"
   ],
   "payment-request/payment-response/payerPhone-attribute-manual.https.html": [
-   "72009bc00083e739816d3442c42ed87f43d3e253",
+   "6b53792793c76e37d5beba7f6aaf795e030853ee",
    "manual"
   ],
   "payment-request/payment-response/requestId-attribute-manual.https.html": [
-   "5bda341b3faa65d5ff24cbc4fd5afe110e413146",
+   "e68d7a26754611c74a989ffafbc644bb7818832d",
    "manual"
   ],
   "payment-request/payment-response/shippingAddress-attribute-manual.https.html": [
-   "27768a28c6d3ecee925ff096bc9a7f028dc53f18",
+   "b05a100659e60c076458b86f148eb0793586b88e",
    "manual"
   ],
   "payment-request/payment-response/shippingOption-attribute-manual.https.html": [
-   "da91f7d011efeb58409d300bed3c0a4c3c7367d6",
+   "e9221b7f65863ad0fd139f298c8de5fa5eb96c99",
    "manual"
   ],
   "payment-request/rejects_if_not_active.https.html": [
    "b7defcf07abde6a18f0012c21bee2e00a5669cd0",
    "testharness"
   ],
   "payment-request/resources/page1.html": [
    "9bd62a5279e60dc30b39c449f4aefbe30f9db336",
    "support"
   ],
   "payment-request/resources/page2.html": [
    "9bd62a5279e60dc30b39c449f4aefbe30f9db336",
    "support"
   ],
   "payment-request/shipping-address-changed-manual.https.html": [
-   "db68756c6cc3cc2146f608a04988cd938a2dd0de",
+   "34c24ab265195133dcab5698466d876ff12962f3",
    "manual"
   ],
   "payment-request/show-method-optional-promise-rejects-manual.https.html": [
-   "6d3d14e0c238ae83944625f4623c7a44ac0b4c46",
+   "4a0d50c8b3b7ed63d24a0c13274cd535ba49117c",
    "manual"
   ],
   "payment-request/show-method-optional-promise-resolves-manual.https.html": [
-   "ec7d847f9623fcafb0a74903dc2dcefbf0175755",
+   "f23e8314cfae063f57294b7f328292e59fb2ad83",
    "manual"
   ],
   "payment-request/show-method-postmessage-iframe.html": [
    "0a2746f8a46a55ba3c244db27092f3ae490db7c5",
    "support"
   ],
   "payment-request/show-method-postmessage-manual.https.html": [
-   "39aa1ef2cb62f122749f55373964315014e29dc7",
+   "d44366e5e67ee42abb464f4ae864e07fad76865c",
    "manual"
   ],
   "payment-request/updateWith-method-pmi-handling-manual.https.html": [
-   "b473073ad106e9e0732adb6bfbed5f54d6ec3194",
+   "be79b8f3f6ce9a4401b60b83a43f8a43ca77327d",
    "manual"
   ],
   "payment-request/user-abort-algorithm-manual.https.html": [
-   "31a6f480d015c6c715df2001b03f487a205a7311",
+   "d86879e71d7f262a7742a4be30be27b8998e90d7",
    "manual"
   ],
   "payment-request/user-accepts-payment-request-algo-manual.https.html": [
-   "37f114e9c510722f9966c092c8a4f5008688d86e",
+   "e889c0b281184662553c687301edc3a3cd52ea33",
    "manual"
   ],
   "performance-timeline/OWNERS": [
    "b82f9756b15ef3ea45fb250e304031d9ceaee9c7",
    "support"
   ],
   "performance-timeline/case-sensitivity.any.js": [
    "9c6b6edf19800a2730de2dfe601a7cd2503cf87d",
@@ -602290,17 +602290,17 @@
    "a7d5f02a569179c9c9308ffab5aa6ea545d965f4",
    "testharness"
   ],
   "service-workers/service-worker/postmessage-to-client.https.html": [
    "4db5bfbf0f1afcace2a4ea79451c2ff5fc09ab3c",
    "testharness"
   ],
   "service-workers/service-worker/postmessage.https.html": [
-   "dfd851992c1ab3be263bce6f669fceda47d0f410",
+   "1acc630c23f89611e41cf4a9ed0e17b7a8ca31b9",
    "testharness"
   ],
   "service-workers/service-worker/ready.https.html": [
    "1f479de232c8e847fcaa31bb5ed869fe070054b6",
    "testharness"
   ],
   "service-workers/service-worker/redirected-response.https.html": [
    "d198b2691974b01750c4770153ede36ec5de40f6",
@@ -603582,17 +603582,17 @@
    "40ec7850c61a3ee7578f055d3eef87293cfad482",
    "testharness"
   ],
   "service-workers/service-worker/webvtt-cross-origin.https.html": [
    "121299a30b5f75218c1e460578473066a011db46",
    "testharness"
   ],
   "service-workers/service-worker/windowclient-navigate.https.html": [
-   "828d8d920459541a37e747ac01376fdcac51ffb3",
+   "7b7f42f68af9a10961b80e67ecf615a31f3a0e80",
    "testharness"
   ],
   "service-workers/service-worker/worker-client-id.https.html": [
    "2d39130ccf8401d8bd71e494f5276c9309122dd6",
    "testharness"
   ],
   "service-workers/service-worker/worker-in-sandboxed-iframe-by-csp-fetch-event.https.html": [
    "c9cff3f5fb5c205020ad39df6d22ad19ce0cbb0a",
@@ -604406,17 +604406,17 @@
    "7f59d0e37562a6adfb2972b61928375047266ac7",
    "testharness"
   ],
   "streams/count-queuing-strategy.sharedworker.html": [
    "875e0dffe7710c21bfcb8f554c2216626c2eb013",
    "testharness"
   ],
   "streams/generate-test-wrappers.js": [
-   "f40527e4036f235c2268e9f9c5b7267f2b0e3799",
+   "d432f6de064deb351686a715e167123c999e354d",
    "support"
   ],
   "streams/piping/close-propagation-backward.dedicatedworker.html": [
    "17e143af0bd875f6097c2314ea9861e4b19ff91a",
    "testharness"
   ],
   "streams/piping/close-propagation-backward.html": [
    "12e087aed62dfde8130ad241c261e6863147e3d1",
@@ -612562,17 +612562,17 @@
    "8ce6c9650d2ebbf77107e7c0ad68941608f83781",
    "testharness"
   ],
   "webgl/uniformMatrixNfv.html": [
    "f53e7687ad6aef0ffc064d941a05a222c33fde56",
    "testharness"
   ],
   "webmessaging/Channel_postMessage_Blob.htm": [
-   "9667a479d4ed3f01dd052567a67256c20a533074",
+   "d1644d35cf79e79c9bda4387795d0fd9a909be6c",
    "testharness"
   ],
   "webmessaging/Channel_postMessage_DataCloneErr.htm": [
    "a62fdac80932ca059c8853ca9a9f8edd13926f86",
    "testharness"
   ],
   "webmessaging/Channel_postMessage_clone_port.htm": [
    "a50daa07667a83ee98fef558876666ac401f199d",
@@ -612634,17 +612634,17 @@
    "236c9b67981c36536c9b2baa98d064e125b55ecb",
    "testharness"
   ],
   "webmessaging/broadcastchannel/basics.html": [
    "bdb7eb2c33f8df3d8b33547ef5412a531fb4ad35",
    "testharness"
   ],
   "webmessaging/broadcastchannel/blobs.html": [
-   "6783e7192e63a0418d65885715baa3ba1c99e33a",
+   "ffe8dce33ae15b4af034377d65d3390b438a3a29",
    "testharness"
   ],
   "webmessaging/broadcastchannel/interface.html": [
    "629bb3f606b84cd201cff2ad420a736f019c0395",
    "testharness"
   ],
   "webmessaging/broadcastchannel/origin.window.js": [
    "7f906e51a34a5ee36c7407e3d0104c1bfb0c12bb",
@@ -612654,17 +612654,17 @@
    "480c3aec73713c46808a1345d9f7199896fedb94",
    "support"
   ],
   "webmessaging/broadcastchannel/resources/sandboxed.html": [
    "19db2a3048a9599dcfc488534fce65bc2a34b6ad",
    "support"
   ],
   "webmessaging/broadcastchannel/resources/worker.js": [
-   "d870e4e7ca81044bd62ddbf79fb666d02bc5b9ee",
+   "55bb074587b4ccb599a56092b9c69ea6db8e253c",
    "support"
   ],
   "webmessaging/broadcastchannel/sandbox.html": [
    "9eeb2cbdcf50727280da1de83f665c6041b7741c",
    "testharness"
   ],
   "webmessaging/broadcastchannel/workers.html": [
    "2ca289f36c001c15e64b849098e8f28b21178862",
@@ -613234,17 +613234,17 @@
    "16fe3b155e55d1b66181788c93e570b36e5cc67d",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-setRemoteDescription.html": [
    "8a3e2f1e157e1ceed18ac66e57040a941b658f24",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-track-stats.https.html": [
-   "c31d22b6d9322d6d9b12414682d04137ad8cfb5d",
+   "401279780028dc08d5d9315748d83e29665685f1",
    "testharness"
   ],
   "webrtc/RTCPeerConnectionIceEvent-constructor.html": [
    "f273bd7fdfc883a15e8fb16fef5309061254c6cc",
    "testharness"
   ],
   "webrtc/RTCRtpCapabilities-helper.js": [
    "22881ddd3cda1a64ff22474562de1568522e9745",

--- a/testing/web-platform/tests/2dcontext/tools/gentestutils.py
+++ b/testing/web-platform/tests/2dcontext/tools/gentestutils.py
@@ -2,17 +2,17 @@
 # Released under the BSD license and W3C Test Suite License: see LICENSE.txt
 
 # Current code status:
 #
 # This was originally written for use at
 # http://philip.html5.org/tests/canvas/suite/tests/
 #
 # It has been adapted for use with the Web Platform Test Suite suite at
-# https://github.com/w3c/web-platform-tests/
+# https://github.com/web-platform-tests/wpt/
 #
 # The original version had a number of now-removed features (multiple versions of
 # each test case of varying verbosity, Mozilla mochitests, semi-automated test
 # harness). It also had a different directory structure.
 
 # To update or add test cases:
 #
 # * Modify the tests*.yaml files.

--- a/testing/web-platform/tests/README.md
+++ b/testing/web-platform/tests/README.md
@@ -10,17 +10,17 @@ their implementations. This in turn give
 confidence that they can actually rely on the Web platform to deliver on
 the promise of working across browsers and devices without needing extra
 layers of abstraction to paper over the gaps left by specification
 editors and implementors.
 
 Setting Up the Repo
 ===================
 
-Clone or otherwise get https://github.com/w3c/web-platform-tests.
+Clone or otherwise get https://github.com/web-platform-tests/wpt.
 
 Note: because of the frequent creation and deletion of branches in this
 repo, it is recommended to "prune" stale branches when fetching updates,
 i.e. use `git pull --prune` (or `git fetch -p && git merge`).
 
 Running the Tests
 =================
 
@@ -351,17 +351,17 @@ The way to contribute is just as usual:
 * Commit locally and push that to your repo.
 * Send in a pull request based on the above.
 
 Issues with web-platform-tests
 ------------------------------
 
 If you spot an issue with a test and are not comfortable providing a
 pull request per above to fix it, please
-[file a new issue](https://github.com/w3c/web-platform-tests/issues/new).
+[file a new issue](https://github.com/web-platform-tests/wpt/issues/new).
 Thank you!
 
 Lint tool
 ---------
 
 We have a lint tool for catching common mistakes in test files. You
 can run it manually by starting the `lint` executable from the root of
 your local web-platform-tests working directory like this:
@@ -427,34 +427,34 @@ changes to tests in a given directory, f
 OWNERS file. Anyone with expertise in the specification under test can
 approve a pull request.  In particular, if a test change has already
 been adequately reviewed "upstream" in another repository, it can be
 pushed here without any further review by supplying a link to the
 upstream review.
 
 Search filters to find things to review:
 
-* [Open PRs (excluding vendor exports)](https://github.com/w3c/web-platform-tests/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+-label%3A%22mozilla%3Agecko-sync%22+-label%3A%22chromium-export%22+-label%3A%22webkit-export%22+-label%3A%22servo-export%22)
-* [Reviewed but still open PRs (excluding vendor exports)](https://github.com/w3c/web-platform-tests/pulls?q=is%3Apr+is%3Aopen+-label%3Amozilla%3Agecko-sync+-label%3Achromium-export+-label%3Awebkit-export+-label%3Aservo-export+review%3Aapproved) (Merge? Something left to fix? Ping other reviewer?)
-* [Open PRs without owners](https://github.com/w3c/web-platform-tests/pulls?q=is%3Apr+is%3Aopen+label%3Astatus%3Aneeds-owners)
-* [Open PRs with label `infra` (excluding vendor exports)](https://github.com/w3c/web-platform-tests/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+label%3Ainfra+-label%3A%22mozilla%3Agecko-sync%22+-label%3A%22chromium-export%22+-label%3A%22webkit-export%22+-label%3A%22servo-export%22)
-* [Open PRs with label `docs` (excluding vendor exports)](https://github.com/w3c/web-platform-tests/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+label%3Adocs+-label%3A%22mozilla%3Agecko-sync%22+-label%3A%22chromium-export%22+-label%3A%22webkit-export%22+-label%3A%22servo-export%22)
+* [Open PRs (excluding vendor exports)](https://github.com/web-platform-tests/wpt/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+-label%3A%22mozilla%3Agecko-sync%22+-label%3A%22chromium-export%22+-label%3A%22webkit-export%22+-label%3A%22servo-export%22)
+* [Reviewed but still open PRs (excluding vendor exports)](https://github.com/web-platform-tests/wpt/pulls?q=is%3Apr+is%3Aopen+-label%3Amozilla%3Agecko-sync+-label%3Achromium-export+-label%3Awebkit-export+-label%3Aservo-export+review%3Aapproved) (Merge? Something left to fix? Ping other reviewer?)
+* [Open PRs without owners](https://github.com/web-platform-tests/wpt/pulls?q=is%3Apr+is%3Aopen+label%3Astatus%3Aneeds-owners)
+* [Open PRs with label `infra` (excluding vendor exports)](https://github.com/web-platform-tests/wpt/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+label%3Ainfra+-label%3A%22mozilla%3Agecko-sync%22+-label%3A%22chromium-export%22+-label%3A%22webkit-export%22+-label%3A%22servo-export%22)
+* [Open PRs with label `docs` (excluding vendor exports)](https://github.com/web-platform-tests/wpt/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+label%3Adocs+-label%3A%22mozilla%3Agecko-sync%22+-label%3A%22chromium-export%22+-label%3A%22webkit-export%22+-label%3A%22servo-export%22)
 
 Getting Involved
 ================
 
 If you wish to contribute actively, you're very welcome to join the
 public-test-infra@w3.org mailing list (low traffic) by
 [signing up to our mailing list](mailto:public-test-infra-request@w3.org?subject=subscribe).
 The mailing list is [archived][mailarchive].
 
 Join us on irc #testing ([irc.w3.org][ircw3org], port 6665). The channel
 is [archived][ircarchive].
 
-[contributing]: https://github.com/w3c/web-platform-tests/blob/master/CONTRIBUTING.md
+[contributing]: https://github.com/web-platform-tests/wpt/blob/master/CONTRIBUTING.md
 [ircw3org]: https://www.w3.org/wiki/IRC
 [ircarchive]: https://w3.logbot.info/testing
 [mailarchive]: https://lists.w3.org/Archives/Public/public-test-infra/
 
 Documentation
 =============
 
 * [How to write and review tests](https://web-platform-tests.org/)

--- a/testing/web-platform/tests/annotation-model/CONTRIBUTING.md
+++ b/testing/web-platform/tests/annotation-model/CONTRIBUTING.md
@@ -47,17 +47,17 @@ JSON Schema that test the assertions imp
 The structure of a test case is defined using a [JSON-LD
 Context](JSONtest-v1.jsonld).  That context defines the following terms:
 
 |Keyword        | Values          | Meaning
 |---------------|-----------------|---------
 |name           | string          | The name of this test for display purposes
 |description    | string          | A long self-describing paragraph that explains the purpose of the test and the expected input
 |ref            | URI             | An optional reference to the portion of the specification to which the test relates
-|testType       | `automated`, `manual`, `ref` | The type of test - this informs [WPT](https://github.com/w3c/web-platform-tests) how the test should be controlled and presented
+|testType       | `automated`, `manual`, `ref` | The type of test - this informs [WPT](https://github.com/web-platform-tests/wpt) how the test should be controlled and presented
 |skipFailures   | list of strings | An optional list of assertionType values that, if present, should have their test skipped if the result would be "unexpected".  Defaults to the empty list.
 |assertions     | list of URI, List @@@ATRISK@@@, or AssertionObject | The ordered collection of tests the input should be run against. See [JSON Schema Usage](#jsonSchema) for the structure of the objects.  URI is relative to the top level folder of the test collection if it has a slash; relative to the current directory if it does not. @@@@ATRISK@@@@ Lists can be nested to define groups of sub-tests.  Assertions / groups can be conditionally skipped.  See [Assertion Lists](#assertionLists) for more details.
 |content        | URI or object   | An object containing content to be checked against the referenced assertions, or a URI from which to retrieve that content
 
 Each test case has a suffix of `.test` and a shape like:
 
 <pre>
 {

--- a/testing/web-platform/tests/conformance-checkers/tools/url.py
+++ b/testing/web-platform/tests/conformance-checkers/tools/url.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 import os
 ccdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-# based on https://github.com/w3c/web-platform-tests/blob/275544eab54a0d0c7f74ccc2baae9711293d8908/url/urltestdata.txt
+# based on https://github.com/web-platform-tests/wpt/blob/275544eab54a0d0c7f74ccc2baae9711293d8908/url/urltestdata.txt
 invalid = {
     "scheme-trailing-space": "a: foo.com",
     "scheme-trailing-tab": "a:\tfoo.com",
     "scheme-trailing-newline": "a:\nfoo.com",
     "scheme-trailing-cr": "a:\rfoo.com",
     "scheme-http-no-slash": "http:foo.com",
     "scheme-http-no-slash-colon": "http::@c:29",
     "scheme-http-no-slash-square-bracket": "http:[61:27]/:foo",

--- a/testing/web-platform/tests/content-security-policy/README.html
+++ b/testing/web-platform/tests/content-security-policy/README.html
@@ -9,17 +9,17 @@
     <script>
         hljs.initHighlightingOnLoad();
     </script>
 </head>
 
 <body>
     <h1>Introduction to Writing Content Security Policy Tests</h1>
     <p>The CSP test suite uses the standard W3C testharness.js framework, but there are a few additional things you'll need to do because of the unique way CSP works, even if you're already an expert at writing W3C tests. These tests require the use of the
-    <a href="https://github.com/w3c/wptserve">wptserve</a> server (included in the <a href="https://github.com/w3c/web-platform-tests">web-platform-tests repository</a>) to operate correctly.</p>
+    <a href="https://github.com/w3c/wptserve">wptserve</a> server (included in the <a href="https://github.com/web-platform-tests/wpt">web-platform-tests repository</a>) to operate correctly.</p>
 
     <h2>What's different about writing CSP tests?</h2>
 
     <h3>Headers</h3>
     <p>Content Security Policy is preferentially set through an HTTP header. This means we can't do our tests just as a simple set of HTML+CSS+JS files. Luckily the wptserver framework provides an easy method to add headers to a file.</p>
     <p>If my file is named <span class=code>example.html</span> then I can create a file
         <span class=code>example.html.headers</span> to define the headers that will be served with it. If I need to do template substitutions in the headers, I can instead create a file named <span class=code>example.html.sub.headers</span>.</p>
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_delete_arguments.tentative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_delete_arguments.tentative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_event_basic.tentative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_event_basic.tentative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_event_delete.tenative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_event_delete.tenative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_event_overwrite.tentative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_event_overwrite.tentative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_getAll_arguments.tentative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_getAll_arguments.tentative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_getAll_set_basic.tentative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_getAll_set_basic.tentative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_get_arguments.tentative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_get_arguments.tentative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_get_delete_basic.tentative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_get_delete_basic.tentative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_get_set_basic.tentative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_get_set_basic.tentative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_has_arguments.tentative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_has_arguments.tentative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_has_basic.tentative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_has_basic.tentative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_set_arguments.tentative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_set_arguments.tentative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/cookieStore_set_expires_option.tentative.window.js
+++ b/testing/web-platform/tests/cookie-store/cookieStore_set_expires_option.tentative.window.js
@@ -1,12 +1,12 @@
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/document_getAll_multiple.tentative.html
+++ b/testing/web-platform/tests/cookie-store/document_getAll_multiple.tentative.html
@@ -4,17 +4,17 @@
 <link rel="help" href="https://github.com/WICG/cookie-store">
 <link rel="author" href="pwnall@chromium.org" title="Victor Costan">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
 'use strict';
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/serviceworker_cookieStore_subscriptions.js
+++ b/testing/web-platform/tests/cookie-store/serviceworker_cookieStore_subscriptions.js
@@ -14,17 +14,17 @@ self.addEventListener('install', (event)
     await cookieStore.subscribeToChanges([
       { },  // Test the default values for subscription properties.
       { name: 'cookie-prefix', matchType: 'startsWith' },
     ]);
   })());
 });
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/cookie-store/serviceworker_cookieStore_subscriptions_basic.js
+++ b/testing/web-platform/tests/cookie-store/serviceworker_cookieStore_subscriptions_basic.js
@@ -7,17 +7,17 @@ importScripts("/resources/testharness.js
 self.addEventListener('install', (event) => {
   event.waitUntil((async () => {
     cookieStore.subscribeToChanges([
       { name: 'cookie-name', matchType: 'equals', url: '/scope/path' }]);
   })());
 });
 
 // Workaround because add_cleanup doesn't support async functions yet.
-// See https://github.com/w3c/web-platform-tests/issues/6075
+// See https://github.com/web-platform-tests/wpt/issues/6075
 async function async_cleanup(cleanup_function) {
   try {
     await cleanup_function();
   } catch (e) {
     // Errors in cleanup functions shouldn't result in test failures.
   }
 }
 

--- a/testing/web-platform/tests/css/css-regions/test-plan/index.html
+++ b/testing/web-platform/tests/css/css-regions/test-plan/index.html
@@ -158,17 +158,17 @@
           new spec might be created to cater for the needs of multiple specs
           (e.g. the CSS Fragmentation spec [[css3-break]]).
         </p>
       </section>
       <section>
         <h3>Big number of tests required</h3>
         <div class="note">
           Add here the estimation of tests required produced by
-          <a href="https://github.com/w3c/web-platform-tests/tree/master/tools/coverage" target="_blank">W3C test coverage</a>
+          <a href="https://github.com/web-platform-tests/wpt/tree/master/tools/coverage" target="_blank">W3C test coverage</a>
           tool. If possible, provide a better informed guess on the number of tests.
         </div>
         <p>
           Given the complexity of the spec, a big number of tests will need to
           be created to produce a test suite that can ensure interoperability
           between implementations.
         </p>
         <p>

--- a/testing/web-platform/tests/css/css-writing-modes/test-plan/index.html
+++ b/testing/web-platform/tests/css/css-writing-modes/test-plan/index.html
@@ -293,17 +293,17 @@ table.simple {
           new spec might be created to cater for the needs of multiple specs
           (e.g. the CSS Fragmentation spec [[css3-break]]).
         </p>
       </section>
       <section>
         <h3>Big number of tests required</h3>
         <div class="note">
           Add here the estimation of tests required produced by
-          <a href="https://github.com/w3c/web-platform-tests/tree/master/tools/coverage" target="_blank">W3C test coverage</a>
+          <a href="https://github.com/web-platform-tests/wpt/tree/master/tools/coverage" target="_blank">W3C test coverage</a>
           tool. If possible, provide a better informed guess on the number of tests.
         </div>
         <p>
           Given the complexity of the spec, a big number of tests will need to
           be created to produce a test suite that can ensure interoperability
           between implementations.
         </p>
         <p>

--- a/testing/web-platform/tests/docs/_appendix/github-intro.md
+++ b/testing/web-platform/tests/docs/_appendix/github-intro.md
@@ -43,17 +43,17 @@ 4.  (Optional) If you don't want to ente
     time you talk to the remote server, you'll need to set up password caching.
     See [Caching your GitHub password in Git][password-caching].
 
 ## Test Repositories
 
 The test repository that you contribute to will depend on the specification
 that you are testing.
 
-**Main W3C test repository**: [github.com/w3c/web-platform-tests][main-repo]
+**Main W3C test repository**: [github.com/web-platform-tests/wpt][main-repo]
 
 ## Fork
 
 Now that you have Git set up, you will need to fork the test repository. This
 will enable you to [submit][submit] your tests using a pull request (more on this
 [below][submit]).
 
 1.  In the browser, go to [web-platform-tests on GitHub][main-repo].
@@ -106,17 +106,17 @@ 1.  On the command line, navigate to to 
 2.  Make sure that you are on the master branch.  This will  be the case if you
     just forked, otherwise switch to master.
 
         $ git checkout master
 
 3.  Next, add the remote of the repository your forked.  This assigns the
     original repository to a remote called "upstream":
 
-        $ git remote add upstream https://github.com/w3c/web-platform-tests.git
+        $ git remote add upstream https://github.com/web-platform-tests/wpt.git
 
 4.  To pull in changes in the original repository that are not present in your
     local repository first fetch them:
 
         $ git fetch upstream
 
     Then merge them into your local repository:
 
@@ -214,17 +214,17 @@ 2.  Now you can send a message that you 
 3. Now create the pull request.  There are several ways to create a PR in the
 GitHub UI.  Below is one method and others can be found on
 [GitHub.com][github-createpr]
 
     1. Click the ![pull request link][pullrequestlink] link on the right side
     of the UI, then click the ![new pull request][pullrequestbtn] button.
 
     2.  On the left, you should see the base repo is the
-        w3c/web-platform-tests. On the right, you should see your fork of that
+        web-platform-tests/wpt. On the right, you should see your fork of that
         repo. In the branch menu of your forked repo, switch to `topic`
 
         **Note:** If you see _'There isn't anything to compare'_, click
         the ![edit][editbtn] button and make sure your fork and your `topic`
         branch is selected on the right side.
 
     3. Select the ![create pull request][createprlink] link at the top.
 
@@ -318,18 +318,18 @@ that bothering the original author seems
 Here is how to do all that.
 
 ### Trivial cases
 
 If it is possible to review the tests without a local copy,
 but the reviewer still wants to make some simple tweaks to the tests before merging,
 it is possible to do so via the Github web UI.
 
-1. Open the pull request. E.g. https://github.com/w3c/web-platform-tests/pull/1234
-2. Go to the ![Files changed][files-changed] view (e.g. https://github.com/w3c/web-platform-tests/pull/1234/files)
+1. Open the pull request. E.g. https://github.com/web-platform-tests/wpt/pull/1234
+2. Go to the ![Files changed][files-changed] view (e.g. https://github.com/web-platform-tests/wpt/pull/1234/files)
 3. Locate the files you wish to change, and click the ![pencil][pencil-icon] icon in the upper right corner
 4. Make the desired change
 5. Write a commit message (including a good title) at the bottom
 6. Make sure the ![Commit directly to the [name-of-the-PR-branch] branch.][commit-directly] radio button is selected.
 
    _Note: If the PR predates the introduction of this feature by Github,
    or if the author of the PR has disabled write-access by reviewers to the PR branch,
    this may not be available,
@@ -388,17 +388,17 @@ you may also discard your connection to 
 [forkbtn]: {{ site.baseurl }}{% link /assets/forkbtn.png %}
 [git]: https://git-scm.com/downloads
 [git-book]: https://git-scm.com/book
 [github]: https://github.com/
 [github-w3c]: https://github.com/w3c
 [github-fork-docs]: https://help.github.com/articles/fork-a-repo
 [github-createpr]: https://help.github.com/articles/creating-a-pull-request
 [help]: https://help.github.com/
-[main-repo]: https://github.com/w3c/web-platform-tests
+[main-repo]: https://github.com/web-platform-tests/wpt
 [password-caching]: https://help.github.com/articles/caching-your-github-password-in-git
 [pullrequestlink]: {{ site.baseurl }}{% link /assets/pullrequestlink.png %}
 [pullrequestbtn]: {{ site.baseurl }}{% link /assets/pullrequestbtn.png %}
 [editbtn]: {{ site.baseurl }}{% link /assets/editbtn.png %}
 [createprlink]: {{ site.baseurl }}{% link /assets/createprlink.png %}
 [sendpullrequest]: {{ site.baseurl }}{% link /assets/sendpullrequest.png %}
 [praccepteddelete]: {{ site.baseurl }}{% link /assets/praccepteddelete.png %}
 [submit]: #submit

--- a/testing/web-platform/tests/docs/_includes/header.html
+++ b/testing/web-platform/tests/docs/_includes/header.html
@@ -1,11 +1,11 @@
 <header class="site-header" role="banner">
 
-  <a class="github-fork-ribbon left-top" href="https://github.com/w3c/web-platform-tests/blob/master/docs/{{ page.path }}" data-ribbon="Edit on GitHub">Edit on GitHub</a>
+  <a class="github-fork-ribbon left-top" href="https://github.com/web-platform-tests/wpt/blob/master/docs/{{ page.path }}" data-ribbon="Edit on GitHub">Edit on GitHub</a>
 
   <div class="wrapper">
 
     <a class="site-title" href="{{ "/" | relative_url}}">{{ site.title | escape }}</a>
 
     <nav class="wpt-site-nav" tabindex="0" aria-haspopup="true">
       <span class="menu-icon">
         <svg viewBox="0 0 18 15" width="18px" height="15px">

--- a/testing/web-platform/tests/docs/_reviewing-tests/checklist.md
+++ b/testing/web-platform/tests/docs/_reviewing-tests/checklist.md
@@ -2,17 +2,17 @@
 layout: page
 title: Review Checklist
 order: 2
 ---
 
 The following checklist is provided as a guideline to assist in reviewing
 tests; in case of any contradiction with requirements stated elsewhere in the
 documentation it should be ignored
-(please [file a bug](https://github.com/w3c/web-platform-tests/issues/new)!).
+(please [file a bug](https://github.com/web-platform-tests/wpt/issues/new)!).
 
 As noted on the [reviewing tests][review index] page, nits need not block PRs
 from landing.
 
 
 ## All tests
 
 <label>

--- a/testing/web-platform/tests/docs/_running-tests/chrome.md
+++ b/testing/web-platform/tests/docs/_running-tests/chrome.md
@@ -26,16 +26,16 @@ To enable a specific [runtime enabled fe
 ```
 
 To bypass device selection and use mock media for tests using `getUserMedia`:
 
 ```
 ./wpt run --binary-arg=--use-fake-ui-for-media-stream --binary-arg=--use-fake-device-for-media-stream chrome mediacapture-streams/
 ```
 
-Note: there's an [open issue for doing this using WebDriver](https://github.com/w3c/web-platform-tests/issues/7424).
+Note: there's an [open issue for doing this using WebDriver](https://github.com/web-platform-tests/wpt/issues/7424).
 
 Some of the above are most useful in combination, e.g., to run all tests in
 Chrome Dev with experimental web platform features enabled:
 
 ```
 ./wpt run --binary `which google-chrome-unstable` --binary-arg=--enable-experimental-web-platform-features chrome
 ```

--- a/testing/web-platform/tests/docs/_running-tests/chrome_android.md
+++ b/testing/web-platform/tests/docs/_running-tests/chrome_android.md
@@ -19,17 +19,17 @@ 127.0.0.1   www1.web-platform.test
 127.0.0.1   www2.web-platform.test
 127.0.0.1   xn--n8j6ds53lwwkrqhv28a.web-platform.test
 127.0.0.1   xn--lve-6lad.web-platform.test
 ```
 
 ## CA certificate
 
 In order to run HTTPS tests, we need to add
-[WPT's CA](https://github.com/w3c/web-platform-tests/blob/master/tools/certs/cacert.pem)
+[WPT's CA](https://github.com/web-platform-tests/wpt/blob/master/tools/certs/cacert.pem)
 to the phone. First, convert the certificate from PEM to CRT:
 
 ```
 openssl x509 -outform der -in tools/certs/cacert.pem -out cacert.crt
 ```
 
 Then copy `cacert.crt` to your phone's external storage (preferably to
 Downloads/ as it'll be easier to find). Open Settings -> Security & location ->

--- a/testing/web-platform/tests/docs/_running-tests/safari.md
+++ b/testing/web-platform/tests/docs/_running-tests/safari.md
@@ -9,17 +9,17 @@ To run Safari on macOS, some manual setu
   * Allow pop-up windows:
     `defaults write com.apple.Safari WebKitJavaScriptCanOpenWindowsAutomatically 1`
 
   * Trust the certificate:
     `security add-trusted-cert -k "$(security default-keychain | cut -d\" -f2)" tools/certs/cacert.pem`
 
   * Set `OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES` in your environment. This is a
     workaround for a known
-    [macOS High Sierra issue](https://github.com/w3c/web-platform-tests/issues/9007).
+    [macOS High Sierra issue](https://github.com/web-platform-tests/wpt/issues/9007).
 
 Now, run the tests using the `safari` product:
 ```
 ./wpt run safari [test_list]
 ```
 
 This will use the `safaridriver` found on the path, which will be stable Safari.
 To run Safari Technology Preview instead, use the `--webdriver-binary` argument:

--- a/testing/web-platform/tests/docs/_writing-tests/ahem.md
+++ b/testing/web-platform/tests/docs/_writing-tests/ahem.md
@@ -81,9 +81,9 @@ menu.
 
 On macOS, open the downloaded file in Font Book (the default
 application for font files) and then click install.
 
 On Linux, copy the file to `~/.local/share/fonts` and then run
 `fc-cache`.
 
 [ahem-readme]: https://www.w3.org/Style/CSS/Test/Fonts/Ahem/README
-[download-ahem]: https://github.com/w3c/web-platform-tests/raw/master/fonts/Ahem.ttf
+[download-ahem]: https://github.com/web-platform-tests/wpt/raw/master/fonts/Ahem.ttf

--- a/testing/web-platform/tests/docs/_writing-tests/submission-process.md
+++ b/testing/web-platform/tests/docs/_writing-tests/submission-process.md
@@ -36,14 +36,14 @@ on, e.g. `git checkout -b topic-name`
 For detailed guidelines on setup and each of these steps, please refer to the
 [Github Test Submission][github-intro] documentation.
 
 Hop on to the [mailing list][public-test-infra] or [IRC][]
 ([webclient][web irc], join channel `#testing`) if you have an issue.  There is
 no need to announce your review request, as soon as you make a Pull Request
 GitHub will inform interested parties.
 
-[repo]: https://github.com/w3c/web-platform-tests/
+[repo]: https://github.com/web-platform-tests/wpt/
 [github-intro]: {{ site.baseurl }}{% link _appendix/github-intro.md %}
 [github flow]: https://guides.github.com/introduction/flow/
 [public-test-infra]: https://lists.w3.org/Archives/Public/public-test-infra/
 [IRC]: irc://irc.w3.org:6667/testing
 [web irc]: http://irc.w3.org

--- a/testing/web-platform/tests/docs/_writing-tests/testdriver-tutorial.md
+++ b/testing/web-platform/tests/docs/_writing-tests/testdriver-tutorial.md
@@ -308,10 +308,10 @@ promise_test(async t => {
 ```
 ### What about testdriver-vendor.js?
 
 The file [testdriver-vendor.js](resources/testdriver-vendor.js) is the equivalent to testdriver-extra.js above, except is
 run instead of testdriver-extra.js in browser specific test environments. For example, in [Chromium LayoutTests](https://cs.chromium.org/chromium/src/third_party/WebKit/LayoutTests/?q=LayoutTests&sq=package:chromium&dr).
 
 ### What if I need to return a value from my testdriver API?
 
-We currently don't have this capability, but it is coming soon and will be documented. The bug is [here](https://github.com/w3c/web-platform-tests/issues/10716)
+We currently don't have this capability, but it is coming soon and will be documented. The bug is [here](https://github.com/web-platform-tests/wpt/issues/10716)
 

--- a/testing/web-platform/tests/docs/introduction.md
+++ b/testing/web-platform/tests/docs/introduction.md
@@ -71,17 +71,17 @@ The testsuite has a few types of tests, 
   them and determine their result.
 
 * WebDriver tests, which are used for testing the WebDriver protocol
   itself.
 
 
 ## GitHub
 
-[GitHub](https://github.com/w3c/web-platform-tests/) is used both for [issue tracking](https://github.com/w3c/web-platform-tests/issues) and [test submissions](https://github.com/w3c/web-platform-tests/pulls); we
+[GitHub](https://github.com/web-platform-tests/wpt/) is used both for [issue tracking](https://github.com/web-platform-tests/wpt/issues) and [test submissions](https://github.com/web-platform-tests/wpt/pulls); we
 provide [a limited introduction][github-intro] to both git and
 GitHub.
 
 Pull Requests are automatically labeled based on the directory the
 files they change are in; there are also comments added automatically
 to notify a number of people: this list of people comes from OWNERS
 files in those same directories and their parents (i.e., they work
 recursively: `a/OWNERS` will get notified for `a/foo.html` and
@@ -143,17 +143,17 @@ port definitions of your choice e.g.:
 }
 ```
 
 After your `hosts` file is configured, the servers will be locally accessible at:
 
 http://web-platform.test:8000/<br>
 https://web-platform.test:8443/ *
 
-\**See [Trusting Root CA](https://github.com/w3c/web-platform-tests/blob/master/README.md#trusting-root-ca)*
+\**See [Trusting Root CA](https://github.com/web-platform-tests/wpt/blob/master/README.md#trusting-root-ca)*
 
 ## Running tests automatically
 
 The `wpt run` command provides a frontend for running tests automatically
 in various browsers. The general syntax is:
 
 ```
 wpt run [options] <product> [test paths]

--- a/testing/web-platform/tests/eventsource/resources/status-error.py
+++ b/testing/web-platform/tests/eventsource/resources/status-error.py
@@ -1,15 +1,15 @@
 def main(request, response):
   status = (request.GET.first("status", "404"), "HAHAHAHA")
   headers = [("Content-Type", "text/event-stream")]
 
   # According to RFC7231, HTTP responses bearing status code 204 or 205 must
   # not specify a body. The expected browser behavior for this condition is not
   # currently defined--see the following for further discussion:
   #
-  # https://github.com/w3c/web-platform-tests/pull/5227
+  # https://github.com/web-platform-tests/wpt/pull/5227
   if status[0] in ["204", "205"]:
       body = ""
   else:
       body = "data: data\n\n"
 
   return status, headers, body

--- a/testing/web-platform/tests/fetch/api/request/request-consume-empty.html
+++ b/testing/web-platform/tests/fetch/api/request/request-consume-empty.html
@@ -101,14 +101,14 @@
     }
 
     // FIXME: Add BufferSource, FormData and URLSearchParams.
     checkRequestWithEmptyBody("blob", new Blob([], { "type" : "text/plain" }), false);
     checkRequestWithEmptyBody("text", "", false);
     checkRequestWithEmptyBody("blob", new Blob([], { "type" : "text/plain" }), true);
     checkRequestWithEmptyBody("text", "", true);
     checkRequestWithEmptyBody("URLSearchParams", new URLSearchParams(""), true);
-    // FIXME: This test assumes that the empty string be returned but it is not clear whether that is right. See https://github.com/w3c/web-platform-tests/pull/3950.
+    // FIXME: This test assumes that the empty string be returned but it is not clear whether that is right. See https://github.com/web-platform-tests/wpt/pull/3950.
     checkRequestWithEmptyBody("FormData", new FormData(), true);
     checkRequestWithEmptyBody("ArrayBuffer", new ArrayBuffer(), true);
     </script>
   </body>
 </html>

--- a/testing/web-platform/tests/generic-sensor/README.md
+++ b/testing/web-platform/tests/generic-sensor/README.md
@@ -10,11 +10,11 @@ sensor backends. The `GenericSensorTest`
 ```
 
 The Chromium implementation of the `GenericSensorTest` interface is located in
 [generic_sensor_mocks.js](../resources/chromium/generic_sensor_mocks.js).
 
 Other browser vendors should provide their own implementations of
 the `GenericSensorTest` interface.
 
-[Known issue](https://github.com/w3c/web-platform-tests/issues/9686): a
+[Known issue](https://github.com/web-platform-tests/wpt/issues/9686): a
 WebDriver extension is a better approach for the Generic Sensor tests
 automation.

--- a/testing/web-platform/tests/generic-sensor/generic-sensor-tests.js
+++ b/testing/web-platform/tests/generic-sensor/generic-sensor-tests.js
@@ -350,17 +350,17 @@ function runGenericSensorTests(sensorNam
   sensor_test(async t => {
     assert_true(sensorName in self);
     const sensor = new sensorType({referenceFrame: "screen"});
     const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
     sensor.start();
 
     await sensorWatcher.wait_for("reading");
     //TODO use mock data to verify sensor readings, blocked by issue:
-    // https://github.com/w3c/web-platform-tests/issues/9686
+    // https://github.com/web-platform-tests/wpt/issues/9686
     assert_reading_not_null(sensor);
 
     sensor.stop();
   }, `${sensorName}: sensor reading is correct when options.referenceFrame is 'screen'`);
 
   test(() => {
     assert_true(sensorName in self);
     const invalidRefFrames = [

--- a/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-write/contentType.window.js
+++ b/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-write/contentType.window.js
@@ -16,13 +16,13 @@ const videoURL = getVideoURI("/images/pa
     frame.onload = t.step_func_done(() => {
       assert_equals(frame.contentDocument.contentType, val[1]);
       frame.contentDocument.write("<b>Heya</b>");
       assert_equals(frame.contentDocument.body.firstChild.localName, "b");
       assert_equals(frame.contentDocument.body.firstChild.textContent, "Heya");
       assert_equals(frame.contentDocument.contentType, val[1]);
 
       // Make sure a load event is fired across browsers
-      // https://github.com/w3c/web-platform-tests/pull/10239
+      // https://github.com/web-platform-tests/wpt/pull/10239
       frame.contentDocument.close();
     });
   }, "document.write(): " + val[2] + " document");
 });

--- a/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
+++ b/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
@@ -1,10 +1,10 @@
 // NOTE: this file needs to be split up rather than expanded. See ../location.sub.html for some
-// extracted tests. Tracked by https://github.com/w3c/web-platform-tests/issues/4934.
+// extracted tests. Tracked by https://github.com/web-platform-tests/wpt/issues/4934.
 
 setup({explicit_done:true});
 onload = function() {
   var encoding = '{{GET[encoding]}}';
   var input_url = 'resources/resource.py?q=\u00E5&encoding=' + encoding + '&type=';
   ('html css js worker sharedworker worker_importScripts sharedworker_importScripts worker_worker worker_sharedworker sharedworker_worker '+
    'sharedworker_sharedworker eventstream png svg xmlstylesheet_css video webvtt').split(' ').forEach(function(str) {
     window['input_url_'+str] = input_url + str;

--- a/testing/web-platform/tests/interfaces/css-typed-om.idl
+++ b/testing/web-platform/tests/interfaces/css-typed-om.idl
@@ -165,17 +165,17 @@ enum CSSMathOperator {
     "product",
     "negate",
     "invert",
     "min",
     "max",
 };
 
 // FIXME: Uncomment this when IDLHarness supports CSS namespaces:
-// https://github.com/w3c/web-platform-tests/issues/7583
+// https://github.com/web-platform-tests/wpt/issues/7583
 /*
 partial namespace CSS {
     CSSUnitValue number(double value);
     CSSUnitValue percent(double value);
 
     // <length>
     CSSUnitValue em(double value);
     CSSUnitValue ex(double value);

--- a/testing/web-platform/tests/lint.whitelist
+++ b/testing/web-platform/tests/lint.whitelist
@@ -74,17 +74,17 @@ PRINT STATEMENT: */tools/*
 
 ## Deliberate copies of Ahem ##
 # The allowed copy
 AHEM COPY: fonts/Ahem.ttf
 
 # None of these are actually Ahem
 AHEM COPY: fonts/ahem-extra/AHEM_*.TTF
 
-# https://github.com/w3c/web-platform-tests/issues/7437
+# https://github.com/web-platform-tests/wpt/issues/7437
 AHEM COPY: css/vendor-imports/mozilla/mozilla-central-reftests/*/Ahem.ttf
 
 ## Test exclusions ##
 
 # Intentional use of CRLF
 CR AT EOL: WebIDL/valid/idl/documentation-dos.widl
 CR AT EOL: cors/resources/cors-headers.asis
 CR AT EOL: html/form-elements/the-textarea-element/multiline-placeholder-cr.html
@@ -760,15 +760,15 @@ MISSING-LINK: css/cssom-view/offsetTopLe
 MISSING-LINK: css/cssom-view/overscrollBehavior-manual.html
 MISSING-LINK: css/cssom-view/scrolling-no-browsing-context.html
 MISSING-LINK: css/cssom-view/scrolling-quirks-vs-nonquirks.html
 MISSING-LINK: css/cssom-view/scrollingElement.html
 MISSING-LINK: css/cssom-view/scrollIntoView-shadow.html
 MISSING-LINK: css/cssom-view/scrollIntoView-smooth.html
 MISSING-LINK: css/cssom-view/scrollTop-display-change.html
 
-# TODO https://github.com/w3c/web-platform-tests/issues/5770
+# TODO https://github.com/web-platform-tests/wpt/issues/5770
 MISSING-LINK: css/geometry/*.worker.js
 MISSING-LINK: css/filter-effects/*.any.js
 
 # Tests that use WebKit/Blink testing APIs
 LAYOUTTESTS APIS: css/css-regions/interactivity/*
 LAYOUTTESTS APIS: resources/chromium/generic_sensor_mocks.js

--- a/testing/web-platform/tests/mimesniff/mime-types/README.md
+++ b/testing/web-platform/tests/mimesniff/mime-types/README.md
@@ -10,17 +10,17 @@
 Note: the object description implies that there tests without `navigable` or `encoding` set.
 
 A wrapper for these JSON MIME type tests needs to take care that not all `input` values can be tested in all entrypoints. Some entrypoints only accept bytes and some have further restrictions. A function such as the one below can be used to differentiate:
 
 ```js
 function isByteCompatible(str) {
   for(let i = 0; i < str.length; i++) {
     const charCode = str.charCodeAt(i);
-    // See https://github.com/w3c/web-platform-tests/issues/8372 for 0x0B and 0x0C
+    // See https://github.com/web-platform-tests/wpt/issues/8372 for 0x0B and 0x0C
     // See https://fetch.spec.whatwg.org/#concept-header-value for the remainder
     if(charCode > 0xFF) {
       return "incompatible";
     } else if(charCode === 0x00 || charCode === 0x0A || charCode === 0x0D) {
       return "header-value-incompatible";
     } else if(charCode === 0x0B || charCode === 0x0C) {
       return "wptserve-incompatible";
     }

--- a/testing/web-platform/tests/mimesniff/mime-types/charset-parameter.window.js
+++ b/testing/web-platform/tests/mimesniff/mime-types/charset-parameter.window.js
@@ -1,17 +1,17 @@
 promise_test(() => {
   // Don't load generated-mime-types.json as none of them are navigable
   return fetch("resources/mime-types.json").then(res => res.json().then(runTests));
 }, "Loading data…");
 
 function isByteCompatible(str) {
   for(let i = 0; i < str.length; i++) {
     const charCode = str.charCodeAt(i);
-    // See https://github.com/w3c/web-platform-tests/issues/8372 for 0x0B and 0x0C
+    // See https://github.com/web-platform-tests/wpt/issues/8372 for 0x0B and 0x0C
     // See https://fetch.spec.whatwg.org/#concept-header-value for the remainder
     if(charCode > 0xFF) {
       return "incompatible";
     } else if(charCode === 0x00 || charCode === 0x0A || charCode === 0x0D) {
       return "header-value-incompatible";
     } else if(charCode === 0x0B || charCode === 0x0C) {
       return "wptserve-incompatible";
     }

--- a/testing/web-platform/tests/mimesniff/mime-types/parsing.any.js
+++ b/testing/web-platform/tests/mimesniff/mime-types/parsing.any.js
@@ -5,17 +5,17 @@ promise_test(() => {
     fetch("resources/mime-types.json"),
     fetch("resources/generated-mime-types.json")
   ]).then(([res, res2]) => res.json().then(runTests).then(() => res2.json().then(runTests)));
 }, "Loading data…");
 
 function isByteCompatible(str) {
   for(let i = 0; i < str.length; i++) {
     const charCode = str.charCodeAt(i);
-    // See https://github.com/w3c/web-platform-tests/issues/8372 for 0x0B and 0x0C
+    // See https://github.com/web-platform-tests/wpt/issues/8372 for 0x0B and 0x0C
     // See https://fetch.spec.whatwg.org/#concept-header-value for the remainder
     if(charCode > 0xFF) {
       return "incompatible";
     } else if(charCode === 0x00 || charCode === 0x0A || charCode === 0x0D) {
       return "header-value-incompatible";
     } else if(charCode === 0x0B || charCode === 0x0C) {
       return "wptserve-incompatible";
     }

--- a/testing/web-platform/tests/payment-method-basic-card/empty-data-manual.https.html
+++ b/testing/web-platform/tests/payment-method-basic-card/empty-data-manual.https.html
@@ -129,11 +129,11 @@ function runPromiseTest(button, data, ex
   <li>
     <button onclick="runPromiseTest(this, { supportedTypes: [] });">
       Returns any card type on any network missing supportedTypes, and empty supportedNetwork.
     </button>
   </li>
 </ol>
 
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/PaymentAddress/attributes-and-toJSON-method-manual.https.html
+++ b/testing/web-platform/tests/payment-request/PaymentAddress/attributes-and-toJSON-method-manual.https.html
@@ -99,11 +99,11 @@ function runManualTest(button, expected 
       <dt>organization</dt>
       <dd>w3c</dd>
       <dt>Phone number</dt>
       <dd>+61 7 3378 0000</dd>
     </dl>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/PaymentRequestUpdateEvent/updateWith-call-immediate-manual.https.html
+++ b/testing/web-platform/tests/payment-request/PaymentRequestUpdateEvent/updateWith-call-immediate-manual.https.html
@@ -183,11 +183,11 @@ function testRecycleEvents({ textContent
       Recycling events must not be possible.
     </button> When the payment sheet is shown, select a different shipping address once, then change shipping option once. Then pay.
   </li>
   <li>
     <button onclick="done();">Done!</button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/PaymentRequestUpdateEvent/updateWith-duplicate-shipping-options-manual.https.html
+++ b/testing/web-platform/tests/payment-request/PaymentRequestUpdateEvent/updateWith-duplicate-shipping-options-manual.https.html
@@ -87,11 +87,11 @@ function testFireEvents(button) {
 <ol>
   <li>
     <button onclick="testFireEvents(this)">
       If there are duplicate shippingOption ids, then abort payment request.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/PaymentRequestUpdateEvent/updateWith-incremental-update-manual.https.html
+++ b/testing/web-platform/tests/payment-request/PaymentRequestUpdateEvent/updateWith-incremental-update-manual.https.html
@@ -177,11 +177,11 @@ function testFireEvent(button, updateDet
     </li>
     <li>
       <button onclick="done()">DONE - see results</button>
     </li>
   </ol>
 </section>
 
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/PaymentRequestUpdateEvent/updateWith-method-abort-update-manual.https.html
+++ b/testing/web-platform/tests/payment-request/PaymentRequestUpdateEvent/updateWith-method-abort-update-manual.https.html
@@ -259,11 +259,11 @@ function testBadUpdate(button, badDetail
       Must throw as Modifier has a recursive dictionary.
     </button>
   </li>
   <li>
     <button onclick="done();">Done!</button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/PaymentRequestUpdateEvent/updateWith-state-checks-manual.https.html
+++ b/testing/web-platform/tests/payment-request/PaymentRequestUpdateEvent/updateWith-state-checks-manual.https.html
@@ -105,11 +105,11 @@ function testRequestIsUpdating(button) {
       When updateWith() is called, If request.[[updating]] is true, then throw an "InvalidStateError" DOMException.
     </button>
   </li>
   <li>
     <button onclick="done();">Done!</button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/algorithms-manual.https.html
+++ b/testing/web-platform/tests/payment-request/algorithms-manual.https.html
@@ -156,11 +156,11 @@ async function runAbortTest(button) {
       <button onclick="testFireEvent(this, detailsWithShippingOptions, 'shippingoptionchange', {}, 'pass'); done();">
       The shipping option changed algorithm runs when the user chooses a new shipping option.
     </button>
     </li>
   </ol>
 </section>
 
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/change-shipping-option-manual.https.html
+++ b/testing/web-platform/tests/payment-request/change-shipping-option-manual.https.html
@@ -84,11 +84,11 @@ function testShippingOptionChanged() {
 <ol>
   <li>
     <button onclick="testShippingOptionChanged()">
       When the shipping option is manually changed, request.shippingOption represents the user's choice.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/change-shipping-option-select-last-manual.https.html
+++ b/testing/web-platform/tests/payment-request/change-shipping-option-select-last-manual.https.html
@@ -82,11 +82,11 @@ function testShippingOptionChanged(butto
   <li>
     <button onclick="testShippingOptionChanged(this)">
       When default shipping option is pre-selected, must not fire onshippingoptionchange
       and PaymentResponse must reflect the pre-selected option.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/payment-request-canmakepayment-method-manual.https.html
+++ b/testing/web-platform/tests/payment-request/payment-request-canmakepayment-method-manual.https.html
@@ -186,11 +186,11 @@ function manualTest2(elem){
   </li>
   <li>
     <button onclick="manualTest2(this)">
       If request.[[state]] is "closed", then return a promise rejected with an "InvalidStateError" DOMException.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/payment-request-show-method-manual.https.html
+++ b/testing/web-platform/tests/payment-request/payment-request-show-method-manual.https.html
@@ -85,11 +85,11 @@ function manualTest3(button){
   </li>
   <li>
     <button onclick="manualTest3(this)">
       If payment method consultation produces no supported method of payment, then return a promise rejected with a "NotSupportedError" DOMException.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/payment-response/complete-method-manual.https.html
+++ b/testing/web-platform/tests/payment-request/payment-response/complete-method-manual.https.html
@@ -74,11 +74,11 @@ async function runManualTest({ completeW
   </li>
   <li>
     <button onclick="runManualTest({completeWith: 'fail'}, this).then(done)">
       Passing "fail" eventually closes the sheet and doesn't throw.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/payment-response/methodName-attribute-manual.https.html
+++ b/testing/web-platform/tests/payment-request/payment-response/methodName-attribute-manual.https.html
@@ -18,11 +18,11 @@
 <ol>
   <li>
     <button onclick="runManualTest(this, {}, { methodName: 'basic-card' }).then(done)">
       Expect the payment method identifier to be 'basic-card'.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/payment-response/payerEmail-attribute-manual.https.html
+++ b/testing/web-platform/tests/payment-request/payment-response/payerEmail-attribute-manual.https.html
@@ -38,11 +38,11 @@
   </li>
   <li>
     <button onclick="runManualTest(this, { requestPayerEmail: 'yep' }, { payerEmail: 'wpt@w3.org' }).then(done)">
       payerEmail attribute is 'wpt@w3.org' when requestPayerEmail is truthy.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/payment-response/payerName-attribute-manual.https.html
+++ b/testing/web-platform/tests/payment-request/payment-response/payerName-attribute-manual.https.html
@@ -38,11 +38,11 @@
   </li>
   <li>
     <button onclick="runManualTest(this, { requestPayerName: 'yep' }, { payerName: 'web platform test' }).then(done)">
       payerName attribute is 'web platform test' when requestPayerName is truthy.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/payment-response/payerPhone-attribute-manual.https.html
+++ b/testing/web-platform/tests/payment-request/payment-response/payerPhone-attribute-manual.https.html
@@ -38,11 +38,11 @@
   </li>
   <li>
     <button onclick="runManualTest(this, { requestPayerPhone: 'yep' }, { payerPhone: '+12345678910' }).then(done)">
       payerPhone attribute is '+12345678910' when requestPayerPhone is truthy.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/payment-response/requestId-attribute-manual.https.html
+++ b/testing/web-platform/tests/payment-request/payment-response/requestId-attribute-manual.https.html
@@ -24,11 +24,11 @@
   </li>
   <li>
     <button onclick="runManualTest(this, {}, {requestId: 'pass'}, 'pass').then(done)">
       Must mirror the payment request's explicitly set id
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/payment-response/shippingAddress-attribute-manual.https.html
+++ b/testing/web-platform/tests/payment-request/payment-response/shippingAddress-attribute-manual.https.html
@@ -91,11 +91,11 @@ async function runManualTest(button, opt
   </li>
   <li>
     <button onclick="runManualTest(this, {requestShipping: true}).then(done)">
       If the requestShipping member is true, then shippingAddress must be "1 wpt street" in "Kabul, Afghanistan", zip code 1001.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/payment-response/shippingOption-attribute-manual.https.html
+++ b/testing/web-platform/tests/payment-request/payment-response/shippingOption-attribute-manual.https.html
@@ -33,11 +33,11 @@
   </li>
   <li>
     <button onclick="runManualTest(this, { requestShipping: true }, { shippingOption: 'pass' }).then(done)">
       If the requestShipping member is true, then shippingOption must be the id of the selected shipping option ("pass").
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/shipping-address-changed-manual.https.html
+++ b/testing/web-platform/tests/payment-request/shipping-address-changed-manual.https.html
@@ -75,11 +75,11 @@ function testShippingAddressChange() {
 <ol>
   <li>
     <button onclick="testShippingAddressChange()">
       When the shipping address is manually changed, request.shippingAddress is a PaymentAddress.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/show-method-optional-promise-rejects-manual.https.html
+++ b/testing/web-platform/tests/payment-request/show-method-optional-promise-rejects-manual.https.html
@@ -271,11 +271,11 @@
   ">
   Must throw as Modifier has a recursive dictionary.
   </button></li>
 
   <li><button onclick="done();">Done!</button></li>
 </ol>
 
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/show-method-optional-promise-resolves-manual.https.html
+++ b/testing/web-platform/tests/payment-request/show-method-optional-promise-resolves-manual.https.html
@@ -309,11 +309,11 @@ function runUpdateDetailsAlgorithm(
     </button>
   </li>
   <li>
     <button onclick="done();">Done!</button>
   </li>
 </ol>
 
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/show-method-postmessage-manual.https.html
+++ b/testing/web-platform/tests/payment-request/show-method-postmessage-manual.https.html
@@ -70,12 +70,12 @@ async function runUserActivation(button)
     <button onclick="runUserActivation(this)">
       show() is triggered by user activation passed through postMessage() and a promise
     </button>
   </li>
 </ol>
 <iframe width="100%" id="iframe" src="show-method-postmessage-iframe.html" allowpaymentrequest></iframe>
 <p>
   <small>
-    If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-    and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+    If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+    and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
   </small>
 </p>

--- a/testing/web-platform/tests/payment-request/updateWith-method-pmi-handling-manual.https.html
+++ b/testing/web-platform/tests/payment-request/updateWith-method-pmi-handling-manual.https.html
@@ -121,11 +121,11 @@ function manualTest(button, { invalidMet
   </li>
   <li>
     <button onclick="manualTest(this, {invalidMethod: 'Basic-Card'}); done();">
       Must throw if standardized PMI has uppercase characters.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/user-abort-algorithm-manual.https.html
+++ b/testing/web-platform/tests/payment-request/user-abort-algorithm-manual.https.html
@@ -60,11 +60,11 @@ async function runAbortTest(button) {
 <ol>
   <li>
     <button onclick="runAbortTest(this); done();">
       If the user aborts, the UA must run the user aborts the payment request algorithm.
     </button>
   </li>
 </ol>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/payment-request/user-accepts-payment-request-algo-manual.https.html
+++ b/testing/web-platform/tests/payment-request/user-accepts-payment-request-algo-manual.https.html
@@ -210,11 +210,11 @@ function testAcceptRequestAlgorithm(
       When prompted, please use: "+12345678910" as the phone number, "web platform test" as the payer name, and "wpt@w3.org" as the email. Then press Pay.
     </li>
     <li>
       <button onclick="done()">Done</button>
     </li>
   </ol>
 </section>
 <small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/OWNERS">owners</a>.
 </small>

--- a/testing/web-platform/tests/resources/chromium/web-bluetooth-test.js
+++ b/testing/web-platform/tests/resources/chromium/web-bluetooth-test.js
@@ -517,10 +517,10 @@ class FakeChooser {
 
 // If this line fails, it means that current environment does not support the
 // Web Bluetooth Test API.
 try {
   navigator.bluetooth.test = new FakeBluetooth();
 } catch {
     throw 'Web Bluetooth Test API is not implemented on this ' +
         'environment. See the bluetooth README at ' +
-        'https://github.com/w3c/web-platform-tests/blob/master/bluetooth/README.md#web-bluetooth-testing';
+        'https://github.com/web-platform-tests/wpt/blob/master/bluetooth/README.md#web-bluetooth-testing';
 }

--- a/testing/web-platform/tests/service-workers/service-worker/postmessage.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/postmessage.https.html
@@ -11,17 +11,17 @@ promise_test(t => {
     var worker;
     var port;
 
     return service_worker_unregister_and_register(t, script, scope)
       .then(r => {
           // TODO: return the Promise created by `r.unregister`once
           // `testharness.js` has been updated to honor thenables returned by
           // cleanup functions.
-          // See https://github.com/w3c/web-platform-tests/pull/8748
+          // See https://github.com/web-platform-tests/wpt/pull/8748
           t.add_cleanup(() => { r.unregister(); });
           registration = r;
           worker = registration.installing;
 
           var messageChannel = new MessageChannel();
           port = messageChannel.port1;
           return new Promise(resolve => {
               port.onmessage = resolve;
@@ -64,17 +64,17 @@ promise_test(t => {
     var text_encoder = new TextEncoder;
     var text_decoder = new TextDecoder;
 
     return service_worker_unregister_and_register(t, script, scope)
       .then(r => {
           // TODO: return the Promise created by `r.unregister`once
           // `testharness.js` has been updated to honor thenables returned by
           // cleanup functions.
-          // See https://github.com/w3c/web-platform-tests/pull/8748
+          // See https://github.com/web-platform-tests/wpt/pull/8748
           t.add_cleanup(() => { r.unregister(); });
 
           var ab = text_encoder.encode(message);
           assert_equals(ab.byteLength, message.length);
           r.installing.postMessage(ab, [ab.buffer]);
           assert_equals(text_decoder.decode(ab), '');
           assert_equals(ab.byteLength, 0);
 
@@ -108,17 +108,17 @@ promise_test(t => {
     var text_decoder = new TextDecoder;
     var port;
 
     return service_worker_unregister_and_register(t, script, scope)
       .then(r => {
           // TODO: return the Promise created by `r.unregister`once
           // `testharness.js` has been updated to honor thenables returned by
           // cleanup functions.
-          // See https://github.com/w3c/web-platform-tests/pull/8748
+          // See https://github.com/web-platform-tests/wpt/pull/8748
           t.add_cleanup(() => { r.unregister(); });
 
           var channel = new MessageChannel;
           port = channel.port1;
           r.installing.postMessage(undefined, [channel.port2]);
 
           var ab = text_encoder.encode(message);
           assert_equals(ab.byteLength, message.length);

--- a/testing/web-platform/tests/service-workers/service-worker/windowclient-navigate.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/windowclient-navigate.https.html
@@ -161,17 +161,17 @@ function navigate_test(override_paramete
       .then(function(response) {
           assert_equals(response.data, parameters.expected);
         });
 
     // Ensure that test "clean up" is deferred until after the test body
     // executes. `Test#add_cleanup` cannot be used for this purpose because the
     // operation is asynchronous, and `add_cleanup` does not support
     // asynchronous operations at the time of this writing. See
-    // https://github.com/w3c/web-platform-tests/issues/6075
+    // https://github.com/web-platform-tests/wpt/issues/6075
     // Ensure also that test failure is not hidden by successful cleanup
     // operation.
     return test_body
       .then(cleanup, cleanup)
       .then(function() { return test_body; });
   }, parameters.description);
 }
 </script>

--- a/testing/web-platform/tests/streams/generate-test-wrappers.js
+++ b/testing/web-platform/tests/streams/generate-test-wrappers.js
@@ -3,17 +3,17 @@
 // - js-filename1.html
 // - js-filename1.sharedworker.html
 // - js-filename1.dedicatedworker.html
 // - js-filename1.serviceworker.https.html
 // (for each passed filename)
 //
 // It will turn any importScripts inside the .js file into <script>s in the browser context wrapper.
 //
-// This could become obsolete if https://github.com/w3c/web-platform-tests/issues/4210 gets fixed,
+// This could become obsolete if https://github.com/web-platform-tests/wpt/issues/4210 gets fixed,
 // allowing .any.js to work with all four contexts.
 
 const fs = require("fs");
 const path = require("path");
 
 for (const arg of process.argv.slice(2)) {
     generateWrapper(arg);
 }

--- a/testing/web-platform/tests/tools/ci/ci_wpt.sh
+++ b/testing/web-platform/tests/tools/ci/ci_wpt.sh
@@ -3,17 +3,17 @@ set -e
 
 SCRIPT_DIR=$(dirname $(readlink -f "$0"))
 WPT_ROOT=$(readlink -f $SCRIPT_DIR/../..)
 cd $WPT_ROOT
 
 source tools/ci/lib.sh
 
 main() {
-    git fetch --unshallow https://github.com/w3c/web-platform-tests.git +refs/heads/*:refs/remotes/origin/*
+    git fetch --unshallow https://github.com/web-platform-tests/wpt.git +refs/heads/*:refs/remotes/origin/*
     hosts_fixup
     install_chrome unstable
     pip install -U tox codecov
     cd tools/wpt
     tox
 }
 
 main

--- a/testing/web-platform/tests/tools/docker/start.sh
+++ b/testing/web-platform/tests/tools/docker/start.sh
@@ -9,17 +9,17 @@
 # In the project root:
 #   ./wpt make-tasks
 # Commit the changes with .taskcluster.yml changes in a separate commit for easier review
 
 
 #!/bin/bash
 set -ex
 
-REMOTE=${1:-https://github.com/w3c/web-platform-tests}
+REMOTE=${1:-https://github.com/web-platform-tests/wpt}
 BRANCH=${2:-master}
 REV=${3:-FETCH_HEAD}
 BROWSER=${4:-all}
 
 cd ~
 
 # Initially we just fetch 50 commits in order to save several minutes of fetching
 git clone ${REMOTE} --single-branch --branch ${BRANCH} --no-checkout -q --depth=50 web-platform-tests

--- a/testing/web-platform/tests/tools/manifest/download.py
+++ b/testing/web-platform/tests/tools/manifest/download.py
@@ -35,17 +35,17 @@ def should_download(manifest_path, rebui
 
 def git_commits(repo_root):
     git = Git.get_func(repo_root)
     return [item for item in git("log", "--format=%H", "-n50").split("\n") if item]
 
 
 def github_url(commits):
     try:
-        resp = urlopen("https://api.github.com/repos/w3c/web-platform-tests/releases")
+        resp = urlopen("https://api.github.com/repos/web-platform-tests/wpt/releases")
     except Exception:
         return None
 
     if resp.code != 200:
         return None
 
     try:
         releases = json.load(resp.fp)

--- a/testing/web-platform/tests/tools/runner/index.html
+++ b/testing/web-platform/tests/tools/runner/index.html
@@ -89,17 +89,17 @@
         </div>
       </form>
     </div>
   </div>
 
   <div class="instructions">
     <p>
       To run a set of
-      <a href="https://github.com/w3c/web-platform-tests/blob/master/README.md">web-platform-tests</a>
+      <a href="https://github.com/web-platform-tests/wpt/blob/master/README.md">web-platform-tests</a>
       tests, specify a path value in the <b>Run tests under path</b> field above. Example paths:
     </p>
     <ul>
       <li><code>/</code> - runs all of the tests from the root down</li>
       <li><code>/websockets</code> - runs all of the
           <a href="http://w3c-test.org/websockets/">websockets</a> tests</li>
       <li><code>/websockets/constructor</code> - runs all of the
           <a href="http://w3c-test.org/websockets/constructor/">websockets/constructor</a> tests</li>

--- a/testing/web-platform/tests/tools/serve/serve.py
+++ b/testing/web-platform/tests/tools/serve/serve.py
@@ -449,17 +449,17 @@ def make_hosts_file(config, host):
         rv.append("%s\t%s\n" % (host, domain))
 
     # Windows interpets the IP address 0.0.0.0 as non-existent, making it an
     # appropriate alias for non-existent hosts. However, UNIX-like systems
     # interpret the same address to mean any IP address, which is inappropraite
     # for this context. These systems do not reserve any value for this
     # purpose, so the inavailability of the domains must be taken for granted.
     #
-    # https://github.com/w3c/web-platform-tests/issues/10560
+    # https://github.com/web-platform-tests/wpt/issues/10560
     if platform.uname()[0] == "Windows":
         for not_domain in config.not_domains_set:
             rv.append("0.0.0.0\t%s\n" % not_domain)
 
     return "".join(rv)
 
 
 def start_servers(host, ports, paths, routes, bind_address, config, ssl_config,

--- a/testing/web-platform/tests/tools/webdriver/README.md
+++ b/testing/web-platform/tests/tools/webdriver/README.md
@@ -4,17 +4,17 @@ This package provides Python bindings
 that conform to the [W3C WebDriver standard](https://w3c.github.io/webdriver/webdriver-spec.html),
 which specifies a remote control protocol for web browsers.
 
 These bindings are written with determining
 implementation compliance to the specification in mind,
 so that different remote end drivers
 can determine whether they meet the recognised standard.
 The client is used for the WebDriver specification tests
-in the [Web Platform Tests](https://github.com/w3c/web-platform-tests).
+in the [Web Platform Tests](https://github.com/web-platform-tests/wpt).
 
 ## Installation
 
 To install the package individually
 in your virtualenv or system-wide:
 
     % python setup.py install
 
@@ -26,17 +26,17 @@ which is useful if you want to contribut
     % python
     Python 2.7.12+ (default, Aug  4 2016, 20:04:34) 
     [GCC 6.1.1 20160724] on linux2
     Type "help", "copyright", "credits" or "license" for more information.
     >>> import webdriver
     >>> 
 
 If you are writing WebDriver specification tests for
-[WPT](https://github.com/w3c/web-platform-tests),
+[WPT](https://github.com/web-platform-tests/wpt),
 there is no need to install the client manually
 as it is included in the `tools/webdriver` directory.
 
 ## Usage
 
 You can use the built-in
 [context manager](https://docs.python.org/2/reference/compound_stmts.html#the-with-statement)
 to manage the lifetime of the session.

--- a/testing/web-platform/tests/tools/wptrunner/README.rst
+++ b/testing/web-platform/tests/tools/wptrunner/README.rst
@@ -228,9 +228,9 @@ The web-platform-test harness knows abou
   Any value indicates that the test is disabled.
 
 `reftype`
   The type of comparison for reftests; either `==` or `!=`.
 
 `refurl`
   The reference url for reftests.
 
-.. _`web-platform-tests testsuite`: https://github.com/w3c/web-platform-tests
+.. _`web-platform-tests testsuite`: https://github.com/web-platform-tests/wpt

--- a/testing/web-platform/tests/tools/wptrunner/docs/usage.rst
+++ b/testing/web-platform/tests/tools/wptrunner/docs/usage.rst
@@ -27,17 +27,17 @@ environment created as above::
   cd wptrunner
   pip install -e ./
 
 In addition to the dependencies installed by pip, wptrunner requires
 a copy of the web-platform-tests repository. This can be located
 anywhere on the filesystem, but the easiest option is to put it
 under the same parent directory as the wptrunner checkout::
 
-  git clone https://github.com/w3c/web-platform-tests.git
+  git clone https://github.com/web-platform-tests/wpt.git
 
 It is also necessary to generate a web-platform-tests ``MANIFEST.json``
 file. It's recommended to also put that under the same parent directory as
 the wptrunner checkout, in a directory named ``meta``::
 
   mkdir meta
   cd web-platform-tests
   python manifest --path ../meta/MANIFEST.json
@@ -215,17 +215,17 @@ relative to the config file. For example
 
 ``[web-platform-tests]`` is used to set the properties of the upstream
 repository when updating the paths. ``remote_url`` specifies the git
 url to pull from; ``branch`` the branch to sync against and
 ``sync_path`` the local path, relative to the configuration file, to
 use when checking out the tests e.g.::
 
   [web-platform-tests]
-  remote_url = https://github.com/w3c/web-platform-tests.git
+  remote_url = https://github.com/web-platform-tests/wpt.git
   branch = master
   sync_path = sync
 
 A configuration file must contain all the above fields; falling back
 to the default values for unspecified fields is not yet supported.
 
 The ``wptrunner`` and ``wptupdate`` commands will use configuration
 files in the following order:

--- a/testing/web-platform/tests/tools/wptrunner/wptrunner.default.ini
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner.default.ini
@@ -1,11 +1,11 @@
 [products]
 
 [web-platform-tests]
-remote_url = https://github.com/w3c/web-platform-tests.git
+remote_url = https://github.com/web-platform-tests/wpt.git
 branch = master
 sync_path = %(pwd)s/sync
 
 [manifest:default]
 tests = %(pwd)s/tests
 metadata = %(pwd)s/meta
 url_base = /
\ No newline at end of file

--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -120,17 +120,17 @@ def env_extras(**kwargs):
     return []
 
 
 def env_options():
     # The server host is set to 127.0.0.1 as Firefox is configured (through the
     # network.dns.localDomains preference set below) to resolve the test
     # domains to localhost without relying on the network stack.
     #
-    # https://github.com/w3c/web-platform-tests/pull/9480
+    # https://github.com/web-platform-tests/wpt/pull/9480
     return {"server_host": "127.0.0.1",
             "bind_address": False,
             "supports_debugger": True}
 
 
 def run_info_extras(**kwargs):
     return {"e10s": kwargs["gecko_e10s"],
             "headless": "MOZ_HEADLESS" in os.environ}

--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/sauce_setup/edge-prerun.bat
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/sauce_setup/edge-prerun.bat
@@ -1,9 +1,9 @@
 @echo off
 reg add "HKCU\Software\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Storage\microsoft.microsoftedge_8wekyb3d8bbwe\MicrosoftEdge\New Windows" /v "PopupMgr" /t REG_SZ /d no
 
 
 REM Download and install the Ahem font
 REM - https://wiki.saucelabs.com/display/DOCS/Downloading+Files+to+a+Sauce+Labs+Virtual+Machine+Prior+to+Testing
 REM - https://superuser.com/questions/201896/how-do-i-install-a-font-from-the-windows-command-prompt
-bitsadmin.exe /transfer "JobName" https://github.com/w3c/web-platform-tests/raw/master/fonts/Ahem.ttf "%WINDIR%\Fonts\Ahem.ttf"
+bitsadmin.exe /transfer "JobName" https://github.com/web-platform-tests/wpt/raw/master/fonts/Ahem.ttf "%WINDIR%\Fonts\Ahem.ttf"
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "Ahem (TrueType)" /t REG_SZ /d Ahem.ttf /f

--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/sauce_setup/safari-prerun.sh
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/sauce_setup/safari-prerun.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-curl https://raw.githubusercontent.com/w3c/web-platform-tests/master/fonts/Ahem.ttf > ~/Library/Fonts/Ahem.ttf
+curl https://raw.githubusercontent.com/web-platform-tests/wpt/master/fonts/Ahem.ttf > ~/Library/Fonts/Ahem.ttf
 defaults write com.apple.Safari com.apple.Safari.ContentPageGroupIdentifier.WebKit2JavaScriptCanOpenWindowsAutomatically -bool true

--- a/testing/web-platform/tests/webmessaging/Channel_postMessage_Blob.htm
+++ b/testing/web-platform/tests/webmessaging/Channel_postMessage_Blob.htm
@@ -18,17 +18,17 @@
     SOURCE = channel.port1;
     TARGET = channel.port2;
     TARGET.start();
     TARGET.addEventListener("message", t.step_func(TestMessageEvent), true);
 
     (function() {
       SOURCE.postMessage({blob: new Blob(['foo', 'bar'])});
     })();
-    // TODO(https://github.com/w3c/web-platform-tests/issues/7899): Change to
+    // TODO(https://github.com/web-platform-tests/wpt/issues/7899): Change to
     // some sort of cross-browser GC trigger.
     if (self.gc) self.gc();
 
     function TestMessageEvent(evt)
     {
         assert_true('blob' in evt.data);
         assert_true(evt.data.blob instanceof Blob);
         assert_equals(evt.data.blob.size, 6);

--- a/testing/web-platform/tests/webmessaging/broadcastchannel/blobs.html
+++ b/testing/web-platform/tests/webmessaging/broadcastchannel/blobs.html
@@ -22,17 +22,17 @@ async_test(t => {
               t.done();
           });
         reader.readAsText(e.data.blob);
       });
     c3.onmessage = c2.onmessage;
     (() => {
       c1.postMessage({blob: new Blob(['foo', 'bar'])});
     })();
-    // TODO(https://github.com/w3c/web-platform-tests/issues/7899): Change to
+    // TODO(https://github.com/web-platform-tests/wpt/issues/7899): Change to
     // some sort of cross-browser GC trigger.
     if (self.gc) self.gc();
   }, 'Blobs work on BroadcastChannel');
 
 async_test(t => {
     const c1 = new BroadcastChannel('blobworker');
     const c2 = new BroadcastChannel('blobworker');
     const events = [];

--- a/testing/web-platform/tests/webmessaging/broadcastchannel/resources/worker.js
+++ b/testing/web-platform/tests/webmessaging/broadcastchannel/resources/worker.js
@@ -4,17 +4,17 @@ function handler(e, reply) {
   if (e.data.ping) {
     c.postMessage(e.data.ping);
     return;
   }
   if (e.data.blob) {
     (() => {
       c.postMessage({blob: new Blob(e.data.blob)});
     })();
-    // TODO(https://github.com/w3c/web-platform-tests/issues/7899): Change to
+    // TODO(https://github.com/web-platform-tests/wpt/issues/7899): Change to
     // some sort of cross-browser GC trigger.
     if (self.gc) self.gc();
   }
   c = new BroadcastChannel(e.data.channel);
   let messages = [];
   c.onmessage = e => {
       messages.push(e.data);
       if (e.data == 'done')

--- a/testing/web-platform/tests/webrtc/RTCPeerConnection-track-stats.https.html
+++ b/testing/web-platform/tests/webrtc/RTCPeerConnection-track-stats.https.html
@@ -27,17 +27,17 @@
       return pc.getStats();
     }))
     .then(t.step_func(report => {
       let trackStats = findStatsByTypeAndId(report, 'track', track.id);
       assert_true(trackStats != null, 'Has stats for track');
       // TODO(hbos): Here and elsewhere, validateRtcStats() only tests id,
       // timestamp and type is correct type. Should validate based on stats type
       // but it expects both audio and video members.
-      // https://github.com/w3c/web-platform-tests/issues/9010
+      // https://github.com/web-platform-tests/wpt/issues/9010
       validateRtcStats(report, trackStats);
       t.done();
     }))
     .catch(t.step_func(reason => {
       assert_unreached(reason);
     }));
   }, 'addTrack() without setLocalDescription() yields track stats');