rename from layout/reftests/editor/338427-1-ref.html
rename to editor/reftests/338427-1-ref.html

rename from layout/reftests/editor/338427-1.html
rename to editor/reftests/338427-1.html

rename from layout/reftests/editor/338427-2-ref.html
rename to editor/reftests/338427-2-ref.html

rename from layout/reftests/editor/338427-2.html
rename to editor/reftests/338427-2.html

rename from layout/reftests/editor/338427-3-ref.html
rename to editor/reftests/338427-3-ref.html

rename from layout/reftests/editor/338427-3.html
rename to editor/reftests/338427-3.html

rename from layout/reftests/editor/388980-1-ref.html
rename to editor/reftests/388980-1-ref.html

rename from layout/reftests/editor/388980-1.html
rename to editor/reftests/388980-1.html

rename from layout/reftests/editor/462758-grabbers-resizers-ref.html
rename to editor/reftests/462758-grabbers-resizers-ref.html

rename from layout/reftests/editor/462758-grabbers-resizers.html
rename to editor/reftests/462758-grabbers-resizers.html

rename from layout/reftests/editor/642800-iframe.html
rename to editor/reftests/642800-iframe.html

rename from layout/reftests/editor/642800-ref.html
rename to editor/reftests/642800-ref.html

rename from layout/reftests/editor/642800.html
rename to editor/reftests/642800.html

rename from layout/reftests/editor/672709-ref.html
rename to editor/reftests/672709-ref.html

rename from layout/reftests/editor/672709.html
rename to editor/reftests/672709.html

rename from layout/reftests/editor/674212-spellcheck-ref.html
rename to editor/reftests/674212-spellcheck-ref.html

rename from layout/reftests/editor/674212-spellcheck.html
rename to editor/reftests/674212-spellcheck.html

rename from layout/reftests/editor/694880-1.html
rename to editor/reftests/694880-1.html

rename from layout/reftests/editor/694880-2.html
rename to editor/reftests/694880-2.html

rename from layout/reftests/editor/694880-3.html
rename to editor/reftests/694880-3.html

rename from layout/reftests/editor/694880-ref.html
rename to editor/reftests/694880-ref.html

rename from layout/reftests/editor/caret_after_reframe-ref.html
rename to editor/reftests/caret_after_reframe-ref.html

rename from layout/reftests/editor/caret_after_reframe.html
rename to editor/reftests/caret_after_reframe.html

rename from layout/reftests/editor/caret_on_focus-ref.html
rename to editor/reftests/caret_on_focus-ref.html

rename from layout/reftests/editor/caret_on_focus.html
rename to editor/reftests/caret_on_focus.html

rename from layout/reftests/editor/caret_on_positioned-ref.html
rename to editor/reftests/caret_on_positioned-ref.html

rename from layout/reftests/editor/caret_on_positioned.html
rename to editor/reftests/caret_on_positioned.html

rename from layout/reftests/editor/caret_on_presshell_reinit-2.html
rename to editor/reftests/caret_on_presshell_reinit-2.html

rename from layout/reftests/editor/caret_on_presshell_reinit-ref.html
rename to editor/reftests/caret_on_presshell_reinit-ref.html

rename from layout/reftests/editor/caret_on_presshell_reinit.html
rename to editor/reftests/caret_on_presshell_reinit.html

rename from layout/reftests/editor/caret_on_textarea_lastline-ref.html
rename to editor/reftests/caret_on_textarea_lastline-ref.html

rename from layout/reftests/editor/caret_on_textarea_lastline.html
rename to editor/reftests/caret_on_textarea_lastline.html

rename from layout/reftests/editor/dynamic-1.html
rename to editor/reftests/dynamic-1.html

rename from layout/reftests/editor/dynamic-overflow-change-ref.html
rename to editor/reftests/dynamic-overflow-change-ref.html

rename from layout/reftests/editor/dynamic-overflow-change.html
rename to editor/reftests/dynamic-overflow-change.html

rename from layout/reftests/editor/dynamic-ref.html
rename to editor/reftests/dynamic-ref.html

