diff --git a/tools/wpt.ts b/tools/wpt.ts
index eb1893940c..d56ff34d66 100755
--- a/tools/wpt.ts
+++ b/tools/wpt.ts
@@ -653,6 +653,16 @@ function discoverTestsToRun(
           ) {
             continue;
           }
+          // These tests require an HTTP2 compatible server.
+          if (url.pathname.includes(".h2.")) {
+            continue;
+          }
+          // Streaming fetch requests need a server that supports chunked
+          // encoding, which the WPT test server does not. Unfortunately this
+          // also disables some useful fetch tests.
+          if (url.pathname.includes("request-upload")) {
+            continue;
+          }
           const finalPath = url.pathname + url.search;
 
           const split = finalPath.split("/");
diff --git a/tools/wpt/expectation.json b/tools/wpt/expectation.json
index 2f71688f6b..288d91bccd 100644
--- a/tools/wpt/expectation.json
+++ b/tools/wpt/expectation.json
@@ -7819,9 +7819,7 @@
           "CORS invalid integrity",
           "Empty string integrity for opaque response",
           "SHA-* integrity for opaque response"
-        ],
-        "request-upload.h2.any.html": false,
-        "request-upload.h2.any.worker.html": false
+        ]
       },
       "response": {
         "json.any.html": true,
@@ -7983,21 +7981,7 @@
         "redirect-schemes.any.html": true,
         "redirect-schemes.any.worker.html": true,
         "redirect-to-dataurl.any.html": true,
-        "redirect-to-dataurl.any.worker.html": true,
-        "redirect-upload.h2.any.html": [
-          "Fetch upload streaming should be accepted on 303",
-          "Fetch upload streaming should fail on 301",
-          "Fetch upload streaming should fail on 302",
-          "Fetch upload streaming should fail on 307",
-          "Fetch upload streaming should fail on 308"
-        ],
-        "redirect-upload.h2.any.worker.html": [
-          "Fetch upload streaming should be accepted on 303",
-          "Fetch upload streaming should fail on 301",
-          "Fetch upload streaming should fail on 302",
-          "Fetch upload streaming should fail on 307",
-          "Fetch upload streaming should fail on 308"
-        ]
+        "redirect-to-dataurl.any.worker.html": true
       },
       "idlharness.any.html": [
         "Request interface: attribute destination",