diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index e7cc9826735..7becd00637f 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -772,7 +772,10 @@ fn http_redirect_fetch(request: Rc<Request>,
     };
 
     // Step 4
-    // TODO implement return network_error if not HTTP(S)
+    match location_url.scheme() {
+        "http" | "https" => { },
+        _ => return Response::network_error(NetworkError::Internal("Not an HTTP(S) Scheme".into()))
+    }
 
     // Step 5
     if request.redirect_count.get() >= 20 {
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-schemes.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-schemes.html.ini
deleted file mode 100644
index ed7b37c7d6a..00000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-schemes.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[redirect-schemes.html]
-  type: testharness
-  [Fetch: handling different schemes in redirects 3]
-    expected: FAIL
-
-  [Fetch: handling different schemes in redirects 1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl-worker.html.ini
deleted file mode 100644
index 911d3fe577c..00000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl-worker.html.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[redirect-to-dataurl-worker.html]
-  type: testharness
-  [Testing data URL loading after same-origin redirection (no-cors mode)]
-    expected: FAIL
-
-  [Testing data URL loading after cross-origin redirection (no-cors mode)]
-    expected: FAIL
-
-  [Testing data URL loading after same-origin redirection (cors mode)]
-    expected: FAIL
-
-  [Testing data URL loading after same-origin redirection (same-origin mode)]
-    expected: FAIL
-
-  [Testing data URL loading after cross-origin redirection (cors mode)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl.html.ini
deleted file mode 100644
index 56dc671be6b..00000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl.html.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[redirect-to-dataurl.html]
-  type: testharness
-  [Testing data URL loading after same-origin redirection (no-cors mode)]
-    expected: FAIL
-
-  [Testing data URL loading after cross-origin redirection (no-cors mode)]
-    expected: FAIL
-
-  [Testing data URL loading after same-origin redirection (cors mode)]
-    expected: FAIL
-
-  [Testing data URL loading after same-origin redirection (same-origin mode)]
-    expected: FAIL
-
-  [Testing data URL loading after cross-origin redirection (cors mode)]
-    expected: FAIL
-