rename from layout/reftests/editor/dynamic-type-1.html
rename to editor/reftests/dynamic-type-1.html

rename from layout/reftests/editor/dynamic-type-2.html
rename to editor/reftests/dynamic-type-2.html

rename from layout/reftests/editor/dynamic-type-3.html
rename to editor/reftests/dynamic-type-3.html

rename from layout/reftests/editor/dynamic-type-4.html
rename to editor/reftests/dynamic-type-4.html

rename from layout/reftests/editor/emptypasswd-1.html
rename to editor/reftests/emptypasswd-1.html

rename from layout/reftests/editor/emptypasswd-2.html
rename to editor/reftests/emptypasswd-2.html

rename from layout/reftests/editor/emptypasswd-ref.html
rename to editor/reftests/emptypasswd-ref.html

rename from layout/reftests/editor/input-text-notheme-onfocus-reframe-ref.html
rename to editor/reftests/input-text-notheme-onfocus-reframe-ref.html

rename from layout/reftests/editor/input-text-notheme-onfocus-reframe.html
rename to editor/reftests/input-text-notheme-onfocus-reframe.html

rename from layout/reftests/editor/input-text-onfocus-reframe-ref.html
rename to editor/reftests/input-text-onfocus-reframe-ref.html

rename from layout/reftests/editor/input-text-onfocus-reframe.html
rename to editor/reftests/input-text-onfocus-reframe.html

rename from layout/reftests/editor/newline-1.html
rename to editor/reftests/newline-1.html

rename from layout/reftests/editor/newline-2.html
rename to editor/reftests/newline-2.html

rename from layout/reftests/editor/newline-3.html
rename to editor/reftests/newline-3.html

rename from layout/reftests/editor/newline-4.html
rename to editor/reftests/newline-4.html

rename from layout/reftests/editor/newline-ref.html
rename to editor/reftests/newline-ref.html

rename from layout/reftests/editor/nobogusnode-1.html
rename to editor/reftests/nobogusnode-1.html

rename from layout/reftests/editor/nobogusnode-2.html
rename to editor/reftests/nobogusnode-2.html

rename from layout/reftests/editor/nobogusnode-ref.html
rename to editor/reftests/nobogusnode-ref.html

rename from layout/reftests/editor/passwd-1.html
rename to editor/reftests/passwd-1.html

rename from layout/reftests/editor/passwd-2.html
rename to editor/reftests/passwd-2.html

rename from layout/reftests/editor/passwd-3.html
rename to editor/reftests/passwd-3.html

rename from layout/reftests/editor/passwd-4.html
rename to editor/reftests/passwd-4.html

rename from layout/reftests/editor/passwd-ref.html
rename to editor/reftests/passwd-ref.html

rename from layout/reftests/editor/reftest.list
rename to editor/reftests/reftest.list

rename from layout/reftests/editor/selection_visibility_after_reframe-2.html
rename to editor/reftests/selection_visibility_after_reframe-2.html

rename from layout/reftests/editor/selection_visibility_after_reframe-3.html
rename to editor/reftests/selection_visibility_after_reframe-3.html

rename from layout/reftests/editor/selection_visibility_after_reframe-ref.html
rename to editor/reftests/selection_visibility_after_reframe-ref.html

rename from layout/reftests/editor/selection_visibility_after_reframe.html
rename to editor/reftests/selection_visibility_after_reframe.html

rename from layout/reftests/editor/spellcheck-comma-valid-ref.html
rename to editor/reftests/spellcheck-comma-valid-ref.html

rename from layout/reftests/editor/spellcheck-comma-valid.html
rename to editor/reftests/spellcheck-comma-valid.html

rename from layout/reftests/editor/spellcheck-dotafterquote-valid-ref.html
rename to editor/reftests/spellcheck-dotafterquote-valid-ref.html

rename from layout/reftests/editor/spellcheck-dotafterquote-valid.html
rename to editor/reftests/spellcheck-dotafterquote-valid.html

rename from layout/reftests/editor/spellcheck-hyphen-invalid-ref.html
rename to editor/reftests/spellcheck-hyphen-invalid-ref.html

