diff --git a/editor/composer/test/chrome.ini b/editor/composer/test/chrome.ini
index cd25f64656d8..8b4d9c333354 100644
--- a/editor/composer/test/chrome.ini
+++ b/editor/composer/test/chrome.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
 skip-if = os == 'android'
 
-[test_bug434998.xhtml]
 [test_bug1266815.html]
+[test_bug434998.xhtml]
diff --git a/editor/composer/test/mochitest.ini b/editor/composer/test/mochitest.ini
index 4e221a032095..eb364a4a50b3 100644
--- a/editor/composer/test/mochitest.ini
+++ b/editor/composer/test/mochitest.ini
@@ -1,11 +1,9 @@
-[DEFAULT]
+[test_bug1453190.html]
+skip-if = os == "android"
 support-files =
   file_bug1453190.html
-
 [test_bug348497.html]
 [test_bug384147.html]
 [test_bug389350.html]
 [test_bug519928.html]
 [test_bug738440.html]
-[test_bug1453190.html]
-skip-if = os == "android"
diff --git a/editor/libeditor/tests/browser.ini b/editor/libeditor/tests/browser.ini
index 0d50945e8974..f072cb13096a 100644
--- a/editor/libeditor/tests/browser.ini
+++ b/editor/libeditor/tests/browser.ini
@@ -1,5 +1,7 @@
-[browser_bug527935.js]
+[DEFAULT]
 skip-if = toolkit == 'android'
+
+[browser_bug527935.js]
 support-files =
   bug527935.html
   bug527935_2.html
diff --git a/editor/libeditor/tests/chrome.ini b/editor/libeditor/tests/chrome.ini
index a016518efb8f..52955f048e6c 100644
--- a/editor/libeditor/tests/chrome.ini
+++ b/editor/libeditor/tests/chrome.ini
@@ -1,17 +1,20 @@
 [DEFAULT]
 skip-if = os == 'android'
-support-files = green.png
 
+[test_bug1397412.xhtml]
 [test_bug489202.xhtml]
 [test_bug599983.xhtml]
 [test_bug607584.xhtml]
 [test_bug616590.xhtml]
 [test_bug780908.xhtml]
-[test_bug1397412.xhtml]
 [test_can_undo_after_setting_value.xhtml]
 [test_contenteditable_text_input_handling.html]
 [test_cut_copy_delete_command_enabled.xhtml]
 [test_htmleditor_keyevent_handling.html]
-[test_texteditor_keyevent_handling.html]
-skip-if = (debug && os=='win') || (os == 'linux') # Bug 1116205, leaks on windows debug, fails delete key on linux
 [test_pasteImgTextarea.xhtml]
+support-files =
+  green.png
+[test_texteditor_keyevent_handling.html]
+skip-if =
+  (debug && os=='win') # Bug 1116205, leaks on windows debug
+  (os == 'linux') # Fails delete key on linux
diff --git a/editor/libeditor/tests/mochitest.ini b/editor/libeditor/tests/mochitest.ini
index 1638196df063..37794c2073e7 100644
--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@@ -1,161 +1,25 @@
 [DEFAULT]
 prefs =
   apz.zoom-to-focused-input.enabled=false
+support-files =
+  green.png
+
+[test_CF_HTML_clipboard.html]
+skip-if = os != 'mac' # bug 574005
 support-files =
   data/cfhtml-chromium.txt
   data/cfhtml-firefox.txt
   data/cfhtml-ie.txt
   data/cfhtml-ooo.txt
   data/cfhtml-nocontext.txt
