diff --git a/html5lib-tests b/html5lib-tests
index 6234baea..27724be8 160000
--- a/html5lib-tests
+++ b/html5lib-tests
@@ -1 +1 @@
-Subproject commit 6234baeabc51f6d51d1cfc2c4e4656bd99531f2b
+Subproject commit 27724be8d27a1232a8809a55f9c37b69706cb03e
diff --git a/src/tree_builder/rules.expanded.rs b/src/tree_builder/rules.expanded.rs
index ff792729..976e2c1d 100644
--- a/src/tree_builder/rules.expanded.rs
+++ b/src/tree_builder/rules.expanded.rs
@@ -8,7 +8,7 @@
 // except according to those terms.
 
 // This file is generated from rules.rs
-// source SipHash: 18376801535389447229
+// source SipHash: 3904118393820545335
 
 # ! [
 doc =
@@ -648,9 +648,6 @@ impl <Handle, Sink> TreeBuilderStep for super::TreeBuilder<Handle, Sink> where
                 ::tree_builder::types::TagToken(tag@::tokenizer::Tag {
                                                 kind: ::tokenizer::StartTag,
                                                 name: atom!("main"), .. }) |
-                ::tree_builder::types::TagToken(tag@::tokenizer::Tag {
-                                                kind: ::tokenizer::StartTag,
-                                                name: atom!("menu"), .. }) |
                 ::tree_builder::types::TagToken(tag@::tokenizer::Tag {
                                                 kind: ::tokenizer::StartTag,
                                                 name: atom!("nav"), .. }) |
@@ -675,6 +672,17 @@ impl <Handle, Sink> TreeBuilderStep for super::TreeBuilder<Handle, Sink> where
                     self.insert_element_for(tag);
                     Done
                 }
+                ::tree_builder::types::TagToken(tag@::tokenizer::Tag {
+                                                kind: ::tokenizer::StartTag,
+                                                name: atom!("menu"), .. }) =>
+                {
+                    self.close_p_element_in_button_scope();
+                    if self.current_node_named(atom!("menuitem")) {
+                        self.pop();
+                    }
+                    self.insert_element_for(tag);
+                    Done
+                }
                 ::tree_builder::types::TagToken(tag@::tokenizer::Tag {
                                                 kind: ::tokenizer::StartTag,
                                                 name: atom!("h1"), .. }) |
@@ -1186,10 +1194,6 @@ impl <Handle, Sink> TreeBuilderStep for super::TreeBuilder<Handle, Sink> where
                     if !keep_frameset_ok { self.frameset_ok = false; }
                     DoneAckSelfClosing
                 }
-                ::tree_builder::types::TagToken(tag@::tokenizer::Tag {
-                                                kind: ::tokenizer::StartTag,
-                                                name: atom!("menuitem"), .. })
-                |
                 ::tree_builder::types::TagToken(tag@::tokenizer::Tag {
                                                 kind: ::tokenizer::StartTag,
                                                 name: atom!("param"), .. }) |
@@ -1207,6 +1211,9 @@ impl <Handle, Sink> TreeBuilderStep for super::TreeBuilder<Handle, Sink> where
                                                 kind: ::tokenizer::StartTag,
                                                 name: atom!("hr"), .. }) => {
                     self.close_p_element_in_button_scope();
+                    if self.current_node_named(atom!("menuitem")) {
+                        self.pop();
+                    }
                     self.insert_and_pop_element_for(tag);
                     self.frameset_ok = false;
                     DoneAckSelfClosing
@@ -1219,54 +1226,6 @@ impl <Handle, Sink> TreeBuilderStep for super::TreeBuilder<Handle, Sink> where
                     self.step(InBody,
                               TagToken(Tag{name: atom!("img"), ..tag}))
                 }
