diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index f949349faca..9b81de49f8c 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -55,6 +55,11 @@ fn load(mut load_data: LoadData, start_chan: Sender<TargetedLoadResponse>, cooki
     let mut url = load_data.url.clone();
     let mut redirected_to = HashSet::new();
 
+    let senders = ResponseSenders {
+        immediate_consumer: start_chan,
+        eventual_consumer: load_data.consumer
+    };
+
     // If the URL is a view-source scheme then the scheme data contains the
     // real URL that should be used for which the source is to be viewed.
     // Change our existing URL to that and keep note that we are viewing
@@ -62,16 +67,19 @@ fn load(mut load_data: LoadData, start_chan: Sender<TargetedLoadResponse>, cooki
     let viewing_source = if url.scheme == "view-source" {
        let inner_url = load_data.url.non_relative_scheme_data().unwrap();
        url = Url::parse(inner_url).unwrap();
+       match url.scheme.as_slice() {
+           "http" | "https" => {}
+           _ => {
+               let s = format!("The {} scheme with view-source is not supported", url.scheme);
+               send_error(url, s, senders);
+               return;
+           }
+       };
        true
     } else {
       false
     };
 
-    let senders = ResponseSenders {
-        immediate_consumer: start_chan,
-        eventual_consumer: load_data.consumer
-    };
-
     // Loop to handle redirects.
     loop {
         iters = iters + 1;
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs
index c4417459f96..836eac6dfba 100644
--- a/components/script/parse/html.rs
+++ b/components/script/parse/html.rs
@@ -180,6 +180,22 @@ pub fn parse_html(document: JSRef<Document>,
         task_state::enter(IN_HTML_PARSER);
     }
 
+    fn parse_progress(parser: &JSRef<ServoHTMLParser>, url: &Url, load_response: &LoadResponse) {
+        for msg in load_response.progress_port.iter() {
+            match msg {
+                ProgressMsg::Payload(data) => {
+                    // FIXME: use Vec<u8> (html5ever #34)
+                    let data = UTF_8.decode(data.as_slice(), DecoderTrap::Replace).unwrap();
+                    parser.parse_chunk(data);
+                }
+                ProgressMsg::Done(Err(err)) => {
+                    panic!("Failed to load page URL {}, error: {}", url.serialize(), err);
+                }
+                ProgressMsg::Done(Ok(())) => break,
+            }
+        }
+    };
+
     match input {
         HTMLInput::InputString(s) => {
             parser.parse_chunk(s);
@@ -205,19 +221,7 @@ pub fn parse_html(document: JSRef<Document>,
                     parse_progress(&parser, url, &load_response);
                 },
                 _ => {
-                    for msg in load_response.progress_port.iter() {
-                        match msg {
-                            ProgressMsg::Payload(data) => {
-                                // FIXME: use Vec<u8> (html5ever #34)
-                                let data = UTF_8.decode(data.as_slice(), DecoderTrap::Replace).unwrap();
-                                parser.parse_chunk(data);
-                            }
-                            ProgressMsg::Done(Err(err)) => {
-                                panic!("Failed to load page URL {}, error: {}", url.serialize(), err);
-                            }
-                            ProgressMsg::Done(Ok(())) => break,
-                        }
-                    }
+                    parse_progress(&parser, url, &load_response);
                 }
             }
         }
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 3041098e78c..8c8390822c4 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -82,6 +82,7 @@ use js;
 use url::Url;
 
 use libc;
+use std::ascii::AsciiExt;
 use std::any::Any;
 use std::borrow::ToOwned;
 use std::cell::{Cell, RefCell};
@@ -984,10 +985,18 @@ impl ScriptTask {
             headers.get().map(|&LastModified(ref tm)| dom_last_modified(tm))
         });
 
+        let content_type = match response.metadata.content_type {
+            Some((ref t, ref st)) if t.as_slice().eq_ignore_ascii_case("text") &&
+                                    st.as_slice().eq_ignore_ascii_case("plain") => {
+                Some("text/plain".to_owned())
+            }
+            _ => None
+        };
+
         let document = Document::new(window.r(),
                                      Some(final_url.clone()),
                                      IsHTMLDocument::HTMLDocument,
-                                     None,
+                                     content_type,
                                      last_modified,
                                      DocumentSource::FromParser).root();
 
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini
index cc9779501b8..ee851470532 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini
@@ -1,11 +1,5 @@
 [load-text-plain.html]
   type: testharness
-  [Checking document metadata for text file]
-    expected: FAIL
-
-  [Checking DOM for text file]
-    expected: FAIL
-
   [Checking contents for text file]
     expected: FAIL