-  file_bug289384-1.html
-  file_bug289384-2.html
-  file_bug549262.html
-  file_bug586662.html
-  file_bug611182.html
-  file_bug611182.sjs
-  file_bug635636.xhtml
-  file_bug635636_2.html
-  file_bug674770-1.html
-  file_bug795418-2.sjs
-  file_bug915962.html
-  file_bug966155.html
-  file_bug966552.html
-  file_select_all_without_body.html
-  file_sanitizer_on_paste.sjs
-  green.png
-  !/gfx/layers/apz/test/mochitest/apz_test_utils.js
-
-[test_pasting_table_rows.html]
-skip-if = headless # The test calls `synthesizeKey`, see bug 1669923.
-[test_bug46555.html]
-[test_bug200416.html]
-[test_bug289384.html]
-skip-if = os != "mac"
-[test_bug290026.html]
-[test_bug291780.html]
-[test_bug309731.html]
-[test_bug316447.html]
-[test_bug318065.html]
-[test_bug332636.html]
-support-files = test_bug332636.html^headers^
-[test_bug358033.html]
-[test_bug372345.html]
-[test_bug404320.html]
-[test_bug408231.html]
-skip-if = toolkit == 'android'
-[test_bug410986.html]
-skip-if = headless
-[test_bug414526.html]
-[test_bug417418.html]
-[test_bug426246.html]
-[test_bug430392.html]
-[test_bug439808.html]
-[test_bug442186.html]
-[test_bug455992.html]
-[test_bug456244.html]
-[test_bug460740.html]
-[test_bug471319.html]
-[test_bug471722.html]
-[test_bug478725.html]
-skip-if = headless
-[test_bug480647.html]
-[test_bug480972.html]
-skip-if = headless
-[test_bug483651.html]
-[test_bug490879.html]
-skip-if = toolkit == 'android' || headless # bug 1299578
-[test_bug502673.html]
-[test_bug514156.html]
-[test_bug520189.html]
-skip-if = headless
-[test_bug525389.html]
-skip-if = headless
-[test_bug537046.html]
-[test_bug549262.html]
-[test_bug550434.html]
-[test_bug551704.html]
-skip-if = headless
-[test_bug552782.html]
-[test_bug567213.html]
-[test_bug569988.html]
-skip-if = os == 'android'
-[test_bug570144.html]
-[test_bug578771.html]
-[test_bug586662.html]
-skip-if = true # bug 1376382
-[test_bug590554.html]
-[test_bug592592.html]
-[test_bug596001.html]
-[test_bug596506.html]
-[test_bug597331.html]
-[test_bug597784.html]
-[test_bug599322.html]
-[test_bug599983.html]
-[test_bug600570.html]
-[test_bug603556.html]
-[test_bug604532.html]
-[test_bug607584.html]
-[test_bug611182.html]
-[test_bug612128.html]
-[test_bug612447.html]
-[test_bug620906.html]
-skip-if = toolkit == 'android' #TIMED_OUT
-[test_bug622371.html]
-[test_bug625452.html]
-[test_bug629172.html]
-skip-if = toolkit == 'android' || (verify && (os == 'mac')) # Due to resizer rendring issue of macOS
-[test_bug629845.html]
-[test_bug635636.html]
-[test_bug638596.html]
-[test_bug641466.html]
-[test_bug645914.html]
-[test_bug646194.html]
-[test_bug668599.html]
-[test_bug674770-1.html]
-skip-if = toolkit == 'android'
-[test_bug674770-2.html]
-skip-if = toolkit == 'android'
-[test_bug674861.html]
-[test_bug676401.html]
-[test_bug677752.html]
-[test_bug681229.html]
-skip-if = headless
-[test_bug686203.html]
-[test_bug692520.html]
-[test_bug697842.html]
-[test_bug725069.html]
-[test_bug735059.html]
-[test_bug738366.html]
-[test_bug740784.html]
-[test_bug742261.html]
-[test_bug757371.html]
-[test_bug757771.html]
-[test_bug772796.html]
-[test_bug773262.html]
-[test_bug780035.html]
-[test_bug787432.html]
-[test_bug790475.html]
-[test_bug795418.html]
-[test_bug795418-2.html]
-[test_bug795418-3.html]
-[test_bug795418-4.html]
-[test_bug795418-5.html]
-[test_bug795418-6.html]
-[test_bug795785.html]
-[test_bug796839.html]
-[test_bug830600.html]
-skip-if = toolkit == 'android'
-[test_bug832025.html]
-[test_bug850043.html]
-[test_bug857487.html]
-[test_bug858918.html]
-[test_bug915962.html]
-[test_bug974309.html]
-[test_bug966155.html]
-skip-if = os != "win"
-[test_bug966552.html]
-skip-if = os != "win"
-[test_bug998188.html]
+[test_abs_positioner_appearance.html]
+[test_abs_positioner_hidden_during_dragging.html]
+skip-if = os == 'android' # Sync with test_abs_positioner_positioning_elements.html
+[test_abs_positioner_positioning_elements.html]
+skip-if =
+    os == 'android'  # Bug 1525959
+    xorigin  # Inconsistent pass/fail in opt and debug
+[test_backspace_vs.html]
 [test_bug1026397.html]
 [test_bug1053048.html]
 [test_bug1068979.html]
