diff --git a/spec/oga/xml/lexer/html_attributes_spec.rb b/spec/oga/html/lexer/html_attributes_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_attributes_spec.rb
rename to spec/oga/html/lexer/html_attributes_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/body_spec.rb b/spec/oga/html/lexer/html_closing_rules/body_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/body_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/body_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/caption_spec.rb b/spec/oga/html/lexer/html_closing_rules/caption_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/caption_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/caption_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/colgroup_spec.rb b/spec/oga/html/lexer/html_closing_rules/colgroup_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/colgroup_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/colgroup_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/dd_spec.rb b/spec/oga/html/lexer/html_closing_rules/dd_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/dd_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/dd_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/dt_spec.rb b/spec/oga/html/lexer/html_closing_rules/dt_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/dt_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/dt_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/head_spec.rb b/spec/oga/html/lexer/html_closing_rules/head_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/head_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/head_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/li_spec.rb b/spec/oga/html/lexer/html_closing_rules/li_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/li_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/li_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/optgroup_spec.rb b/spec/oga/html/lexer/html_closing_rules/optgroup_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/optgroup_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/optgroup_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/option_spec.rb b/spec/oga/html/lexer/html_closing_rules/option_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/option_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/option_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/p_spec.rb b/spec/oga/html/lexer/html_closing_rules/p_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/p_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/p_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/rb_spec.rb b/spec/oga/html/lexer/html_closing_rules/rb_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/rb_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/rb_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/rp_spec.rb b/spec/oga/html/lexer/html_closing_rules/rp_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/rp_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/rp_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/rt_spec.rb b/spec/oga/html/lexer/html_closing_rules/rt_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/rt_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/rt_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/rtc_spec.rb b/spec/oga/html/lexer/html_closing_rules/rtc_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/rtc_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/rtc_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/table_spec.rb b/spec/oga/html/lexer/html_closing_rules/table_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/table_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/table_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/tbody_spec.rb b/spec/oga/html/lexer/html_closing_rules/tbody_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/tbody_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/tbody_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/td_spec.rb b/spec/oga/html/lexer/html_closing_rules/td_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/td_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/td_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/tfoot_spec.rb b/spec/oga/html/lexer/html_closing_rules/tfoot_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/tfoot_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/tfoot_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/th_spec.rb b/spec/oga/html/lexer/html_closing_rules/th_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/th_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/th_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/thead_spec.rb b/spec/oga/html/lexer/html_closing_rules/thead_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/thead_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/thead_spec.rb
diff --git a/spec/oga/xml/lexer/html_closing_rules/tr_spec.rb b/spec/oga/html/lexer/html_closing_rules/tr_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_closing_rules/tr_spec.rb
rename to spec/oga/html/lexer/html_closing_rules/tr_spec.rb
diff --git a/spec/oga/xml/lexer/html_script_spec.rb b/spec/oga/html/lexer/html_script_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_script_spec.rb
rename to spec/oga/html/lexer/html_script_spec.rb
diff --git a/spec/oga/xml/lexer/html_style_spec.rb b/spec/oga/html/lexer/html_style_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_style_spec.rb
rename to spec/oga/html/lexer/html_style_spec.rb
diff --git a/spec/oga/xml/lexer/html_void_elements_spec.rb b/spec/oga/html/lexer/html_void_elements_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/html_void_elements_spec.rb
rename to spec/oga/html/lexer/html_void_elements_spec.rb
diff --git a/spec/oga/xml/lexer/inline_javascript_spec.rb b/spec/oga/html/lexer/inline_javascript_spec.rb
similarity index 100%
rename from spec/oga/xml/lexer/inline_javascript_spec.rb
rename to spec/oga/html/lexer/inline_javascript_spec.rb