rename from layout/reftests/editor/spellcheck-hyphen-invalid.html
rename to editor/reftests/spellcheck-hyphen-invalid.html

rename from layout/reftests/editor/spellcheck-hyphen-multiple-invalid-ref.html
rename to editor/reftests/spellcheck-hyphen-multiple-invalid-ref.html

rename from layout/reftests/editor/spellcheck-hyphen-multiple-invalid.html
rename to editor/reftests/spellcheck-hyphen-multiple-invalid.html

rename from layout/reftests/editor/spellcheck-hyphen-multiple-valid-ref.html
rename to editor/reftests/spellcheck-hyphen-multiple-valid-ref.html

rename from layout/reftests/editor/spellcheck-hyphen-multiple-valid.html
rename to editor/reftests/spellcheck-hyphen-multiple-valid.html

rename from layout/reftests/editor/spellcheck-hyphen-valid-ref.html
rename to editor/reftests/spellcheck-hyphen-valid-ref.html

rename from layout/reftests/editor/spellcheck-hyphen-valid.html
rename to editor/reftests/spellcheck-hyphen-valid.html

rename from layout/reftests/editor/spellcheck-input-attr-after.html
rename to editor/reftests/spellcheck-input-attr-after.html

rename from layout/reftests/editor/spellcheck-input-attr-before.html
rename to editor/reftests/spellcheck-input-attr-before.html

rename from layout/reftests/editor/spellcheck-input-attr-dynamic-inherit.html
rename to editor/reftests/spellcheck-input-attr-dynamic-inherit.html

rename from layout/reftests/editor/spellcheck-input-attr-dynamic-override-inherit.html
rename to editor/reftests/spellcheck-input-attr-dynamic-override-inherit.html

rename from layout/reftests/editor/spellcheck-input-attr-dynamic-override.html
rename to editor/reftests/spellcheck-input-attr-dynamic-override.html

rename from layout/reftests/editor/spellcheck-input-attr-dynamic.html
rename to editor/reftests/spellcheck-input-attr-dynamic.html

rename from layout/reftests/editor/spellcheck-input-attr-inherit.html
rename to editor/reftests/spellcheck-input-attr-inherit.html

rename from layout/reftests/editor/spellcheck-input-disabled.html
rename to editor/reftests/spellcheck-input-disabled.html

rename from layout/reftests/editor/spellcheck-input-nofocus-ref.html
rename to editor/reftests/spellcheck-input-nofocus-ref.html

rename from layout/reftests/editor/spellcheck-input-property-dynamic-inherit.html
rename to editor/reftests/spellcheck-input-property-dynamic-inherit.html

rename from layout/reftests/editor/spellcheck-input-property-dynamic-override-inherit.html
rename to editor/reftests/spellcheck-input-property-dynamic-override-inherit.html

rename from layout/reftests/editor/spellcheck-input-property-dynamic-override.html
rename to editor/reftests/spellcheck-input-property-dynamic-override.html

rename from layout/reftests/editor/spellcheck-input-property-dynamic.html
rename to editor/reftests/spellcheck-input-property-dynamic.html

rename from layout/reftests/editor/spellcheck-input-ref.html
rename to editor/reftests/spellcheck-input-ref.html

rename from layout/reftests/editor/spellcheck-period-valid-ref.html
rename to editor/reftests/spellcheck-period-valid-ref.html

rename from layout/reftests/editor/spellcheck-period-valid.html
rename to editor/reftests/spellcheck-period-valid.html

rename from layout/reftests/editor/spellcheck-slash-valid-ref.html
rename to editor/reftests/spellcheck-slash-valid-ref.html

rename from layout/reftests/editor/spellcheck-slash-valid.html
rename to editor/reftests/spellcheck-slash-valid.html

rename from layout/reftests/editor/spellcheck-space-valid-ref.html
rename to editor/reftests/spellcheck-space-valid-ref.html

rename from layout/reftests/editor/spellcheck-space-valid.html
rename to editor/reftests/spellcheck-space-valid.html

rename from layout/reftests/editor/spellcheck-textarea-attr-dynamic-inherit.html
rename to editor/reftests/spellcheck-textarea-attr-dynamic-inherit.html