@@ -178,9 +42,9 @@ skip-if =
 [test_bug1247483.html]
 skip-if = headless
 [test_bug1248128.html]
+[test_bug1248185.html]
 [test_bug1250010.html]
 [test_bug1257363.html]
-[test_bug1248185.html]
 [test_bug1258085.html]
 [test_bug1268736.html]
 [test_bug1270235.html]
@@ -215,17 +79,168 @@ skip-if = os == "android" #Bug 1575739
 [test_bug1649005.html]
 [test_bug1659276.html]
 [test_bug1704381.html]
-[test_abs_positioner_appearance.html]
-[test_abs_positioner_hidden_during_dragging.html]
-skip-if = os == 'android' # Sync with test_abs_positioner_positioning_elements.html
-[test_abs_positioner_positioning_elements.html]
+[test_bug200416.html]
+[test_bug289384.html]
+skip-if = os != "mac"
+support-files =
+  file_bug289384-1.html
+  file_bug289384-2.html
+[test_bug290026.html]
+[test_bug291780.html]
+[test_bug309731.html]
+[test_bug316447.html]
+[test_bug318065.html]
+[test_bug332636.html]
+support-files = test_bug332636.html^headers^
+[test_bug358033.html]
+[test_bug372345.html]
+[test_bug404320.html]
+[test_bug408231.html]
+skip-if = toolkit == 'android'
+[test_bug410986.html]
+skip-if = headless
+[test_bug414526.html]
+[test_bug417418.html]
+[test_bug426246.html]
+[test_bug430392.html]
+[test_bug439808.html]
+[test_bug442186.html]
+[test_bug455992.html]
+[test_bug456244.html]
+[test_bug460740.html]
+[test_bug46555.html]
+[test_bug471319.html]
+[test_bug471722.html]
+[test_bug478725.html]
+skip-if = headless
+[test_bug480647.html]
+[test_bug480972.html]
+skip-if = headless
+[test_bug483651.html]
+[test_bug490879.html]
 skip-if =
-    os == 'android'  # Bug 1525959
-    xorigin  # Inconsistent pass/fail in opt and debug
-[test_caret_move_in_vertical_content.html]
+  toolkit == 'android' # bug 1299578
+  headless
+[test_bug502673.html]
+[test_bug514156.html]
+[test_bug520189.html]
+skip-if = headless
+[test_bug525389.html]
+skip-if = headless
+[test_bug537046.html]
+[test_bug549262.html]
+support-files =
+  file_bug549262.html
+  !/gfx/layers/apz/test/mochitest/apz_test_utils.js
+[test_bug550434.html]
+[test_bug551704.html]
+skip-if = headless
+[test_bug552782.html]
+[test_bug567213.html]
+[test_bug569988.html]
+skip-if = os == 'android'
+[test_bug570144.html]
+[test_bug578771.html]
+[test_bug586662.html]
+skip-if = true # bug 1376382
+support-files =
+  file_bug586662.html
+[test_bug590554.html]
+[test_bug592592.html]
+[test_bug596001.html]
+[test_bug596506.html]
+[test_bug597331.html]
+[test_bug597784.html]
+[test_bug599322.html]
+[test_bug599983.html]
+[test_bug600570.html]
+[test_bug603556.html]
+[test_bug604532.html]
+[test_bug607584.html]
+[test_bug611182.html]
+support-files =
+  file_bug611182.html
+  file_bug611182.sjs
+[test_bug612128.html]
+[test_bug612447.html]
+[test_bug620906.html]
+skip-if = toolkit == 'android' #TIMED_OUT
+[test_bug622371.html]
+[test_bug625452.html]
+[test_bug629172.html]
+skip-if =
+  toolkit == 'android'
+  (verify && (os == 'mac')) # Due to resizer rendring issue of macOS
+[test_bug629845.html]
+[test_bug635636.html]
+support-files =
+  file_bug635636.xhtml
+  file_bug635636_2.html
+[test_bug638596.html]
+[test_bug641466.html]
+[test_bug645914.html]
+[test_bug646194.html]
+[test_bug668599.html]
+[test_bug674770-1.html]
+skip-if = toolkit == 'android'
+support-files =
+  file_bug674770-1.html
+[test_bug674770-2.html]
+skip-if = toolkit == 'android'
+[test_bug674861.html]
+[test_bug676401.html]
+[test_bug677752.html]
+[test_bug681229.html]
+skip-if = headless
+[test_bug686203.html]
+[test_bug692520.html]
+[test_bug697842.html]
+[test_bug725069.html]
+[test_bug735059.html]
+[test_bug738366.html]
+[test_bug740784.html]
+[test_bug742261.html]
+[test_bug757371.html]
+[test_bug757771.html]
+[test_bug772796.html]
+[test_bug773262.html]
+[test_bug780035.html]
+[test_bug787432.html]
+[test_bug790475.html]
+[test_bug795418-2.html]
+support-files =
+  file_bug795418-2.sjs
+[test_bug795418-3.html]
+[test_bug795418-4.html]
+[test_bug795418-5.html]
+[test_bug795418-6.html]
+[test_bug795418.html]
+[test_bug795785.html]
+support-files =
+  !/gfx/layers/apz/test/mochitest/apz_test_utils.js
+[test_bug796839.html]
+[test_bug830600.html]
+skip-if = toolkit == 'android'
+[test_bug832025.html]
+[test_bug850043.html]
+[test_bug857487.html]
+[test_bug858918.html]
+[test_bug915962.html]
+support-files =
+  file_bug915962.html
+  !/gfx/layers/apz/test/mochitest/apz_test_utils.js
+[test_bug966155.html]
+skip-if = os != "win"
+support-files =
+  file_bug966155.html
+[test_bug966552.html]
+skip-if = os != "win"
+support-files =
+  file_bug966552.html
+[test_bug974309.html]
+[test_bug998188.html]
 [test_cannot_undo_after_reinitializing_editor.html]
