diff --git a/components/script/dom/servohtmlparser.rs b/components/script/dom/servohtmlparser.rs
index 50132dc42a2..68920e19c22 100644
--- a/components/script/dom/servohtmlparser.rs
+++ b/components/script/dom/servohtmlparser.rs
@@ -121,17 +121,11 @@ impl AsyncResponseListener for ParserContext {
                 parser.parse_sync();
             },
             Some(ContentType(Mime(TopLevel::Text, SubLevel::Plain, _))) => {
-                // FIXME: When servo/html5ever#109 is fixed remove <plaintext> usage and
-                // replace with fix from that issue.
-
-                // text/plain documents require setting the tokenizer into PLAINTEXT mode.
-                // This is done by using a <plaintext> element as the html5ever tokenizer
-                // provides no other way to change to that state.
-                // Spec for text/plain handling is:
                 // https://html.spec.whatwg.org/multipage/#read-text
-                let page = format!("<pre>\u{000A}<plaintext>");
+                let page = format!("<pre>\n");
                 parser.pending_input.borrow_mut().push(page);
                 parser.parse_sync();
+                parser.tokenizer().borrow_mut().set_plaintext_state();
             },
             Some(ContentType(Mime(TopLevel::Text, SubLevel::Html, _))) => {}, // Handle text/html
             Some(ContentType(Mime(toplevel, sublevel, _))) => {
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
deleted file mode 100644
index ee851470532..00000000000
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[load-text-plain.html]
-  type: testharness
-  [Checking contents for text file]
-    expected: FAIL
-