diff --git a/components/script/dom/headers.rs b/components/script/dom/headers.rs
index f29c059fc05..cfec92f06d1 100644
--- a/components/script/dom/headers.rs
+++ b/components/script/dom/headers.rs
@@ -79,7 +79,9 @@ impl HeadersMethods for Headers {
         }
 
         if self.guard.get() == Guard::RequestNoCors {
-            let tmp_value = if let Some(value) = get_value_from_header_list(&valid_name, &self.header_list.borrow()) {
+            let tmp_value = if let Some(value) =
+                get_value_from_header_list(&valid_name, &self.header_list.borrow())
+            {
                 let mut l = value.as_bytes().to_vec();
                 l.extend(b", ");
                 l.extend(valid_value.clone());
@@ -94,9 +96,10 @@ impl HeadersMethods for Headers {
         }
 
         if self.guard.get() != Guard::RequestNoCors || valid_name != "range" {
-            self.header_list
-                .borrow_mut()
-                .append(HeaderName::from_str(&valid_name).unwrap(), HeaderValue::from_bytes(&valid_value).unwrap());
+            self.header_list.borrow_mut().append(
+                HeaderName::from_str(&valid_name).unwrap(),
+                HeaderValue::from_bytes(&valid_value).unwrap(),
+            );
         }
 
         Ok(())
@@ -286,7 +289,7 @@ impl Headers {
             }
         }
 
-        header_vec.sort();
+        header_vec.sort_by(|a, b| a.0.cmp(&b.0));
         header_vec
     }
 }
diff --git a/tests/wpt/metadata/fetch/api/headers/header-setcookie.any.js.ini b/tests/wpt/metadata/fetch/api/headers/header-setcookie.any.js.ini
index 16ef1d0aa0f..6a5a9e3a3a4 100644
--- a/tests/wpt/metadata/fetch/api/headers/header-setcookie.any.js.ini
+++ b/tests/wpt/metadata/fetch/api/headers/header-setcookie.any.js.ini
@@ -2,41 +2,11 @@
   expected: ERROR
 
 [header-setcookie.any.worker.html]
-  [Headers iterator does not combine set-cookie headers]
-    expected: FAIL
-
-  [Headers iterator does not combine set-cookie & set-cookie2 headers]
-    expected: FAIL
-
-  [Headers iterator preserves set-cookie ordering]
-    expected: FAIL
-
-  [Headers iterator preserves per header ordering, but sorts keys alphabetically (and ignores value ordering)]
-    expected: FAIL
-
-  [Headers.prototype.append works for set-cookie]
-    expected: FAIL
-
   [Headers.prototype.get combines set-cookie headers in order]
     expected: FAIL
 
 
 [header-setcookie.any.html]
-  [Headers iterator does not combine set-cookie headers]
-    expected: FAIL
-
-  [Headers iterator does not combine set-cookie & set-cookie2 headers]
-    expected: FAIL
-
-  [Headers iterator preserves set-cookie ordering]
-    expected: FAIL
-
-  [Headers iterator preserves per header ordering, but sorts keys alphabetically (and ignores value ordering)]
-    expected: FAIL
-
-  [Headers.prototype.append works for set-cookie]
-    expected: FAIL
-
   [Headers.prototype.get combines set-cookie headers in order]
     expected: FAIL