-                ::tree_builder::types::TagToken(tag@::tokenizer::Tag {
-                                                kind: ::tokenizer::StartTag,
-                                                name: atom!("isindex"), .. })
-                => {
-                    self.unexpected(&tag);
-                    let in_template =
-                        self.in_html_elem_named(atom!("template"));
-                    if !in_template && self.form_elem.is_some() {
-                        return Done;
-                    }
-                    self.frameset_ok = false;
-                    self.close_p_element_in_button_scope();
-                    let mut form_attrs = vec!();
-                    let mut prompt = None;
-                    let mut input_attrs = vec!();
-                    for attr in tag.attrs.into_iter() {
-                        match attr.name {
-                            qualname!("" , "action") => form_attrs.push(attr),
-                            qualname!("" , "prompt") =>
-                            prompt = Some(attr.value),
-                            qualname!("" , "name") => { }
-                            _ => input_attrs.push(attr),
-                        }
-                    }
-                    input_attrs.push(Attribute{name: qualname!("" , "name"),
-                                               value:
-                                                   "isindex".to_tendril(),});
-                    let form =
-                        self.insert_element(Push, ns!(html), atom!("form"),
-                                            form_attrs);
-                    if !in_template { self.form_elem = Some(form.clone()); }
-                    self.insert_element(NoPush, ns!(html), atom!("hr"),
-                                        vec!());
-                    self.reconstruct_formatting();
-                    self.insert_element(Push, ns!(html), atom!("label"),
-                                        vec!());
-                    self.append_text(prompt.unwrap_or_else(|| {
-                                                           "This is a searchable index. Enter search keywords: ".to_tendril()
-                                                       }));
-                    self.insert_element(NoPush, ns!(html), atom!("input"),
-                                        input_attrs);
-                    self.pop();
-                    self.insert_element(NoPush, ns!(html), atom!("hr"),
-                                        vec!());
-                    self.pop();
-                    if !in_template { self.form_elem = None; }
-                    DoneAckSelfClosing
-                }
                 ::tree_builder::types::TagToken(tag@::tokenizer::Tag {
                                                 kind: ::tokenizer::StartTag,
                                                 name: atom!("textarea"), .. })
@@ -1330,6 +1289,17 @@ impl <Handle, Sink> TreeBuilderStep for super::TreeBuilder<Handle, Sink> where
                     self.insert_element_for(tag);
                     Done
                 }
+                ::tree_builder::types::TagToken(tag@::tokenizer::Tag {
+                                                kind: ::tokenizer::StartTag,
+                                                name: atom!("menuitem"), .. })
+                => {
+                    if self.current_node_named(atom!("menuitem")) {
+                        self.pop();
+                    }
+                    self.reconstruct_formatting();
+                    self.insert_element_for(tag);
+                    Done
+                }
                 ::tree_builder::types::TagToken(tag@::tokenizer::Tag {
                                                 kind: ::tokenizer::StartTag,
                                                 name: atom!("rb"), .. }) |
diff --git a/src/tree_builder/rules.rs b/src/tree_builder/rules.rs
index c5c12108..2c79fda2 100644
--- a/src/tree_builder/rules.rs
+++ b/src/tree_builder/rules.rs
@@ -351,12 +351,21 @@ impl<Handle, Sink> TreeBuilderStep
 
                 tag @ <address> <article> <aside> <blockquote> <center> <details> <dialog>
                   <dir> <div> <dl> <fieldset> <figcaption> <figure> <footer> <header>
-                  <hgroup> <main> <menu> <nav> <ol> <p> <section> <summary> <ul> => {
+                  <hgroup> <main> <nav> <ol> <p> <section> <summary> <ul> => {
                     self.close_p_element_in_button_scope();
                     self.insert_element_for(tag);
                     Done
                 }
 
+                tag @ <menu> => {
+                    self.close_p_element_in_button_scope();
+                    if self.current_node_named(atom!("menuitem")) {
+                        self.pop();
+                    }
+                    self.insert_element_for(tag);
+                    Done
+                }
+
                 tag @ <h1> <h2> <h3> <h4> <h5> <h6> => {
                     self.close_p_element_in_button_scope();
                     if self.current_node_in(heading_tag) {
@@ -609,13 +618,16 @@ impl<Handle, Sink> TreeBuilderStep
                     DoneAckSelfClosing
                 }
 
-                tag @ <menuitem> <param> <source> <track> => {
+                tag @ <param> <source> <track> => {
                     self.insert_and_pop_element_for(tag);
                     DoneAckSelfClosing
                 }
 
                 tag @ <hr> => {
                     self.close_p_element_in_button_scope();
+                    if self.current_node_named(atom!("menuitem")) {
+                        self.pop();
+                    }
                     self.insert_and_pop_element_for(tag);
                     self.frameset_ok = false;
                     DoneAckSelfClosing
@@ -629,49 +641,6 @@ impl<Handle, Sink> TreeBuilderStep
                     }))
                 }
 
