diff --git a/accessible/tests/browser/atk/browser.toml b/accessible/tests/browser/atk/browser.toml
index 2636530b0fb2..c94b444f351b 100644
--- a/accessible/tests/browser/atk/browser.toml
+++ b/accessible/tests/browser/atk/browser.toml
@@ -12,7 +12,11 @@ prefs = [
 ]
 
 ["browser_atspi_interfaces.js"]
+
 ["browser_groupPosition.js"]
+
 ["browser_prune_children.js"]
+
 ["browser_role.js"]
+
 ["browser_table.js"]
diff --git a/accessible/tests/browser/caching_granularity/browser.toml b/accessible/tests/browser/caching_granularity/browser.toml
index c5d0b09ce8bc..42eec523236d 100644
--- a/accessible/tests/browser/caching_granularity/browser.toml
+++ b/accessible/tests/browser/caching_granularity/browser.toml
@@ -31,8 +31,6 @@ skip-if = ["os != 'win'"]
 
 ["browser_scroll_position_domain.js"]
 
-["browser_text_offset_attributes_domain.js"]
-
 ["browser_state_domain.js"]
 
 ["browser_style_domain.js"]
@@ -43,6 +41,8 @@ skip-if = ["os != 'win'"]
 
 ["browser_text_domain.js"]
 
+["browser_text_offset_attributes_domain.js"]
+
 ["browser_transform_matrix_domain.js"]
 
 ["browser_value_domain.js"]
