--- a/testing/web-platform/tests/fetch/api/headers/header-values-normalize.html
+++ b/testing/web-platform/tests/fetch/api/headers/header-values-normalize.html
@@ -5,17 +5,17 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id=log></div>
 <script>
 for(let i = 0; i < 0x21; i++) {
   let fail = false,
       strip = false
 
-  // REMOVE 0x0B/0x0C exception once https://github.com/w3c/wptserve/issues/111 is fixed
+  // REMOVE 0x0B/0x0C exception once https://github.com/web-platform-tests/wpt/issues/8372 is fixed
   if(i === 0x0B || i === 0x0C)
     continue
 
   if(i === 0) {
     fail = true
   }
 
   if(i === 0x09 || i === 0x0A || i === 0x0D || i === 0x20) {

--- a/testing/web-platform/tests/fetch/api/resources/inspect-headers.py
+++ b/testing/web-platform/tests/fetch/api/resources/inspect-headers.py
@@ -1,11 +1,10 @@
 def main(request, response):
     headers = []
-    request_headers = []
     if "headers" in request.GET:
         checked_headers = request.GET.first("headers").split("|")
         for header in checked_headers:
             if header in request.headers:
                 headers.append(("x-request-" + header, request.headers.get(header, "")))
 
     if "cors" in request.GET:
         if "Origin" in request.headers:

--- a/testing/web-platform/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/parsing.html
+++ b/testing/web-platform/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/parsing.html
@@ -100,17 +100,17 @@ var tests_arr = [
   {input: '1e0; url=foo', expected: []},
   {input: '1e1; url=foo', expected: []},
   {input: '10e-1; url=foo', expected: []},
   {input: '-0.1; url=foo', expected: []},
 ];
 
 tests_arr.forEach(function(test_obj) {
   ["<meta>", "Refresh header"].forEach(type => {
-    if(type === "Refresh header" && test_obj.input.match("[\n\r\f]")) { // See https://github.com/w3c/wptserve/issues/111 for why \f as well
+    if(type === "Refresh header" && test_obj.input.match("[\n\r\f]")) { // See https://github.com/web-platform-tests/wpt/issues/8372 for why \f as well
       return;
     }
     const filename = type === "<meta>" ? "refresh.sub.html" : "refresh.py";
     subsetTest(async_test, function(t) {
       var iframe = document.createElement('iframe');
       t.add_cleanup(function() {
         document.body.removeChild(iframe);
       });