-                tag @ <isindex> => {
-                    self.unexpected(&tag);
-                    let in_template = self.in_html_elem_named(atom!("template"));
-                    if !in_template && self.form_elem.is_some() {
-                        return Done;
-                    }
-                    self.frameset_ok = false;
-                    self.close_p_element_in_button_scope();
-                    let mut form_attrs = vec![];
-                    let mut prompt = None;
-                    let mut input_attrs = vec![];
-                    for attr in tag.attrs.into_iter() {
-                        match attr.name {
-                            qualname!("", "action") => form_attrs.push(attr),
-                            qualname!("", "prompt") => prompt = Some(attr.value),
-                            qualname!("", "name") => {},
-                            _ => input_attrs.push(attr),
-                        }
-                    }
-                    input_attrs.push(Attribute {
-                        name: qualname!("", "name"),
-                        value: "isindex".to_tendril(),
-                    });
-                    let form = self.insert_element(Push, ns!(html), atom!("form"), form_attrs);
-                    if !in_template {
-                        self.form_elem = Some(form.clone());
-                    }
-                    self.insert_element(NoPush, ns!(html), atom!("hr"), vec![]);
-                    self.reconstruct_formatting();
-                    self.insert_element(Push, ns!(html), atom!("label"), vec![]);
-                    self.append_text(prompt.unwrap_or_else(|| {
-                        "This is a searchable index. Enter search keywords: ".to_tendril()
-                    }));
-                    self.insert_element(NoPush, ns!(html), atom!("input"), input_attrs);
-                    self.pop();
-                    self.insert_element(NoPush, ns!(html), atom!("hr"), vec![]);
-                    self.pop();
-                    if !in_template {
-                        self.form_elem = None;
-                    }
-                    DoneAckSelfClosing
-                }
-
                 tag @ <textarea> => {
                     self.ignore_lf = true;
                     self.frameset_ok = false;
@@ -723,6 +692,15 @@ impl<Handle, Sink> TreeBuilderStep
                     Done
                 }
 
+                tag @ <menuitem> => {
+                    if self.current_node_named(atom!("menuitem")) {
+                        self.pop();
+                    }
+                    self.reconstruct_formatting();
+                    self.insert_element_for(tag);
+                    Done
+                }
+
                 tag @ <rb> <rtc> => {
                     if self.in_scope_named(default_scope, atom!("ruby")) {
                         self.generate_implied_end(cursory_implied_end);
diff --git a/src/tree_builder/tag_sets.rs b/src/tree_builder/tag_sets.rs
index 35a4268c..755287e8 100644
--- a/src/tree_builder/tag_sets.rs
+++ b/src/tree_builder/tag_sets.rs
@@ -64,7 +64,8 @@ declare_tag_set!(pub table_body_context = "tbody" "tfoot" "thead" "template" "ht
 declare_tag_set!(pub table_row_context = "tr" "template" "html");
 declare_tag_set!(pub td_th = "td" "th");
 
-declare_tag_set!(pub cursory_implied_end = "dd" "dt" "li" "option" "optgroup" "p" "rb" "rp" "rt" "rtc");
+declare_tag_set!(pub cursory_implied_end =
+    "dd" "dt" "li" "menuitem" "option" "optgroup" "p" "rb" "rp" "rt" "rtc");
 
 declare_tag_set!(pub thorough_implied_end = [cursory_implied_end]
     + "caption" "colgroup" "tbody" "td" "tfoot" "th" "thead" "tr");
@@ -76,7 +77,7 @@ declare_tag_set!(pub special_tag =
     "br" "button" "caption" "center" "col" "colgroup" "dd" "details" "dir" "div" "dl" "dt" "embed"
     "fieldset" "figcaption" "figure" "footer" "form" "frame" "frameset" "h1" "h2" "h3" "h4" "h5"
     "h6" "head" "header" "hgroup" "hr" "html" "iframe" "img" "input" "isindex" "li" "link"
-    "listing" "main" "marquee" "menu" "menuitem" "meta" "nav" "noembed" "noframes" "noscript"
+    "listing" "main" "marquee" "menu" "meta" "nav" "noembed" "noframes" "noscript"
     "object" "ol" "p" "param" "plaintext" "pre" "script" "section" "select" "source" "style"
     "summary" "table" "tbody" "td" "template" "textarea" "tfoot" "th" "thead" "title" "tr" "track"
     "ul" "wbr" "xmp");