rename from layout/reftests/editor/spellcheck-textarea-attr-dynamic-override-inherit.html
rename to editor/reftests/spellcheck-textarea-attr-dynamic-override-inherit.html

rename from layout/reftests/editor/spellcheck-textarea-attr-dynamic-override.html
rename to editor/reftests/spellcheck-textarea-attr-dynamic-override.html

rename from layout/reftests/editor/spellcheck-textarea-attr-dynamic.html
rename to editor/reftests/spellcheck-textarea-attr-dynamic.html

rename from layout/reftests/editor/spellcheck-textarea-attr-inherit.html
rename to editor/reftests/spellcheck-textarea-attr-inherit.html

rename from layout/reftests/editor/spellcheck-textarea-attr.html
rename to editor/reftests/spellcheck-textarea-attr.html

rename from layout/reftests/editor/spellcheck-textarea-disabled.html
rename to editor/reftests/spellcheck-textarea-disabled.html

rename from layout/reftests/editor/spellcheck-textarea-focused-notreadonly.html
rename to editor/reftests/spellcheck-textarea-focused-notreadonly.html

rename from layout/reftests/editor/spellcheck-textarea-focused-reframe.html
rename to editor/reftests/spellcheck-textarea-focused-reframe.html

rename from layout/reftests/editor/spellcheck-textarea-focused.html
rename to editor/reftests/spellcheck-textarea-focused.html

rename from layout/reftests/editor/spellcheck-textarea-nofocus-ref.html
rename to editor/reftests/spellcheck-textarea-nofocus-ref.html

rename from layout/reftests/editor/spellcheck-textarea-nofocus.html
rename to editor/reftests/spellcheck-textarea-nofocus.html

rename from layout/reftests/editor/spellcheck-textarea-property-dynamic-inherit.html
rename to editor/reftests/spellcheck-textarea-property-dynamic-inherit.html

rename from layout/reftests/editor/spellcheck-textarea-property-dynamic-override-inherit.html
rename to editor/reftests/spellcheck-textarea-property-dynamic-override-inherit.html

rename from layout/reftests/editor/spellcheck-textarea-property-dynamic-override.html
rename to editor/reftests/spellcheck-textarea-property-dynamic-override.html

rename from layout/reftests/editor/spellcheck-textarea-property-dynamic.html
rename to editor/reftests/spellcheck-textarea-property-dynamic.html

rename from layout/reftests/editor/spellcheck-textarea-ref.html
rename to editor/reftests/spellcheck-textarea-ref.html

rename from layout/reftests/editor/unneeded_scroll-ref.html
rename to editor/reftests/unneeded_scroll-ref.html

rename from layout/reftests/editor/unneeded_scroll.html
rename to editor/reftests/unneeded_scroll.html

rename from layout/reftests/editor/xul/autocomplete-1.xul
rename to editor/reftests/xul/autocomplete-1.xul

rename from layout/reftests/editor/xul/autocomplete-ref.xul
rename to editor/reftests/xul/autocomplete-ref.xul

rename from layout/reftests/editor/xul/empty-1.xul
rename to editor/reftests/xul/empty-1.xul

rename from layout/reftests/editor/xul/empty-2.xul
rename to editor/reftests/xul/empty-2.xul

rename from layout/reftests/editor/xul/empty-ref.xul
rename to editor/reftests/xul/empty-ref.xul

rename from layout/reftests/editor/xul/emptyautocomplete-1.xul
rename to editor/reftests/xul/emptyautocomplete-1.xul

rename from layout/reftests/editor/xul/emptyautocomplete-ref.xul
rename to editor/reftests/xul/emptyautocomplete-ref.xul

rename from layout/reftests/editor/xul/emptymultiline-1.xul
rename to editor/reftests/xul/emptymultiline-1.xul

rename from layout/reftests/editor/xul/emptymultiline-2.xul
rename to editor/reftests/xul/emptymultiline-2.xul

rename from layout/reftests/editor/xul/emptymultiline-ref.xul
rename to editor/reftests/xul/emptymultiline-ref.xul