-[test_CF_HTML_clipboard.html]
-skip-if = os != 'mac' # bug 574005
+[test_caret_move_in_vertical_content.html]
 [test_cmd_absPos.html]
 [test_cmd_backgroundColor.html]
 [test_cmd_fontFace_with_tt.html]
@@ -241,13 +256,14 @@ skip-if = os != 'mac' # bug 574005
 [test_dom_input_event_on_texteditor.html]
 [test_dragdrop.html]
 skip-if = os == 'android'
+[test_execCommandPaste_noTarget.html]
 [test_focus_caret_navigation_between_nested_editors.html]
 [test_focused_document_element_becoming_editable.html]
 [test_handle_new_lines.html]
 [test_htmleditor_tab_key_handling.html]
 [test_initial_selection_and_caret_of_designMode.html]
-[test_inline_style_cache.html]
 [test_inlineTableEditing.html]
+[test_inline_style_cache.html]
 [test_insertParagraph_in_h2_and_li.html]
 [test_insertParagraph_in_inline_editing_host.html]
 [test_join_split_node_direction_change_command.html]
@@ -255,6 +271,8 @@ skip-if = os == 'android'
 [test_label_contenteditable.html]
 [test_middle_click_paste.html]
 skip-if = headless
+[test_nsIEditorMailSupport_insertAsCitedQuotation.html]
+[test_nsIEditorMailSupport_insertTextWithQuotations.html]
 [test_nsIEditor_beginningOfDocument.html]
 [test_nsIEditor_canUndo_canRedo.html]
 [test_nsIEditor_clearUndoRedo.html]
@@ -265,8 +283,6 @@ skip-if = headless
 [test_nsIEditor_outputToString.html]
 [test_nsIEditor_undoAll.html]
 [test_nsIEditor_undoRedoEnabled.html]
-[test_nsIEditorMailSupport_insertAsCitedQuotation.html]
-[test_nsIEditorMailSupport_insertTextWithQuotations.html]
 [test_nsIHTMLEditor_getElementOrParentByTagName.html]
 [test_nsIHTMLEditor_getParagraphState.html]
 [test_nsIHTMLEditor_getSelectedElement.html]
@@ -295,15 +311,28 @@ skip-if = headless
 [test_password_paste.html]
 [test_password_per_word_operation.html]
 [test_password_unmask_API.html]
+[test_pasteImgFromTransferable.html]
+[test_pasteImgTextarea.html]
 [test_paste_no_formatting.html]
 [test_pasting_in_root_element.xhtml]
 [test_pasting_in_temporarily_created_div_outside_body.html]
