diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
index 7261f34b8ca..f540f8e9741 100644
--- a/components/script/dom/htmlimageelement.rs
+++ b/components/script/dom/htmlimageelement.rs
@@ -1147,9 +1147,9 @@ impl HTMLImageElementMethods for HTMLImageElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-img-currentsrc
     fn CurrentSrc(&self) -> DOMString {
-        let ref url = self.current_request.borrow().source_url;
+        let ref url = self.current_request.borrow().parsed_url;
         match *url {
-            Some(ref url) => url.clone(),
+            Some(ref url) => DOMString::from_string(url.clone().into_string()),
             None => DOMString::from(""),
         }
     }
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/adoption.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/adoption.html.ini
index cc5121db0aa..0cc1f123d22 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/adoption.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/adoption.html.ini
@@ -1,26 +1,5 @@
 [adoption.html]
   type: testharness
-  [img (src only)]
-    expected: FAIL
-
-  [img (src only), parent is picture]
-    expected: FAIL
-
-  [img (src only), previous sibling is source]
-    expected: FAIL
-
-  [img (srcset 1 cand)]
-    expected: FAIL
-
-  [img (srcset 1 cand), parent is picture]
-    expected: FAIL
-
-  [img (srcset 1 cand), previous sibling is source]
-    expected: FAIL
-
-  [adopt a cloned img in template]
-    expected: FAIL
-
   [adoption is from appendChild]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
index 950f79cd841..bf38830e982 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
@@ -1,69 +1,27 @@
 [viewport-change.html]
   type: testharness
   expected: TIMEOUT
-  [img (src only) broken image, onload, narrow]
-    expected: FAIL
-
-  [img (src only) valid image, onload, narrow]
-    expected: FAIL
-
   [img (srcset 1 cand) broken image, onload, narrow]
     expected: FAIL
 
   [img (srcset 1 cand) valid image, onload, narrow]
     expected: FAIL
 
-  [picture: source (max-width:500px) broken image, img broken image, onload, narrow]
-    expected: FAIL
-
-  [picture: source (max-width:500px) broken image, img valid image, onload, narrow]
-    expected: FAIL
-
   [picture: source (max-width:500px) broken image, img valid image, resize to wide]
     expected: TIMEOUT
 
-  [picture: source (max-width:500px) valid image, img broken image, onload, narrow]
-    expected: FAIL
-
-  [picture: source (max-width:500px) valid image, img valid image, onload, narrow]
-    expected: FAIL
-
   [picture: source (max-width:500px) valid image, img valid image, resize to wide]
     expected: TIMEOUT
 
-  [picture: same URL in source (max-width:500px) and img, onload, narrow]
-    expected: FAIL
-
-  [img (src only) broken image, onload, wide]
-    expected: FAIL
-
-  [img (src only) valid image, onload, wide]
-    expected: FAIL
-
   [img (srcset 1 cand) broken image, onload, wide]
     expected: FAIL
 
   [img (srcset 1 cand) valid image, onload, wide]
     expected: FAIL
 
-  [picture: source (max-width:500px) broken image, img broken image, onload, wide]
-    expected: FAIL
-
-  [picture: source (max-width:500px) broken image, img valid image, onload, wide]
-    expected: FAIL
-
-  [picture: source (max-width:500px) valid image, img broken image, onload, wide]
-    expected: FAIL
-
   [picture: source (max-width:500px) valid image, img broken image, resize to narrow]
     expected: TIMEOUT
 
-  [picture: source (max-width:500px) valid image, img valid image, onload, wide]
-    expected: FAIL
-
   [picture: source (max-width:500px) valid image, img valid image, resize to narrow]
     expected: TIMEOUT
 
-  [picture: same URL in source (max-width:500px) and img, onload, wide]
-    expected: FAIL
-