diff --git a/accessible/tests/browser/e10s/browser.toml b/accessible/tests/browser/e10s/browser.toml
index 086f4f011c44..4b015b992bb2 100644
--- a/accessible/tests/browser/e10s/browser.toml
+++ b/accessible/tests/browser/e10s/browser.toml
@@ -20,6 +20,7 @@ support-files = [
 ["browser_aria_activedescendant.js"]
 
 # Caching tests
+
 ["browser_caching_actions.js"]
 
 ["browser_caching_attributes.js"]
@@ -59,6 +60,7 @@ skip-if = ["os != 'win'"]
 ["browser_caching_value.js"]
 
 # Events tests
+
 ["browser_events_announcement.js"]
 skip-if = ["os == 'win'"] # Bug 1288839
 
@@ -81,6 +83,7 @@ skip-if = ["os == 'win'"] # Bug 1288839
 ["browser_obj_group_002.js"]
 
 # Tree update tests
+
 ["browser_treeupdate_ariadialog.js"]
 
 ["browser_treeupdate_ariaowns.js"]
diff --git a/accessible/tests/browser/role/browser.toml b/accessible/tests/browser/role/browser.toml
index 6a8ee9fc4ed4..9e91276c27bf 100644
--- a/accessible/tests/browser/role/browser.toml
+++ b/accessible/tests/browser/role/browser.toml
@@ -6,5 +6,7 @@ support-files = [
   "!/accessible/tests/mochitest/*.js",
   "!/accessible/tests/browser/*.mjs",
 ]
+
 ["browser_computedARIARole.js"]
+
 ["browser_minimumRole.js"]
diff --git a/browser/base/content/test/static/browser.toml b/browser/base/content/test/static/browser.toml
index 8798e6276ec6..5db94a0cd069 100644
--- a/browser/base/content/test/static/browser.toml
+++ b/browser/base/content/test/static/browser.toml
@@ -13,6 +13,8 @@ support-files = ["head.js"]
 ["browser_all_files_referenced.js"]
 skip-if = ["verify && bits == 32"] # Causes OOMs when run repeatedly
 
+["browser_glean_metrics_exist.js"]
+
 ["browser_misused_characters_in_strings.js"]
 support-files = ["bug1262648_string_with_newlines.dtd"]
 skip-if = ["os == 'win' && msix"] # Permafail on MSIX packages due to it running on files it shouldn't.
@@ -24,8 +26,6 @@ skip-if = ["os == 'win' && msix"] # Permafail on MSIX packages due to it running
 ["browser_parsable_script.js"]
 skip-if = ["ccov && os == 'linux'"] # https://bugzilla.mozilla.org/show_bug.cgi?id=1608081
 
-["browser_glean_metrics_exist.js"]
-
 ["browser_sentence_case_strings.js"]
 
 ["browser_title_case_menus.js"]
diff --git a/browser/base/content/test/tabPrompts/browser.toml b/browser/base/content/test/tabPrompts/browser.toml
index d5e4afbf2cc6..5b0fcded706d 100644
--- a/browser/base/content/test/tabPrompts/browser.toml
+++ b/browser/base/content/test/tabPrompts/browser.toml
@@ -43,14 +43,14 @@ support-files = ["openPromptOffTimeout.html"]
 
 ["browser_promptFocus.js"]
 
+["browser_prompt_close_event.js"]
+
 ["browser_prompt_close_groups.js"]
 support-files = ["file_beforeunload_stop.html"]
 fail-if = [
   "a11y_checks",
 ] # Bug 1953248 a11y_checks fails when testing multiple tab prompts
 
-["browser_prompt_close_event.js"]
-
 ["browser_prompt_closed_window.js"]
 
 ["browser_switchTabPermissionPrompt.js"]
diff --git a/browser/components/genai/tests/browser/browser.toml b/browser/components/genai/tests/browser/browser.toml
index d341b47e1222..3701a0943fe4 100644
--- a/browser/components/genai/tests/browser/browser.toml
+++ b/browser/components/genai/tests/browser/browser.toml
@@ -6,12 +6,19 @@ prefs = [
 ]
 
 ["browser_chat_contextmenu.js"]
+
 ["browser_chat_nimbus.js"]
+
 ["browser_chat_request.js"]
+
 ["browser_chat_shortcuts.js"]
+
 ["browser_chat_sidebar.js"]
+
 ["browser_chat_telemetry.js"]
+
 ["browser_genai_actors.js"]
+
 ["browser_genai_init.js"]
 
 ["browser_link_preview.js"]
diff --git a/browser/components/genai/tests/xpcshell/xpcshell.toml b/browser/components/genai/tests/xpcshell/xpcshell.toml
index 0d24433395e3..8fdd6778a0a1 100644
--- a/browser/components/genai/tests/xpcshell/xpcshell.toml
+++ b/browser/components/genai/tests/xpcshell/xpcshell.toml
@@ -2,7 +2,11 @@
 firefox-appdir = "browser"
 
 ["test_build_chat_prompt.js"]
+
 ["test_contextual_prompts.js"]
+
 ["test_link_preview_text.js"]
+
 ["test_provider_id.js"]
+
 ["test_show_chat_entrypoint.js"]
diff --git a/browser/components/resistfingerprinting/test/browser/browser.toml b/browser/components/resistfingerprinting/test/browser/browser.toml
index fc009a63d9b7..1d2c4ed3ac98 100644
--- a/browser/components/resistfingerprinting/test/browser/browser.toml
+++ b/browser/components/resistfingerprinting/test/browser/browser.toml
@@ -81,6 +81,8 @@ https_first_disabled = true
 
 ["browser_canvascompare_popups_data.js"]
 
+["browser_color_scheme.js"]
+
 ["browser_cross_origin_isolated_animation_api.js"]
 
 ["browser_cross_origin_isolated_performance_api.js"]
@@ -160,5 +162,3 @@ https_first_disabled = true
 ["browser_spoofing_keyboard_event.js"]
 
 ["browser_timezone.js"]
-
-["browser_color_scheme.js"]
diff --git a/browser/components/resistfingerprinting/test/mochitest/mochitest.toml b/browser/components/resistfingerprinting/test/mochitest/mochitest.toml
index 328ce6eae897..d24ea5f59752 100644
--- a/browser/components/resistfingerprinting/test/mochitest/mochitest.toml
+++ b/browser/components/resistfingerprinting/test/mochitest/mochitest.toml
@@ -18,6 +18,8 @@ support-files = ["decode_error.mp4"]
 
 ["test_bug1382499_touch_api.html"]
 
+["test_bug1885101_screenwindow_sizes.html"]
+
 ["test_device_sensor_event.html"]
 
 ["test_geolocation.html"]
@@ -34,5 +36,3 @@ support-files = ["../../../../../dom/events/test/pointerevents/mochitest_support
 
 ["test_speech_synthesis.html"]
 skip-if = ["verify"]
-
-["test_bug1885101_screenwindow_sizes.html"]
diff --git a/browser/components/sidebar/tests/marionette/manifest.toml b/browser/components/sidebar/tests/marionette/manifest.toml
index 5b1b6bb3502c..c60aad59dee6 100644
--- a/browser/components/sidebar/tests/marionette/manifest.toml
+++ b/browser/components/sidebar/tests/marionette/manifest.toml
@@ -2,4 +2,5 @@
 tags = "local"
 
 ["test_default_launcher_visible.py"]
+
 ["test_initialize_vertical_tabs.py"]
diff --git a/browser/components/tests/browser/browser.toml b/browser/components/tests/browser/browser.toml
index 21588cc72036..d11754f3da6a 100644
--- a/browser/components/tests/browser/browser.toml
+++ b/browser/components/tests/browser/browser.toml
@@ -23,6 +23,10 @@ reason = "test depends on update channel"
 
 ["browser_contentpermissionprompt.js"]
 
+["browser_csp_blocks_event_handlers.js"]
+
+["browser_csp_violation_telemetry.js"]
+
 ["browser_default_bookmark_toolbar_visibility.js"]
 
 ["browser_default_browser_prompt.js"]
@@ -48,7 +52,3 @@ run-if = ["os != 'mac'"] # On macOS we can't change browser.quitShortcut.disable
 
 ["browser_to_handle_telemetry.js"]
 run-if = ["os == 'win'"]
-
-["browser_csp_blocks_event_handlers.js"]
-
-["browser_csp_violation_telemetry.js"]
diff --git a/browser/themes/test/browser/browser.toml b/browser/themes/test/browser/browser.toml
index 3f22bf582fd4..38266b35c891 100644
--- a/browser/themes/test/browser/browser.toml
+++ b/browser/themes/test/browser/browser.toml
@@ -1,5 +1,5 @@
 [DEFAULT]
 
-["browser_expireThemes.js"]
-
 ["browser_BuiltInThemes_installs.js"]
+
+["browser_expireThemes.js"]
diff --git a/devtools/client/debugger/test/mochitest/browser_aj.toml b/devtools/client/debugger/test/mochitest/browser_aj.toml
index 410b5335f3f1..65d997f72909 100644
--- a/devtools/client/debugger/test/mochitest/browser_aj.toml
+++ b/devtools/client/debugger/test/mochitest/browser_aj.toml
@@ -154,13 +154,13 @@ fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and
 
 ["browser_dbg-editor-highlight.js"]
 
+["browser_dbg-editor-horizontal-scroll.js"]
+
 ["browser_dbg-editor-mode.js"]
 
 ["browser_dbg-editor-scroll.js"]
 skip-if = ["cm5"]
 
-["browser_dbg-editor-horizontal-scroll.js"]
-
 ["browser_dbg-editor-select.js"]
 
 ["browser_dbg-ember-original-variable-mapping-notifications.js"]
diff --git a/devtools/client/debugger/test/xpcshell/xpcshell.toml b/devtools/client/debugger/test/xpcshell/xpcshell.toml
index 650ee0af8a84..7be87452b805 100644
--- a/devtools/client/debugger/test/xpcshell/xpcshell.toml
+++ b/devtools/client/debugger/test/xpcshell/xpcshell.toml
@@ -4,4 +4,3 @@ firefox-appdir = "browser"
 skip-if = ["os == 'android'"]
 
 ["test_sourcetree_utils_getRelativePath.js"]
-
diff --git a/docshell/test/iframesandbox/mochitest.toml b/docshell/test/iframesandbox/mochitest.toml
index 97e6f7617065..e1ffbc019dfc 100644
--- a/docshell/test/iframesandbox/mochitest.toml
+++ b/docshell/test/iframesandbox/mochitest.toml
@@ -36,4 +36,3 @@ skip-if = [
   "http3",
   "http2",
 ]
-
diff --git a/docshell/test/navigation/browser.toml b/docshell/test/navigation/browser.toml
index 8edaf5effee9..b50f5896323a 100644
--- a/docshell/test/navigation/browser.toml
+++ b/docshell/test/navigation/browser.toml
@@ -10,6 +10,8 @@ support-files = [
   "redirect_to_blank.sjs",
 ]
 
+["browser_bfcache_activebc.js"]
+
 ["browser_bug343515.js"]
 
 ["browser_bug1757458.js"]
@@ -26,5 +28,3 @@ skip-if = ["!sessionHistoryInParent"]
 
 ["browser_test_simultaneous_normal_and_history_loads.js"]
 skip-if = ["!sessionHistoryInParent"] # The test is for the new session history
-
-["browser_bfcache_activebc.js"]
diff --git a/dom/base/test/fmm/browser.toml b/dom/base/test/fmm/browser.toml
index 064189b03da7..e35e1a05b352 100644
--- a/dom/base/test/fmm/browser.toml
+++ b/dom/base/test/fmm/browser.toml
@@ -1,4 +1,3 @@
 [DEFAULT]
 
 ["browser_frame_message_manager_cache.js"]
-
diff --git a/dom/base/test/jsmodules/importmaps/mochitest.toml b/dom/base/test/jsmodules/importmaps/mochitest.toml
index 172aea40f3ba..9bd8efbd4fb9 100644
--- a/dom/base/test/jsmodules/importmaps/mochitest.toml
+++ b/dom/base/test/jsmodules/importmaps/mochitest.toml
@@ -43,9 +43,14 @@ support-files = [
 
 ["test_bug_1893164.html"]
 
-["test_importMap_with_external_script.html"]
-["test_importMap_with_nonexisting_module.html"]
-["test_invalid_dynamic_import.html"]
-["test_dynamic_importMap_with_external_script.html"]
 ["test_dynamic_importMap_load_completes.html"]
+
+["test_dynamic_importMap_with_external_script.html"]
+
+["test_importMap_with_external_script.html"]
+
+["test_importMap_with_nonexisting_module.html"]
+
+["test_invalid_dynamic_import.html"]
+
 ["test_shared_submodules_with_modulepreload.html"]
diff --git a/dom/canvas/test/crossorigin/mochitest.toml b/dom/canvas/test/crossorigin/mochitest.toml
index 0b62b02eabcd..fdabde0ec1fc 100644
--- a/dom/canvas/test/crossorigin/mochitest.toml
+++ b/dom/canvas/test/crossorigin/mochitest.toml
@@ -23,4 +23,3 @@ subsuite = "gpu"
 
 ["test_webgl_crossorigin_textures.html"]
 subsuite = "gpu"
-
diff --git a/dom/canvas/test/webgl-mochitest/mochitest.toml b/dom/canvas/test/webgl-mochitest/mochitest.toml
index 1f75fdc22d46..a59ec8acb3e5 100644
--- a/dom/canvas/test/webgl-mochitest/mochitest.toml
+++ b/dom/canvas/test/webgl-mochitest/mochitest.toml
@@ -208,11 +208,11 @@ skip-if = [
 
 ["test_privileged_exts.html"]
 
-["test_read_pixels_no_format.html"]
-
 ["test_read_pixels_naive_impl_read_formats.html"]
 tags = "os_integration"
 
+["test_read_pixels_no_format.html"]
+
 ["test_renderer_strings.html"]
 skip-if = ["display == 'wayland'"]
 tags = "os_integration"
diff --git a/dom/fetch/tests/mochitest.toml b/dom/fetch/tests/mochitest.toml
index 3f7692d8561a..09382cf28263 100644
--- a/dom/fetch/tests/mochitest.toml
+++ b/dom/fetch/tests/mochitest.toml
@@ -4,8 +4,8 @@ support-files = [
   "multipart.sjs",
 ]
 
+["test_bug1752761.html"]
+
 ["test_ext_response_constructor.html"]
 
 ["test_invalid_header_exception.html"]
-
-["test_bug1752761.html"]
diff --git a/dom/fs/test/mochitest/mochitest.toml b/dom/fs/test/mochitest/mochitest.toml
index 4831223e1965..5616cfdfe714 100644
--- a/dom/fs/test/mochitest/mochitest.toml
+++ b/dom/fs/test/mochitest/mochitest.toml
@@ -30,6 +30,9 @@ scheme = "https"
 ["test_fileSystemDirectoryHandle_worker.html"]
 scheme = "https"
 
+["test_iframes.html"]
+scheme = "https"
+
 ["test_syncAccessHandle_worker.html"]
 scheme = "https"
 
@@ -38,6 +41,3 @@ scheme = "https"
 
 ["test_writableFileStream_worker.html"]
 scheme = "https"
-
-["test_iframes.html"]
-scheme = "https"
diff --git a/dom/html/test/dialog/mochitest.toml b/dom/html/test/dialog/mochitest.toml
index 18f1f551a727..23217d41de78 100644
--- a/dom/html/test/dialog/mochitest.toml
+++ b/dom/html/test/dialog/mochitest.toml
@@ -1,4 +1,3 @@
 [DEFAULT]
 
 ["test_bug1648877_dialog_fullscreen_denied.html"]
-
diff --git a/dom/html/test/forms/without_selectionchange/mochitest.toml b/dom/html/test/forms/without_selectionchange/mochitest.toml
index 8f019d8d802a..6f2110908717 100644
--- a/dom/html/test/forms/without_selectionchange/mochitest.toml
+++ b/dom/html/test/forms/without_selectionchange/mochitest.toml
@@ -2,4 +2,3 @@
 prefs = ["dom.select_events.textcontrols.enabled=false"]
 
 ["test_select.html"]
-
diff --git a/dom/jsurl/test/mochitest.toml b/dom/jsurl/test/mochitest.toml
index 2882e4c146ee..18820c1c957a 100644
--- a/dom/jsurl/test/mochitest.toml
+++ b/dom/jsurl/test/mochitest.toml
@@ -22,4 +22,3 @@ support-files = [
 ["test_bug1382035-1.html"]
 
 ["test_bug1382035-2.html"]
-
diff --git a/dom/media/test/mochitest_media_engine.toml b/dom/media/test/mochitest_media_engine.toml
index c9ad881aec64..89cfe3034d33 100644
--- a/dom/media/test/mochitest_media_engine.toml
+++ b/dom/media/test/mochitest_media_engine.toml
@@ -5,6 +5,6 @@ skip-if = ["!wmfme"]
 
 ["test_eme_mfcdm_generate_request.html"]
 
-["test_eme_wideinve_l1_installation.html"]
-
 ["test_eme_mfcdm_getstatusforpolicy.html"]
+
+["test_eme_wideinve_l1_installation.html"]
diff --git a/dom/media/webaudio/test/mochitest_audio.toml b/dom/media/webaudio/test/mochitest_audio.toml
index 1f037c0ec695..86281023f282 100644
--- a/dom/media/webaudio/test/mochitest_audio.toml
+++ b/dom/media/webaudio/test/mochitest_audio.toml
@@ -96,4 +96,3 @@ tags = "capturestream"
 ["test_audioParamSetValueAtTime.html"]
 
 ["test_audioParamTimelineDestinationOffset.html"]
-
diff --git a/dom/media/webcodecs/test/mochitest.toml b/dom/media/webcodecs/test/mochitest.toml
index 9d8922249dae..f94df1f1a319 100644
--- a/dom/media/webcodecs/test/mochitest.toml
+++ b/dom/media/webcodecs/test/mochitest.toml
@@ -10,10 +10,10 @@ support-files = [
   "green.png",
 ]
 
-["test_videoFrame_mismatched_codedSize.html"]
-
 ["test_bug1921817.html"]
 scheme = "https"
 
 ["test_imageDecoder_desiredSize.html"]
 scheme = "https"
+
+["test_videoFrame_mismatched_codedSize.html"]
diff --git a/dom/media/webrtc/tests/mochitests/mochitest_peerconnection.toml b/dom/media/webrtc/tests/mochitests/mochitest_peerconnection.toml
index d918f79be9bf..541a667c362a 100644
--- a/dom/media/webrtc/tests/mochitests/mochitest_peerconnection.toml
+++ b/dom/media/webrtc/tests/mochitests/mochitest_peerconnection.toml
@@ -111,9 +111,6 @@ scheme = "http"
 
 ["test_peerConnection_basicAudioRequireEOC.html"]
 
-["test_peerConnection_verifyNonEmptyFmtp.html"]
-skip-if = ["os == 'android'"]
-
 ["test_peerConnection_basicAudioVerifyRtpHeaderExtensions.html"]
 
 ["test_peerConnection_basicAudioVideo.html"]
@@ -462,6 +459,9 @@ skip-if = ["os == 'android' && processor == 'x86_64' && !debug"] # Bug 1783287
 
 ["test_peerConnection_verifyDescriptions.html"]
 
+["test_peerConnection_verifyNonEmptyFmtp.html"]
+skip-if = ["os == 'android'"]
+
 ["test_peerConnection_verifyVideoAfterRenegotiation.html"]
 
 ["test_peerConnection_videoCodecs.html"]
diff --git a/dom/media/webspeech/synth/test/startup/mochitest.toml b/dom/media/webspeech/synth/test/startup/mochitest.toml
index ab8b057b2adc..793eeeb54990 100644
--- a/dom/media/webspeech/synth/test/startup/mochitest.toml
+++ b/dom/media/webspeech/synth/test/startup/mochitest.toml
@@ -5,4 +5,3 @@ support-files = ["file_voiceschanged.html"]
 
 ["test_voiceschanged.html"]
 skip-if = ["verify"]
-
diff --git a/dom/notification/test/mochitest/mochitest.toml b/dom/notification/test/mochitest/mochitest.toml
index a881133b5644..4ca82bf4bede 100644
--- a/dom/notification/test/mochitest/mochitest.toml
+++ b/dom/notification/test/mochitest/mochitest.toml
@@ -21,6 +21,7 @@ support-files = ["blank.html"]
 support-files = ["blank.html"]
 
 # This test needs to be run on HTTP (not HTTPS).
+
 ["test_notification_insecure_context.html"]
 skip-if = [
   "http3",
@@ -41,6 +42,19 @@ support-files = [
   "notification/register.html",
 ]
 
+["test_notification_serviceworker_openWindow.html"]
+skip-if = [
+  "xorigin",  # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
+  "http3",
+  "http2",
+]
+support-files = [
+  "notification_openWindow_worker.js",
+  "file_notification_openWindow.html",
+  "!/dom/serviceworkers/test/utils.js",
+]
+tags = "openwindow"
+
 ["test_notification_serviceworker_openWindow_nested.html"]
 skip-if = [
   "xorigin", # Bug 1792790
@@ -56,19 +70,6 @@ support-files = [
 ]
 tags = "openwindow"
 
-["test_notification_serviceworker_openWindow.html"]
-skip-if = [
-  "xorigin",  # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
-  "http3",
-  "http2",
-]
-support-files = [
-  "notification_openWindow_worker.js",
-  "file_notification_openWindow.html",
-  "!/dom/serviceworkers/test/utils.js",
-]
-tags = "openwindow"
-
 ["test_notification_serviceworker_show.html"]
 skip-if = ["xorigin"] # Bug 1792790
 support-files = [
@@ -82,6 +83,19 @@ support-files = [
   "notification_show_dedicated.js",
 ]
 
+["test_notification_tag.html"]
+skip-if = [
+  "http3",
+  "http2",
+]
+support-files = ["create_notification.html"]
+
+["test_notification_worker.html"]
+skip-if = [
+  "os == 'android'", # Bug 1816427, Notification.onshow/close are broken on Android
+]
+support-files = ["notification_worker.js"]
+
 ["test_notification_worker_child.html"]
 skip-if = [
   "os == 'android'", # Bug 1816427, Notification.onshow/close are broken on Android
@@ -99,11 +113,13 @@ skip-if = [
 ["test_notification_worker_permission.html"]
 support-files = ["notification_permission_worker.js"]
 
-["test_notification_worker.html"]
-skip-if = [
-  "os == 'android'", # Bug 1816427, Notification.onshow/close are broken on Android
+["test_notificationclick.html"]
+skip-if = ["xorigin"] # Bug 1792790
+support-files = [
+  "notificationclick.html",
+  "notificationclick.js",
+  "!/dom/serviceworkers/test/utils.js",
 ]
-support-files = ["notification_worker.js"]
 
 ["test_notificationclick_focus.html"]
 skip-if = ["xorigin"] # Bug 1792790
@@ -121,14 +137,6 @@ support-files = [
   "!/dom/serviceworkers/test/utils.js",
 ]
 
-["test_notificationclick.html"]
-skip-if = ["xorigin"] # Bug 1792790
-support-files = [
-  "notificationclick.html",
-  "notificationclick.js",
-  "!/dom/serviceworkers/test/utils.js",
-]
-
 ["test_notificationclose.html"]
 skip-if = ["xorigin"] # Bug 1792790
 support-files = [
@@ -137,10 +145,3 @@ support-files = [
   "notificationclose.js",
   "!/dom/serviceworkers/test/utils.js",
 ]
-
-["test_notification_tag.html"]
-skip-if = [
-  "http3",
-  "http2",
-]
-support-files = ["create_notification.html"]
diff --git a/dom/security/featurepolicy/test/mochitest/mochitest.toml b/dom/security/featurepolicy/test/mochitest/mochitest.toml
index 98cada410cf4..0859faebbd5d 100644
--- a/dom/security/featurepolicy/test/mochitest/mochitest.toml
+++ b/dom/security/featurepolicy/test/mochitest/mochitest.toml
@@ -12,13 +12,13 @@ support-files = [
 
 ["test_initial_aboutblank.html"]
 
-["test_parser.html"]
-fail-if = ["xorigin"]
-
 ["test_nested.html"]
 scheme = "https"
 fail-if = ["xorigin"]
 
+["test_parser.html"]
+fail-if = ["xorigin"]
+
 ["test_xslt.html"]
 support-files = [
   "file_xslt.js",
diff --git a/dom/security/test/cors/mochitest.toml b/dom/security/test/cors/mochitest.toml
index 7cd9fc845afb..ab2457c2b4a4 100644
--- a/dom/security/test/cors/mochitest.toml
+++ b/dom/security/test/cors/mochitest.toml
@@ -24,4 +24,3 @@ skip-if = [
   "http3",
   "http2",
 ]
-
diff --git a/dom/security/test/csp/mochitest.toml b/dom/security/test/csp/mochitest.toml
index 737b29beb01a..6157151223cc 100644
--- a/dom/security/test/csp/mochitest.toml
+++ b/dom/security/test/csp/mochitest.toml
@@ -644,12 +644,6 @@ skip-if = [
   "http2",
 ]
 
-["test_reporting_api_disabled.html"]
-skip-if = [
-  "http3",
-  "http2",
-]
-
 ["test_report_font_cache.html"]
 skip-if = [
   "http3",
@@ -665,6 +659,12 @@ skip-if = [
 
 ["test_report_uri_missing_in_report_only_header.html"]
 
+["test_reporting_api_disabled.html"]
+skip-if = [
+  "http3",
+  "http2",
+]
+
 ["test_sandbox.html"]
 skip-if = ["true"] # Bug 1657934
 
diff --git a/dom/security/test/general/browser.toml b/dom/security/test/general/browser.toml
index 244c107a5f35..e729dcb69853 100644
--- a/dom/security/test/general/browser.toml
+++ b/dom/security/test/general/browser.toml
@@ -48,6 +48,11 @@ support-files = [
   "file_gpc_server.sjs",
 ]
 
+["browser_test_onion_referrer.js"]
+support-files = [
+  "file_referrer_echoer.sjs",
+]
+
 ["browser_test_referrer_loadInOtherProcess.js"]
 
 ["browser_test_toplevel_data_navigations.js"]
@@ -72,8 +77,3 @@ support-files = [
   "file_framing_xfo_object.html",
   "file_framing_xfo_embed_object.sjs",
 ]
-
-["browser_test_onion_referrer.js"]
-support-files = [
-  "file_referrer_echoer.sjs",
-]
diff --git a/dom/security/test/https-first/mochitest.toml b/dom/security/test/https-first/mochitest.toml
index 1f0eb62e4b11..6cfded87a225 100644
--- a/dom/security/test/https-first/mochitest.toml
+++ b/dom/security/test/https-first/mochitest.toml
@@ -7,15 +7,15 @@ skip-if = [
 ["test_bad_cert.html"]
 support-files = ["file_bad_cert.sjs"]
 
-["test_bug_1725646.html"]
-support-files = ["file_bug_1725646_a.sjs", "file_bug_1725646_b.sjs"]
-
 ["test_break_endless_upgrade_downgrade_loop.html"]
 support-files = [
   "file_break_endless_upgrade_downgrade_loop.sjs",
   "file_downgrade_with_different_path.sjs",
 ]
 
+["test_bug_1725646.html"]
+support-files = ["file_bug_1725646_a.sjs", "file_bug_1725646_b.sjs"]
+
 ["test_data_uri.html"]
 support-files = ["file_data_uri.html"]
 
diff --git a/dom/security/test/referrer-policy/mochitest.toml b/dom/security/test/referrer-policy/mochitest.toml
index 89a54ad5541e..e92583f50e33 100644
--- a/dom/security/test/referrer-policy/mochitest.toml
+++ b/dom/security/test/referrer-policy/mochitest.toml
@@ -25,4 +25,3 @@ skip-if = [
   "http3",
   "http2",
 ]
-
diff --git a/dom/serviceworkers/test/browser.toml b/dom/serviceworkers/test/browser.toml
index 9aed55b2b000..5dd58757efe1 100644
--- a/dom/serviceworkers/test/browser.toml
+++ b/dom/serviceworkers/test/browser.toml
@@ -2,7 +2,8 @@
 prefs = ["sidebar.revamp=false"]
 dupe-manifest = true
 
+["browser_sw_lifetime_extension.js"]
+
 ["include:browser-common.toml"]
 
 # remove this in favor of the common thing.
-["browser_sw_lifetime_extension.js"]
diff --git a/dom/serviceworkers/test/mochitest.toml b/dom/serviceworkers/test/mochitest.toml
index dc88cfca6037..20e00bb84e57 100644
--- a/dom/serviceworkers/test/mochitest.toml
+++ b/dom/serviceworkers/test/mochitest.toml
@@ -16,6 +16,7 @@ skip-if = ["os == 'android'"]
 # This test can't work in PBM because of SpecialPowers.createChromeCache not
 # supporting PBM we don't need to validate this in PBM.  So this test is not in
 # mochitest-common.toml.
+
 ["test_bad_script_cache.html"]
 
 # Following tests are not working currently when dFPI is enabled. So, we put
diff --git a/dom/svg/test/mochitest.toml b/dom/svg/test/mochitest.toml
index 0159bf63e686..14a0a1b53538 100644
--- a/dom/svg/test/mochitest.toml
+++ b/dom/svg/test/mochitest.toml
@@ -51,6 +51,8 @@ support-files = [
 
 ["test_SVG_namespace_ids.html"]
 
+["test_SVG_switch_language_spoof.html"]
+
 ["test_SVGxxxList.xhtml"]
 
 ["test_SVGxxxListIndexing.xhtml"]
@@ -187,5 +189,3 @@ scheme = "https"
 ["test_viewBox.html"]
 
 ["test_viewport.html"]
-
-["test_SVG_switch_language_spoof.html"]
diff --git a/dom/system/tests/mochitest.toml b/dom/system/tests/mochitest.toml
index 3b4f90598414..2b6e35f5dad0 100644
--- a/dom/system/tests/mochitest.toml
+++ b/dom/system/tests/mochitest.toml
@@ -4,11 +4,11 @@ scheme = "https"
 
 support-files = ["file_bug1197901.html"]
 
+["test_HapticFeedback.html"]
+run-if = ["android"] # Haptic feedback is only supported on Android
+
 ["test_bug1197901.html"]
 skip-if = [
   "os == 'android'",
   "condprof",  #: "Only focused window should get the sensor events"
 ]
-
-["test_HapticFeedback.html"]
-run-if = ["android"] # Haptic feedback is only supported on Android
diff --git a/dom/workers/test/mochitest.toml b/dom/workers/test/mochitest.toml
index 7e2544d6ca58..473fe35047f8 100644
--- a/dom/workers/test/mochitest.toml
+++ b/dom/workers/test/mochitest.toml
@@ -351,16 +351,16 @@ scheme = "https"
 
 ["test_transferable.html"]
 
+["test_worker_in_background.html"]
+skip-if = [
+"os == 'android'", # since geckoview does not support multiple tabs
+]
+
 ["test_worker_interfaces.html"]
 skip-if = [
   "http3",
   "http2",
 ]
 
-["test_worker_in_background.html"]
-skip-if = [
-"os == 'android'", # since geckoview does not support multiple tabs
-]
-
 ["test_worker_interfaces_secureContext.html"]
 scheme = "https"
diff --git a/gfx/layers/apz/test/mochitest/browser.toml b/gfx/layers/apz/test/mochitest/browser.toml
index 2bf81aadf32b..95ea0a8e820e 100644
--- a/gfx/layers/apz/test/mochitest/browser.toml
+++ b/gfx/layers/apz/test/mochitest/browser.toml
@@ -11,14 +11,6 @@ prefs = ["sidebar.revamp=false"]
 
 ["browser_test_animations_without_apz_sampler.js"]
 
-["browser_test_touch_event_in_popup_panel.js"]
-support-files = [
-  "!/testing/mochitest/tests/SimpleTest/paint_listener.js",
-]
-skip-if = [
-  "os == 'mac'", # On Mac popup windows having no remote content doesn't have the compositor
-]
-
 ["browser_test_autoscrolling_in_extension_popup_window.js"]
 
 ["browser_test_autoscrolling_in_oop_frame.js"]
@@ -58,18 +50,18 @@ skip-if = [
   "os == 'mac'", # On Mac popup windows having no remote content doesn't have the compositor
 ]
 
-["browser_test_popup_menu_in_position_fixed.js"]
-support-files = ["helper_popup_menu_in_parent_process-1.html"]
-skip-if = [
-  "os == 'mac'", # On Mac popup windows having no remote content doesn't have the compositor
-]
-
 ["browser_test_popup_menu_in_parent_process.js"]
 support-files = [
   "helper_popup_menu_in_parent_process-1.html",
   "helper_popup_menu_in_parent_process-2.html"
 ]
 
+["browser_test_popup_menu_in_position_fixed.js"]
+support-files = ["helper_popup_menu_in_parent_process-1.html"]
+skip-if = [
+  "os == 'mac'", # On Mac popup windows having no remote content doesn't have the compositor
+]
+
 ["browser_test_position_sticky.js"]
 support-files = ["helper_position_sticky_flicker.html"]
 
@@ -112,3 +104,11 @@ support-files = [
 ["browser_test_tab_drag_zoom.js"]
 run-if = ["os != 'win'"] # Our Windows touch injection test code doesn't support pinch gestures (bug 1495580)
 support-files = ["helper_test_tab_drag_zoom.html"]
+
+["browser_test_touch_event_in_popup_panel.js"]
+support-files = [
+  "!/testing/mochitest/tests/SimpleTest/paint_listener.js",
+]
+skip-if = [
+  "os == 'mac'", # On Mac popup windows having no remote content doesn't have the compositor
+]
diff --git a/gfx/layers/apz/test/mochitest/mochitest.toml b/gfx/layers/apz/test/mochitest/mochitest.toml
index 1570f6cae58e..312bbc5db071 100644
--- a/gfx/layers/apz/test/mochitest/mochitest.toml
+++ b/gfx/layers/apz/test/mochitest/mochitest.toml
@@ -132,6 +132,8 @@ skip-if = [
 
 ["test_group_programmatic_scroll_behavior.html"]
 
+["test_group_scrollIntoView.html"]
+
 ["test_group_scroll_anchor.html"]
 
 ["test_group_scroll_linked_effect.html"]
@@ -156,8 +158,6 @@ skip-if = [
 ["test_group_scrollframe_activation.html"]
 skip-if = ["display == 'wayland' && os_version == '22.04'"]  # Bug 1857059
 
-["test_group_scrollIntoView.html"]
-
 ["test_group_touchevents-2.html"]
 
 ["test_group_touchevents-3.html"]
diff --git a/image/test/browser/browser.toml b/image/test/browser/browser.toml
index 8ddecb446bfa..7725e1e20da1 100644
--- a/image/test/browser/browser.toml
+++ b/image/test/browser/browser.toml
@@ -9,6 +9,17 @@ support-files = [
   "browser_docshell_type_editor/**"
 ]
 
+["browser_animated_css_image.js"]
+support-files = [
+  "!/gfx/layers/apz/test/mochitest/apz_test_utils.js",
+  "!/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js",
+  "animated1.gif",
+  "animated1.svg",
+  "animatedMask.gif",
+  "helper_animated_css_image.html",
+  "../animated_image_test_list.js",
+]
+
 ["browser_bug666317.js"]
 skip-if = ["true"] # Bug 1207012 - Permaorange from an uncaught exception that isn't actually turning the suite orange until it hits beta, Bug 948194 - Decoded Images seem to not be discarded on memory-pressure notification
 
@@ -28,14 +39,3 @@ skip-if = ["true"] # Bug 987616
 ["browser_offscreen_image_in_out_of_process_iframe.js"]
 https_first_disabled = true
 support-files = ["empty.html"]
-
-["browser_animated_css_image.js"]
-support-files = [
-  "!/gfx/layers/apz/test/mochitest/apz_test_utils.js",
-  "!/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js",
-  "animated1.gif",
-  "animated1.svg",
-  "animatedMask.gif",
-  "helper_animated_css_image.html",
-  "../animated_image_test_list.js",
-]
diff --git a/intl/uconv/tests/unit/xpcshell.toml b/intl/uconv/tests/unit/xpcshell.toml
index 47362902ba22..dac4749e681a 100644
--- a/intl/uconv/tests/unit/xpcshell.toml
+++ b/intl/uconv/tests/unit/xpcshell.toml
@@ -172,4 +172,3 @@ support-files = [
 ["test_unmapped.js"]
 
 ["test_utf8_illegals.js"]
-
diff --git a/layout/base/tests/mochitest.toml b/layout/base/tests/mochitest.toml
index 9ae5e8aa5267..5717a774d65d 100644
--- a/layout/base/tests/mochitest.toml
+++ b/layout/base/tests/mochitest.toml
@@ -237,11 +237,11 @@ support-files = ["bug1448730.html"]
 
 ["test_bug1836801.html"]
 
+["test_caretPositionFromPoint_insertAnonymousContent.html"]
+
 ["test_caret_browsing_around_form_controls.html"]
 skip-if = ["os == 'android'"]
 
-["test_caretPositionFromPoint_insertAnonymousContent.html"]
-
 ["test_dynamic_toolbar_max_height.html"]
 support-files = ["file_dynamic_toolbar_max_height.html"]
 
diff --git a/layout/generic/test/mochitest.toml b/layout/generic/test/mochitest.toml
index 531cb5a64ed0..29ef4592ad52 100644
--- a/layout/generic/test/mochitest.toml
+++ b/layout/generic/test/mochitest.toml
@@ -290,22 +290,22 @@ skip-if = ["release_or_beta"] # requires Selection.getComposedRanges to be enabl
 ["test_selection_cross_shadow_boundary_2_forward_drag.html"]
 skip-if = ["release_or_beta"] # requires Selection.getComposedRanges to be enabled (Nightly only)
 
-["test_selection_cross_shadow_boundary_multi_ranges_forward_drag.html"]
-skip-if = ["release_or_beta"] # requires Selection.getComposedRanges to be enabled (Nightly only)
-
-["test_selection_cross_shadow_boundary_multi_ranges_forward_click.html"]
-skip-if = ["release_or_beta"] # requires Selection.getComposedRanges to be enabled (Nightly only)
-
-["test_selection_cross_shadow_boundary_multi_ranges_backward_drag.html"]
-skip-if = ["release_or_beta"] # requires Selection.getComposedRanges to be enabled (Nightly only)
-
-["test_selection_cross_shadow_boundary_multi_ranges_backward_click.html"]
+["test_selection_cross_shadow_boundary_backward_nested_click.html"]
 skip-if = ["release_or_beta"] # requires Selection.getComposedRanges to be enabled (Nightly only)
 
 ["test_selection_cross_shadow_boundary_forward_and_backward.html"]
 skip-if = ["release_or_beta"] # requires Selection.getComposedRanges to be enabled (Nightly only)
 
-["test_selection_cross_shadow_boundary_backward_nested_click.html"]
+["test_selection_cross_shadow_boundary_multi_ranges_backward_click.html"]
+skip-if = ["release_or_beta"] # requires Selection.getComposedRanges to be enabled (Nightly only)
+
+["test_selection_cross_shadow_boundary_multi_ranges_backward_drag.html"]
+skip-if = ["release_or_beta"] # requires Selection.getComposedRanges to be enabled (Nightly only)
+
+["test_selection_cross_shadow_boundary_multi_ranges_forward_click.html"]
+skip-if = ["release_or_beta"] # requires Selection.getComposedRanges to be enabled (Nightly only)
+
+["test_selection_cross_shadow_boundary_multi_ranges_forward_drag.html"]
 skip-if = ["release_or_beta"] # requires Selection.getComposedRanges to be enabled (Nightly only)
 
 ["test_selection_doubleclick.html"]
diff --git a/layout/style/test/browser.toml b/layout/style/test/browser.toml
index 476b27471f2f..4d4b80ba151f 100644
--- a/layout/style/test/browser.toml
+++ b/layout/style/test/browser.toml
@@ -22,4 +22,3 @@ support-files = [
 ["browser_sourcemap_comment.js"]
 
 ["browser_sourceurl_comment.js"]
-
diff --git a/layout/tables/test/mochitest.toml b/layout/tables/test/mochitest.toml
index 4db0ddf8ff1c..2a8e5dd5d45e 100644
--- a/layout/tables/test/mochitest.toml
+++ b/layout/tables/test/mochitest.toml
@@ -4,6 +4,6 @@
 
 ["test_bug541668_table_event_delivery.html"]
 
-["test_bug1832110.html"]
-
 ["test_bug1825384.html"]
+
+["test_bug1832110.html"]
diff --git a/netwerk/test/unit/xpcshell.toml b/netwerk/test/unit/xpcshell.toml
index 5d08ca5276ab..5e8b4827359c 100644
--- a/netwerk/test/unit/xpcshell.toml
+++ b/netwerk/test/unit/xpcshell.toml
@@ -1290,6 +1290,8 @@ skip-if = [
 ["test_trr_extended_error.js"]
 run-sequentially = "node server exceptions dont replay well"
 
+["test_trr_flags.js"]
+
 ["test_trr_https_fallback.js"]
 skip-if = [
   "asan",
@@ -1398,5 +1400,3 @@ skip-if = [
 
 ["test_xmlhttprequest.js"]
 prefs = ["network.xhr.block_sync_system_requests=false"] # Bug 721336
-
-["test_trr_flags.js"]
diff --git a/parser/htmlparser/tests/mochitest/browser.toml b/parser/htmlparser/tests/mochitest/browser.toml
index 3ece65c115fc..6975de51106b 100644
--- a/parser/htmlparser/tests/mochitest/browser.toml
+++ b/parser/htmlparser/tests/mochitest/browser.toml
@@ -12,4 +12,3 @@ support-files = ["file_viewsource.html"]
 
 ["browser_ysod_telemetry.js"]
 support-files = ["broken_xml.xhtml"]
-
diff --git a/python/mach/mach/test/python.toml b/python/mach/mach/test/python.toml
index d27ac2fb5964..676ccdbec88e 100644
--- a/python/mach/mach/test/python.toml
+++ b/python/mach/mach/test/python.toml
@@ -6,12 +6,12 @@ subsuite = "mach"
 ["test_conditions.py"]
 skip-if = ["true"]
 
-["test_definitions.py"]
-
 ["test_config.py"]
 
 ["test_decorators.py"]
 
+["test_definitions.py"]
+
 ["test_dispatcher.py"]
 
 ["test_entry_point.py"]
diff --git a/python/mozboot/mozboot/test/python.toml b/python/mozboot/mozboot/test/python.toml
index 4354883f392d..b8eaad29e010 100644
--- a/python/mozboot/mozboot/test/python.toml
+++ b/python/mozboot/mozboot/test/python.toml
@@ -2,4 +2,5 @@
 subsuite = "mozbuild"
 
 ["test_mozconfig.py"]
+
 ["test_msrv.py"]
diff --git a/security/manager/ssl/tests/unit/xpcshell.toml b/security/manager/ssl/tests/unit/xpcshell.toml
index 6bd7331e2f4d..be10ab52d101 100644
--- a/security/manager/ssl/tests/unit/xpcshell.toml
+++ b/security/manager/ssl/tests/unit/xpcshell.toml
@@ -70,8 +70,6 @@ skip-if = [
   "os == 'linux'"
 ]
 
-["test_trust_anchors.js"]
-
 ["test_certDB_export_pkcs12.js"]
 
 ["test_certDB_export_pkcs12_with_primary_password.js"]
@@ -219,6 +217,8 @@ run-sequentially = "hardcoded ports"
 
 ["test_nsIX509Cert_utf8.js"]
 
+["test_nss_errors_service.js"]
+
 ["test_ocsp_caching.js"]
 run-sequentially = "hardcoded ports"
 
@@ -351,9 +351,9 @@ skip-if = ["condprof"]  # Bug 1769154 - as designed
 
 ["test_sts_preloadlist_selfdestruct.js"]
 
+["test_trust_anchors.js"]
+
 ["test_validity.js"]
 run-sequentially = "hardcoded ports"
 
 ["test_x509.js"]
-
-["test_nss_errors_service.js"]
diff --git a/toolkit/components/extensions/test/marionette/manifest-serviceworker.toml b/toolkit/components/extensions/test/marionette/manifest-serviceworker.toml
index 04bdc4e17ec2..e46d04ca53d1 100644
--- a/toolkit/components/extensions/test/marionette/manifest-serviceworker.toml
+++ b/toolkit/components/extensions/test/marionette/manifest-serviceworker.toml
@@ -2,4 +2,5 @@
 skip-if = ["!nightly_build"] # MOZ_WEBEXT_WEBIDL_ENABLED is only defined on nightly
 
 ["test_extension_serviceworkers_purged_on_pref_disabled.py"]
+
 ["test_temporary_extension_serviceworkers_not_persisted.py"]
diff --git a/toolkit/components/find/test/mochitest/mochitest.toml b/toolkit/components/find/test/mochitest/mochitest.toml
index 813042898128..bec936e9f1ef 100644
--- a/toolkit/components/find/test/mochitest/mochitest.toml
+++ b/toolkit/components/find/test/mochitest/mochitest.toml
@@ -2,6 +2,7 @@
 prefs = [
   "dom.hidden_until_found.enabled=true",
 ]
+
 ["test_bug499115.html"]
 
 ["test_nsFind.html"]
diff --git a/toolkit/components/kvstore/test/xpcshell/xpcshell.toml b/toolkit/components/kvstore/test/xpcshell/xpcshell.toml
index e779efae0a34..852958ad68a2 100644
--- a/toolkit/components/kvstore/test/xpcshell/xpcshell.toml
+++ b/toolkit/components/kvstore/test/xpcshell/xpcshell.toml
@@ -3,4 +3,5 @@ skip-if = ["os == 'android'"]
 support-files = ["data/**"]
 
 ["test_kvstore.js"]
+
 ["test_sqlite_kvstore.js"]
diff --git a/toolkit/components/places/tests/bookmarks/xpcshell.toml b/toolkit/components/places/tests/bookmarks/xpcshell.toml
index c2e6d7ff09dd..8636cb955e49 100644
--- a/toolkit/components/places/tests/bookmarks/xpcshell.toml
+++ b/toolkit/components/places/tests/bookmarks/xpcshell.toml
@@ -70,10 +70,10 @@ support-files = ["bookmarks_long_tag.json"]
 
 ["test_bookmarks_update.js"]
 
-["test_insert_thousands_bookmarks.js"]
-
 ["test_insertTree_fixupOrSkipInvalidEntries.js"]
 
+["test_insert_thousands_bookmarks.js"]
+
 ["test_keywords.js"]
 
 ["test_removeFolderTransaction_reinsert.js"]
diff --git a/toolkit/components/places/tests/unit/xpcshell.toml b/toolkit/components/places/tests/unit/xpcshell.toml
index 1d8e39d90e93..d9560c8c311f 100644
--- a/toolkit/components/places/tests/unit/xpcshell.toml
+++ b/toolkit/components/places/tests/unit/xpcshell.toml
@@ -64,6 +64,8 @@ skip-if = ["os == 'linux'"] # Bug 821781
 
 ["test_PlacesDBUtils_removeOldCorruptDBs.js"]
 
+["test_PlacesObservers_counts.js"]
+
 ["test_PlacesQuery_history.js"]
 
 ["test_PlacesUtils_isRootItem.js"]
@@ -187,8 +189,6 @@ prefs = ["places.frecency.pages.alternative.featureGate=true"]
 
 ["test_pageGuid_bookmarkGuid.js"]
 
-["test_PlacesObservers_counts.js"]
-
 ["test_placeURIs.js"]
 
 ["test_promiseBookmarksTree.js"]
diff --git a/toolkit/components/resistfingerprinting/tests/browser/browser.toml b/toolkit/components/resistfingerprinting/tests/browser/browser.toml
index 007fff0a701c..0ac85981a3d6 100644
--- a/toolkit/components/resistfingerprinting/tests/browser/browser.toml
+++ b/toolkit/components/resistfingerprinting/tests/browser/browser.toml
@@ -35,8 +35,6 @@ support-files = [
 
 ["browser_fpiServiceWorkers_fingerprinting.js"]
 
-["browser_js_locale.js"]
-
 ["browser_fpp_protections_matrix_1.js"]
 
 ["browser_fpp_protections_matrix_2.js"]
@@ -45,6 +43,8 @@ support-files = [
 
 ["browser_fpp_protections_matrix_4.js"]
 
+["browser_js_locale.js"]
+
 ["browser_rfp_canvasplaceholder_pdfjs.js"]
 support-files = ["file_pdf.pdf"]
 
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.toml b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.toml
index 72472611d2cc..1e130501d8c2 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.toml
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.toml
@@ -31,6 +31,12 @@ skip-if = ["os == 'android'"] # Non-extension add-ons are not supported on Andro
 
 ["test_AddonRepository_paging.js"]
 
+["test_ModelHubProvider.js"]
+skip-if = [
+  "appname == 'thunderbird'", # Disabled in extensions.manifest
+  "os == 'android'", # ModelHubProvider.sys.mjs is not included on Android
+]
+
 ["test_ProductAddonChecker.js"]
 
 ["test_ProductAddonChecker_signatures.js"]
@@ -147,12 +153,6 @@ prefs = ["dom.security.https_first=false"]
 
 ["test_locale.js"]
 
-["test_ModelHubProvider.js"]
-skip-if = [
-  "appname == 'thunderbird'", # Disabled in extensions.manifest
-  "os == 'android'", # ModelHubProvider.sys.mjs is not included on Android
-]
-
 ["test_moved_extension_metadata.js"]
 skip-if = ["true"] # bug 1777900
 
diff --git a/xpcom/tests/unit/xpcshell.toml b/xpcom/tests/unit/xpcshell.toml
index 1993247a5530..f5d8e6e3fd4f 100644
--- a/xpcom/tests/unit/xpcshell.toml
+++ b/xpcom/tests/unit/xpcshell.toml
@@ -37,6 +37,11 @@ fail-if = ["os == 'android'"]
 
 ["test_debugger_malloc_size_of.js"]
 
+["test_error_iserror.js"]
+prefs = [
+  "javascript.options.experimental.error_iserror=true",
+]
+
 ["test_file_createUnique.js"]
 
 ["test_file_equality.js"]
@@ -114,8 +119,3 @@ run-if = ["os == 'win'"]
 
 ["test_windows_registry.js"]
 run-if = ["os == 'win'"]
-
-["test_error_iserror.js"]
-prefs = [
-  "javascript.options.experimental.error_iserror=true",
-]