+[test_pasting_table_rows.html]
+skip-if = headless # The test calls `synthesizeKey`, see bug 1669923.
 [test_pasting_text_longer_than_maxlength.html]
 [test_resizers_appearance.html]
 [test_resizers_resizing_elements.html]
 skip-if = (verify && debug && os == 'win') # bug 1485293
 [test_root_element_replacement.html]
+[test_sanitizer_on_paste.html]
+skip-if = headless # 1686012
+support-files =
+  file_sanitizer_on_paste.sjs
 [test_select_all_without_body.html]
+support-files =
+  file_select_all_without_body.html
+[test_selection_move_commands.html]
+support-files =
+  !/gfx/layers/apz/test/mochitest/apz_test_utils.js
 [test_setting_value_longer_than_maxlength_with_setUserInput.html]
 [test_spellcheck_pref.html]
 skip-if = toolkit == 'android'
@@ -317,10 +346,3 @@ skip-if = toolkit == 'android'
 skip-if = toolkit == 'android'
 [test_undo_redo_stack_after_setting_value.html]
 [test_undo_with_editingui.html]
-[test_backspace_vs.html]
-[test_selection_move_commands.html]
-[test_pasteImgFromTransferable.html]
-[test_pasteImgTextarea.html]
-[test_execCommandPaste_noTarget.html]
-[test_sanitizer_on_paste.html]
-skip-if = headless # 1686012
diff --git a/editor/spellchecker/tests/chrome.ini b/editor/spellchecker/tests/chrome.ini
index b178c248728d..76faf04121b0 100644
--- a/editor/spellchecker/tests/chrome.ini
+++ b/editor/spellchecker/tests/chrome.ini
@@ -3,7 +3,7 @@ prefs =
   gfx.font_loader.delay=0
 
 skip-if = os == 'android'
-support-files =
-  spellcheck.js
 
 [test_nsIEditorSpellCheck_ReplaceWord.html]
+support-files =
+  spellcheck.js
diff --git a/editor/spellchecker/tests/mochitest.ini b/editor/spellchecker/tests/mochitest.ini
index 70f13c9c3ceb..f728ecf82077 100644
--- a/editor/spellchecker/tests/mochitest.ini
+++ b/editor/spellchecker/tests/mochitest.ini
@@ -4,12 +4,6 @@ prefs =
 
 skip-if = os == 'android'
 support-files =
-  bug678842_subframe.html
-  bug717433_subframe.html
-  bug1200533_subframe.html
-  bug1204147_subframe.html
-  bug1204147_subframe2.html
-  multiple_content_languages_subframe.html
   en-GB/en_GB.dic
   en-GB/en_GB.aff
   en-AU/en_AU.dic
@@ -21,26 +15,19 @@ support-files =
   spellcheck.js
 
 [test_async_UpdateCurrentDictionary.html]
-[test_bug366682.html]
-[test_bug432225.html]
-[test_bug484181.html]
-[test_bug596333.html]
-[test_bug636465.html]
-[test_bug678842.html]
-skip-if =
-  http3
-[test_bug697981.html]
-[test_bug717433.html]
-skip-if =
-  http3
 [test_bug1100966.html]
 [test_bug1154791.html]
 [test_bug1200533.html]
 skip-if =
   http3
+support-files =
+  bug1200533_subframe.html
 [test_bug1204147.html]
 skip-if =
   http3
+support-files =
+  bug1204147_subframe.html
+  bug1204147_subframe2.html
 [test_bug1205983.html]
 [test_bug1209414.html]
 [test_bug1219928.html]
@@ -53,9 +40,27 @@ skip-if = true
 [test_bug1602526.html]
 [test_bug1761273.html]
 [test_bug1773802.html]
+[test_bug366682.html]
+[test_bug432225.html]
+[test_bug484181.html]
+[test_bug596333.html]
+[test_bug636465.html]
+[test_bug678842.html]
+skip-if =
+  http3
+support-files =
+  bug678842_subframe.html
+[test_bug697981.html]
+[test_bug717433.html]
+skip-if =
+  http3
+support-files =
+  bug717433_subframe.html
 [test_multiple_content_languages.html]
 skip-if =
   http3
+support-files =
+  multiple_content_languages_subframe.html
 [test_spellcheck_after_edit.html]
 [test_spellcheck_after_pressing_navigation_key.html]
 [test_spellcheck_selection.html]