rename from layout/reftests/editor/xul/emptytextbox-1.xul
rename to editor/reftests/xul/emptytextbox-1.xul

rename from layout/reftests/editor/xul/emptytextbox-2.xul
rename to editor/reftests/xul/emptytextbox-2.xul

rename from layout/reftests/editor/xul/emptytextbox-3.xul
rename to editor/reftests/xul/emptytextbox-3.xul

rename from layout/reftests/editor/xul/emptytextbox-4.xul
rename to editor/reftests/xul/emptytextbox-4.xul

rename from layout/reftests/editor/xul/emptytextbox-5.xul
rename to editor/reftests/xul/emptytextbox-5.xul

rename from layout/reftests/editor/xul/emptytextbox-ref.xul
rename to editor/reftests/xul/emptytextbox-ref.xul

rename from layout/reftests/editor/xul/input.css
rename to editor/reftests/xul/input.css

rename from layout/reftests/editor/xul/number-1.xul
rename to editor/reftests/xul/number-1.xul

rename from layout/reftests/editor/xul/number-2.xul
rename to editor/reftests/xul/number-2.xul

rename from layout/reftests/editor/xul/number-3.xul
rename to editor/reftests/xul/number-3.xul

rename from layout/reftests/editor/xul/number-4.xul
rename to editor/reftests/xul/number-4.xul

rename from layout/reftests/editor/xul/number-5.xul
rename to editor/reftests/xul/number-5.xul

rename from layout/reftests/editor/xul/number-ref.xul
rename to editor/reftests/xul/number-ref.xul

rename from layout/reftests/editor/xul/numberwithvalue-1.xul
rename to editor/reftests/xul/numberwithvalue-1.xul

rename from layout/reftests/editor/xul/numberwithvalue-ref.xul
rename to editor/reftests/xul/numberwithvalue-ref.xul

rename from layout/reftests/editor/xul/passwd-1.xul
rename to editor/reftests/xul/passwd-1.xul

rename from layout/reftests/editor/xul/passwd-2.xul
rename to editor/reftests/xul/passwd-2.xul

rename from layout/reftests/editor/xul/passwd-3.xul
rename to editor/reftests/xul/passwd-3.xul

rename from layout/reftests/editor/xul/passwd-ref.xul
rename to editor/reftests/xul/passwd-ref.xul

rename from layout/reftests/editor/xul/plain-1.xul
rename to editor/reftests/xul/plain-1.xul

rename from layout/reftests/editor/xul/plain-ref.xul
rename to editor/reftests/xul/plain-ref.xul

rename from layout/reftests/editor/xul/platform.js
rename to editor/reftests/xul/platform.js

rename from layout/reftests/editor/xul/reftest.list
rename to editor/reftests/xul/reftest.list

rename from layout/reftests/editor/xul/textbox-1.xul
rename to editor/reftests/xul/textbox-1.xul

rename from layout/reftests/editor/xul/textbox-disabled.xul
rename to editor/reftests/xul/textbox-disabled.xul

rename from layout/reftests/editor/xul/textbox-readonly.xul
rename to editor/reftests/xul/textbox-readonly.xul

rename from layout/reftests/editor/xul/textbox-ref.xul
rename to editor/reftests/xul/textbox-ref.xul

--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -126,19 +126,16 @@ include ../../content/test/reftest/refte
 include counters/reftest.list
 
 # datalist
 include datalist/reftest.list
 
 # dom/
 include dom/reftest.list
 
-# editor/
-include editor/reftest.list
-
 # generated-content/
 include generated-content/reftest.list
 
 # first-letter/
 skip-if(Android) include first-letter/reftest.list
 
 # first-line/
 include first-line/reftest.list
@@ -304,8 +301,11 @@ include ../xul/base/reftest/reftest.list
 include ../xul/base/src/grid/reftests/reftest.list
 
 # z-index/
 include z-index/reftest.list
 
 # reftest(s) to verify content bugfixes
 include ../../content/html/document/reftests/reftests.list
 include ../../content/html/content/reftests/reftest.list
+
+# editor/
+include ../../editor/reftests/reftest.list