--- a/b2g/components/test/unit/xpcshell.ini
+++ b/b2g/components/test/unit/xpcshell.ini
@@ -1,23 +1,21 @@
 [DEFAULT]
 head =
-tail =
 
 support-files =
   data/test_logger_file
 
 [test_bug793310.js]
 
 [test_bug832946.js]
 
 [test_fxaccounts.js]
 [test_signintowebsite.js]
 head = head_identity.js
-tail =
 
 # testing non gonk-specific stuff
 [test_logcapture.js]
 
 [test_logcapture_gonk.js]
 # can be slow because of what the test does, so let's give it some more time
 # to avoid intermittents: bug 1212395
 requesttimeoutfactor = 2

--- a/browser/components/downloads/test/unit/xpcshell.ini
+++ b/browser/components/downloads/test/unit/xpcshell.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 head = head.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_DownloadsCommon.js]

--- a/browser/components/extensions/test/xpcshell/xpcshell.ini
+++ b/browser/components/extensions/test/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 firefox-appdir = browser
 tags = webextensions
 
 [test_ext_bookmarks.js]
 [test_ext_browsingData_settings.js]
 [test_ext_history.js]
 [test_ext_manifest_commands.js]
 [test_ext_manifest_omnibox.js]

--- a/browser/components/feeds/test/unit/xpcshell.ini
+++ b/browser/components/feeds/test/unit/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 head = head_feeds.js
-tail = 
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_355473.js]
 [test_758990.js]

--- a/browser/components/migration/tests/unit/xpcshell.ini
+++ b/browser/components/migration/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_migration.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 support-files =
   Library/**
   AppData/**
 
 [test_automigration.js]
 [test_Chrome_cookies.js]

--- a/browser/components/newtab/tests/xpcshell/xpcshell.ini
+++ b/browser/components/newtab/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_AboutNewTabService.js]
 [test_NewTabPrefsProvider.js]
 [test_NewTabSearchProvider.js]
 [test_NewTabURL.js]
 [test_PlacesProvider.js]

--- a/browser/components/places/tests/unit/xpcshell.ini
+++ b/browser/components/places/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_bookmarks.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 support-files =
   bookmarks.glue.html
   bookmarks.glue.json
   corruptDB.sqlite
   distribution.ini
 

--- a/browser/components/sessionstore/test/unit/xpcshell.ini
+++ b/browser/components/sessionstore/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 support-files =
   data/sessionCheckpoints_all.json
   data/sessionstore_invalid.js
   data/sessionstore_valid.js
 
 [test_backup_once.js]

--- a/browser/components/shell/test/unit/xpcshell.ini
+++ b/browser/components/shell/test/unit/xpcshell.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 head = 
-tail = 
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_421977.js]

--- a/browser/components/syncedtabs/test/xpcshell/xpcshell.ini
+++ b/browser/components/syncedtabs/test/xpcshell/xpcshell.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
 head = head.js
-tail =
 firefox-appdir = browser
 
 [test_EventEmitter.js]
 [test_SyncedTabsDeckStore.js]
 [test_SyncedTabsListStore.js]
 [test_SyncedTabsDeckComponent.js]
 [test_TabListComponent.js]

--- a/browser/components/translation/test/unit/xpcshell.ini
+++ b/browser/components/translation/test/unit/xpcshell.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 head = 
-tail = 
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_cld2.js]

--- a/browser/experiments/test/xpcshell/xpcshell.ini
+++ b/browser/experiments/test/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 tags = addons
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 support-files =
   experiments_1.manifest
   experiment-1.xpi
   experiment-1a.xpi
   experiment-2.xpi

--- a/browser/extensions/formautofill/test/unit/xpcshell.ini
+++ b/browser/extensions/formautofill/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 firefox-appdir = browser
 head = head.js
-tail =
 support-files =
 
 [test_autofillFormFields.js]
 [test_collectFormFields.js]
 [test_markAsAutofillField.js]
 [test_populateFieldValues.js]
 [test_profileAutocompleteResult.js]
 [test_profileStorage.js]

--- a/browser/modules/test/unit/social/xpcshell.ini
+++ b/browser/modules/test/unit/social/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 support-files = blocklist.xml
 
 [test_social.js]
 [test_socialDisabledStartup.js]
 [test_SocialService.js]
 [test_SocialServiceMigration21.js]

--- a/browser/modules/test/xpcshell/xpcshell.ini
+++ b/browser/modules/test/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_AttributionCode.js]
 skip-if = os != 'win'
 [test_DirectoryLinksProvider.js]
 [test_SitePermissions.js]
 [test_LaterRun.js]

--- a/caps/tests/unit/xpcshell.ini
+++ b/caps/tests/unit/xpcshell.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
 head =
-tail =
 
 [test_origin.js]

--- a/chrome/test/unit/xpcshell.ini
+++ b/chrome/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_crtestutils.js
-tail =
 support-files = data/**
 
 [test_abi.js]
 [test_bug292789.js]
 [test_bug380398.js]
 [test_bug397073.js]
 [test_bug399707.js]
 [test_bug401153.js]

--- a/chrome/test/unit_ipc/xpcshell.ini
+++ b/chrome/test/unit_ipc/xpcshell.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
 head = 
-tail = 
 skip-if = toolkit == 'android'
 support-files =
   !/chrome/test/unit/data/**
   !/chrome/test/unit/test_resolve_uris.js
   !/chrome/test/unit/head_crtestutils.js
 
 [test_resolve_uris_ipc.js]

--- a/devtools/client/animationinspector/test/unit/xpcshell.ini
+++ b/devtools/client/animationinspector/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = devtools
 head =
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_findOptimalTimeInterval.js]
 [test_formatStopwatchTime.js]
 [test_getCssPropertyName.js]
 [test_timeScale.js]
 [test_timeScale_dimensions.js]

--- a/devtools/client/memory/test/unit/xpcshell.ini
+++ b/devtools/client/memory/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = devtools devtools-memory
 head = head.js ../../../framework/test/shared-redux-head.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_action_diffing_01.js]
 [test_action_diffing_02.js]
 [test_action_diffing_03.js]
 [test_action_diffing_04.js]
 [test_action_diffing_05.js]

--- a/devtools/client/performance/test/unit/xpcshell.ini
+++ b/devtools/client/performance/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = devtools
 head = head.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_frame-utils-01.js]
 [test_frame-utils-02.js]
 [test_marker-blueprint.js]
 [test_marker-utils.js]
 [test_profiler-categories.js]

--- a/devtools/client/responsive.html/test/unit/xpcshell.ini
+++ b/devtools/client/responsive.html/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = devtools
 head = head.js ../../../framework/test/shared-redux-head.js
-tail =
 firefox-appdir = browser
 
 [test_add_device.js]
 [test_add_device_type.js]
 [test_add_viewport.js]
 [test_change_display_pixel_ratio.js]
 [test_change_location.js]
 [test_change_network_throttling.js]

--- a/devtools/client/shared/redux/middleware/test/xpcshell.ini
+++ b/devtools/client/shared/redux/middleware/test/xpcshell.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
 tags = devtools
 head = head.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_middleware-task-01.js]
 [test_middleware-task-02.js]
 [test_middleware-task-03.js]

--- a/devtools/client/shared/test/unit/xpcshell.ini
+++ b/devtools/client/shared/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = devtools
 head =
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 support-files =
   ../helper_color_data.js
 
 [test_advanceValidate.js]
 [test_attribute-parsing-01.js]

--- a/devtools/client/sourceeditor/tern/tests/unit/xpcshell.ini
+++ b/devtools/client/sourceeditor/tern/tests/unit/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 tags = devtools
 head = head_tern.js
-tail =
 firefox-appdir = browser
 
 [test_autocompletion.js]
 [test_import_tern.js]

--- a/devtools/client/webconsole/net/test/unit/xpcshell.ini
+++ b/devtools/client/webconsole/net/test/unit/xpcshell.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
 tags = devtools
 head =
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_json-utils.js]
 [test_net-utils.js]

--- a/devtools/server/tests/unit/xpcshell.ini
+++ b/devtools/server/tests/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = devtools
 head = head_dbg.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 support-files =
   babel_and_browserify_script_with_source_map.js
   source-map-data/sourcemapped.coffee
   source-map-data/sourcemapped.map
   post_init_global_actors.js

--- a/devtools/shared/acorn/tests/unit/xpcshell.ini
+++ b/devtools/shared/acorn/tests/unit/xpcshell.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
 tags = devtools
 head = head_acorn.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_import_acorn.js]
 [test_same_ast.js]
 [test_lenient_parser.js]

--- a/devtools/shared/discovery/tests/unit/xpcshell.ini
+++ b/devtools/shared/discovery/tests/unit/xpcshell.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 tags = devtools
 head =
-tail =
 firefox-appdir = browser
 
 [test_discovery.js]

--- a/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
+++ b/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = devtools heapsnapshot devtools-memory
 head = head_heapsnapshot.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 support-files =
   Census.jsm
   dominator-tree-worker.js
   heap-snapshot-worker.js
   Match.jsm

--- a/devtools/shared/jsbeautify/tests/unit/xpcshell.ini
+++ b/devtools/shared/jsbeautify/tests/unit/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 tags = devtools
 head = head_jsbeautify.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test.js]

--- a/devtools/shared/performance/test/xpcshell.ini
+++ b/devtools/shared/performance/test/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 tags = devtools
 head = head.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_perf-utils-allocations-to-samples.js]

--- a/devtools/shared/platform/content/test/xpcshell.ini
+++ b/devtools/shared/platform/content/test/xpcshell.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 tags = devtools
 head =
-tail =
 firefox-appdir = browser
 
 [test_stack.js]

--- a/devtools/shared/pretty-fast/tests/unit/xpcshell.ini
+++ b/devtools/shared/pretty-fast/tests/unit/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 tags = devtools
 head = head_pretty-fast.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test.js]

--- a/devtools/shared/qrcode/tests/unit/xpcshell.ini
+++ b/devtools/shared/qrcode/tests/unit/xpcshell.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 tags = devtools
 head =
-tail =
 firefox-appdir = browser
 
 [test_encode.js]

--- a/devtools/shared/security/tests/unit/xpcshell.ini
+++ b/devtools/shared/security/tests/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = devtools
 head = head_dbg.js
-tail =
 firefox-appdir = browser
 
 support-files=
   testactors.js
 
 [test_encryption.js]
 [test_oob_cert_auth.js]
 skip-if = (toolkit == 'android' && !debug) # Bug 1141544: Re-enable when buildbot tests are gone

--- a/devtools/shared/sourcemap/tests/unit/xpcshell.ini
+++ b/devtools/shared/sourcemap/tests/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = devtools
 head = head_sourcemap.js
-tail =
 
 [test_util.js]
 [test_source_node.js]
 [test_source_map_generator.js]
 [test_source_map_consumer.js]
 [test_quick_sort.js]
 [test_dog_fooding.js]
 [test_binary_search.js]

--- a/devtools/shared/tests/unit/xpcshell.ini
+++ b/devtools/shared/tests/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = devtools
 head = head_devtools.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 support-files =
   exposeLoader.js
 
 [test_assert.js]
 [test_csslexer.js]
 [test_css-properties-db.js]

--- a/devtools/shared/transport/tests/unit/xpcshell.ini
+++ b/devtools/shared/transport/tests/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = devtools
 head = head_dbg.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 support-files =
   testactors.js
   testactors-no-bulk.js
 
 [test_bulk_error.js]

--- a/devtools/shared/webconsole/test/unit/xpcshell.ini
+++ b/devtools/shared/webconsole/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = devtools
 head =
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 support-files =
 
 [test_js_property_provider.js]
 [test_network_helper.js]
 [test_security-info-certificate.js]
 [test_security-info-parser.js]

--- a/docshell/test/unit/xpcshell.ini
+++ b/docshell/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_docshell.js
-tail = 
 
 [test_bug414201_jfif.js]
 [test_bug442584.js]
 [test_nsDefaultURIFixup.js]
 [test_nsDefaultURIFixup_search.js]
 skip-if = os == 'android'
 [test_nsDefaultURIFixup_info.js]
 skip-if = os == 'android'

--- a/docshell/test/unit_ipc/xpcshell.ini
+++ b/docshell/test/unit_ipc/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android'
 
 [test_pb_notification_ipc.js]
 # Bug 751575: Perma-fails with: command timed out: 1200 seconds without output
 skip-if = true

--- a/dom/base/test/unit/xpcshell.ini
+++ b/dom/base/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_utilities.js
-tail =
 support-files =
   1_original.xml
   1_result.xml
   2_original.xml
   2_result_1.xml
   2_result_2.xml
   2_result_3.xml
   2_result_4.xml

--- a/dom/base/test/unit_ipc/xpcshell.ini
+++ b/dom/base/test/unit_ipc/xpcshell.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android'
 support-files =
   !/dom/base/test/unit/test_bug553888.js
   !/dom/base/test/unit/test_xhr_document.js
 
 [test_bug553888_wrap.js]
 [test_xhr_document_ipc.js]

--- a/dom/cache/test/xpcshell/xpcshell.ini
+++ b/dom/cache/test/xpcshell/xpcshell.ini
@@ -1,15 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [DEFAULT]
 head = head.js
-tail =
 support-files =
   schema_15_profile.zip
 
 # dummy test entry to generate profile zip files
 [make_profile.js]
   skip-if = true
 
 [test_migration.js]

--- a/dom/encoding/test/unit/xpcshell.ini
+++ b/dom/encoding/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 
 [test_big5.js]
 [test_euc-jp.js]
 [test_euc-kr.js]
 [test_gbk.js]
 [test_iso-2022-jp.js]
 [test_misc.js]
 [test_shift_jis.js]

--- a/dom/json/test/unit/xpcshell.ini
+++ b/dom/json/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 support-files =
   decodeFromStream-01.json
   decodeFromStream-small.json
 
 [test_decode_long_input.js]
 [test_decodeFromStream.js]
 [test_encode.js]
 

--- a/dom/notification/test/unit/xpcshell.ini
+++ b/dom/notification/test/unit/xpcshell.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 head = common_test_notificationdb.js
-tail =
 skip-if = toolkit == 'android'
 
 [test_notificationdb.js]
 [test_notificationdb_bug1024090.js]

--- a/dom/plugins/test/unit/xpcshell.ini
+++ b/dom/plugins/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 skip-if = toolkit == 'android'
 head = head_plugins.js
-tail =
 tags = addons
 firefox-appdir = browser
 support-files =
   !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
 
 [test_allowed_types.js]
 skip-if = appname == "thunderbird"
 reason = plugins are disabled by default in Thunderbird

--- a/dom/presentation/tests/xpcshell/xpcshell.ini
+++ b/dom/presentation/tests/xpcshell/xpcshell.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
 head =
-tail =
 
 [test_multicast_dns_device_provider.js]
 [test_presentation_device_manager.js]
 [test_presentation_session_transport.js]
 [test_tcp_control_channel.js]
 [test_presentation_state_machine.js]

--- a/dom/promise/tests/unit/xpcshell.ini
+++ b/dom/promise/tests/unit/xpcshell.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
 head =
-tail =
 
 [test_monitor_uncaught.js]

--- a/dom/push/test/xpcshell/xpcshell.ini
+++ b/dom/push/test/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js head-http2.js
-tail =
 # Push notifications and alarms are currently disabled on Android.
 skip-if = toolkit == 'android'
 
 [test_clear_forgetAboutSite.js]
 [test_clear_origin_data.js]
 [test_crypto.js]
 [test_drop_expired.js]
 [test_handler_service.js]

--- a/dom/secureelement/tests/unit/xpcshell.ini
+++ b/dom/secureelement/tests/unit/xpcshell.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
 head = header_helper.js
-tail =
 
-[test_SEUtils.js]
\ No newline at end of file
+[test_SEUtils.js]

--- a/dom/security/test/unit/xpcshell.ini
+++ b/dom/security/test/unit/xpcshell.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 head =
-tail =
 
 [test_csp_reports.js]
 [test_isOriginPotentiallyTrustworthy.js]
 [test_csp_upgrade_insecure_request_header.js]

--- a/dom/settings/tests/unit/xpcshell.ini
+++ b/dom/settings/tests/unit/xpcshell.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
 head =
-tail =
 
 [test_settingsrequestmanager_messages.js]
 skip-if = (buildapp != 'b2g')

--- a/dom/system/gonk/tests/xpcshell.ini
+++ b/dom/system/gonk/tests/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = header_helpers.js
-tail =
 
 [test_ril_worker_buf.js]
 [test_ril_worker_icc_CardLock.js]
 [test_ril_worker_icc_CardState.js]
 [test_ril_worker_icc_BerTlvHelper.js]
 [test_ril_worker_icc_GsmPDUHelper.js]
 [test_ril_worker_icc_ICCContactHelper.js]
 [test_ril_worker_icc_ICCIOHelper.js]

--- a/dom/tests/unit/xpcshell.ini
+++ b/dom/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 
 [test_bug319968.js]
 [test_bug465752.js]
 [test_Fetch.js]
 [test_geolocation_provider.js]
 # Bug 684962: test hangs consistently on Android
 skip-if = os == "android"
 [test_geolocation_timeout.js]

--- a/dom/workers/test/xpcshell/xpcshell.ini
+++ b/dom/workers/test/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android'
 support-files =
   data/worker.js
   data/worker_fileReader.js
   data/chrome.manifest
 
 [test_workers.js]
 [test_fileReader.js]

--- a/extensions/cookie/test/unit/xpcshell.ini
+++ b/extensions/cookie/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_cookies.js
-tail =
 skip-if = toolkit == 'android'
 
 [test_bug526789.js]
 [test_bug650522.js]
 [test_bug667087.js]
 [test_cookies_async_failure.js]
 [test_cookies_persistence.js]
 skip-if = true # Bug 863738

--- a/extensions/cookie/test/unit_ipc/xpcshell.ini
+++ b/extensions/cookie/test/unit_ipc/xpcshell.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 head = 
-tail = 
 skip-if = toolkit == 'android'
 
 [test_child.js]
 [test_parent.js]

--- a/extensions/pref/autoconfig/test/unit/xpcshell.ini
+++ b/extensions/pref/autoconfig/test/unit/xpcshell.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android'
 support-files =
   autoconfig-latin1.cfg
   autoconfig-utf8.cfg
   autoconfig.js
 
 [test_autoconfig_nonascii.js]

--- a/extensions/spellcheck/hunspell/tests/unit/xpcshell.ini
+++ b/extensions/spellcheck/hunspell/tests/unit/xpcshell.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android'
 support-files = data/**
 
 [test_hunspell.js]

--- a/gfx/tests/unit/xpcshell.ini
+++ b/gfx/tests/unit/xpcshell.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
 head = 
-tail = 
 
 [test_nsIScriptableRegion.js]

--- a/image/test/unit/xpcshell.ini
+++ b/image/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 support-files =
   async_load_tests.js
   bug413512.ico
   bug815359.ico
   image1.png
   image1png16x16.jpg
   image1png64x64.jpg
   image2.jpg

--- a/intl/locale/tests/unit/xpcshell.ini
+++ b/intl/locale/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = 
-tail = 
 support-files =
   data/intl_on_workers_worker.js
   data/chrome.manifest
 
 [test_bug22310.js]
 skip-if = toolkit != "windows" && toolkit != "cocoa"
 
 [test_bug371611.js]

--- a/intl/strres/tests/unit/xpcshell.ini
+++ b/intl/strres/tests/unit/xpcshell.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
 head =
-tail =
 support-files =
   397093.properties
   strres.properties
 
 [test_bug378839.js]
 [test_bug397093.js]

--- a/intl/uconv/tests/unit/xpcshell.ini
+++ b/intl/uconv/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 support-files =
   CharsetConversionTests.js
   hangulTestStrings.js
   data/unicode-conversion.utf16.txt
   data/unicode-conversion.utf16be.txt
   data/unicode-conversion.utf16le.txt
   data/unicode-conversion.utf8.txt
 

--- a/intl/unicharutil/tests/unit/xpcshell.ini
+++ b/intl/unicharutil/tests/unit/xpcshell.ini
@@ -1,3 +1,2 @@
 [DEFAULT]
 head = 
-tail = 

--- a/ipc/testshell/tests/xpcshell.ini
+++ b/ipc/testshell/tests/xpcshell.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
 head = 
-tail = 
 skip-if = toolkit == 'android'
 
 [test_ipcshell.js]
 # Bug 676963: test fails consistently on Android
 fail-if = os == "android"
 [test_ipcshell_child.js]

--- a/js/ductwork/debugger/tests/xpcshell.ini
+++ b/js/ductwork/debugger/tests/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 head = head_dbg.js
-tail =
 skip-if = toolkit == 'android'
 
 [test_nativewrappers.js]
 # Bug 685068
 fail-if = os == "android"

--- a/js/xpconnect/tests/unit/xpcshell.ini
+++ b/js/xpconnect/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 support-files =
   CatRegistrationComponents.manifest
   bogus_element_type.jsm
   bogus_exports_type.jsm
   bug451678_subscript.js
   component-blob.js
   component-blob.manifest
   component-file.js

--- a/layout/style/test/xpcshell.ini
+++ b/layout/style/test/xpcshell.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
 head =
-tail =
 
 [test_csslexer.js]

--- a/layout/tools/layout-debug/tests/unit/xpcshell.ini
+++ b/layout/tools/layout-debug/tests/unit/xpcshell.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
 head = 
-tail = 
 
 [test_componentsRegistered.js]

--- a/modules/libjar/test/unit/xpcshell.ini
+++ b/modules/libjar/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android'
 support-files =
   data/empty
   data/test_bug333423.zip
   data/test_bug336691.zip
   data/test_bug370103.jar
   data/test_bug379841.zip
   data/test_bug589292.zip

--- a/modules/libjar/zipwriter/test/unit/xpcshell.ini
+++ b/modules/libjar/zipwriter/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_zipwriter.js
-tail =
 support-files =
   data/test_bug446708/thumbs/st14-1.tiff
   data/emptyfile.txt
   data/smallfile.txt
   data/test.png
   data/test.txt
   data/test.zip
   data/test_bug399727.html

--- a/modules/libmar/tests/unit/xpcshell.ini
+++ b/modules/libmar/tests/unit/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 head = head_libmar.js
-tail =
 support-files = data/**
 
 [test_create.js]
 [test_extract.js]
 [test_sign_verify.js]

--- a/modules/libpref/test/unit/xpcshell.ini
+++ b/modules/libpref/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_libPrefs.js
-tail =
 support-files =
   data/testPref.js
   extdata/testExt.js
 
 [test_warnings.js]
 [test_bug345529.js]
 [test_bug506224.js]
 [test_bug577950.js]

--- a/modules/libpref/test/unit_ipc/xpcshell.ini
+++ b/modules/libpref/test/unit_ipc/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = 
-tail = 
 skip-if = toolkit == 'android'
 
 [test_existing_prefs.js]
 [test_initial_prefs.js]
 [test_large_pref.js]
 [test_observed_prefs.js]
 [test_update_prefs.js]
 [test_user_default_prefs.js]

--- a/netwerk/cookie/test/unit/xpcshell.ini
+++ b/netwerk/cookie/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = 
-tail = 
 
 [test_bug643051.js]
 [test_bug1155169.js]
 [test_bug1267910.js]
 [test_bug1321912.js]
 [test_parser_0001.js]
 [test_parser_0019.js]
 [test_eviction.js]

--- a/netwerk/cookie/test/unit_ipc/xpcshell.ini
+++ b/netwerk/cookie/test/unit_ipc/xpcshell.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
 head = 
-tail = 
 skip-if = toolkit == 'android'
 support-files =
   !/netwerk/cookie/test/unit/test_parser_0001.js
   !/netwerk/cookie/test/unit/test_parser_0019.js
 
 [test_ipc_parser_0001.js]
 [test_ipc_parser_0019.js]

--- a/netwerk/test/httpserver/test/xpcshell.ini
+++ b/netwerk/test/httpserver/test/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_utils.js
-tail =
 support-files = data/** ../httpd.js
 
 [test_async_response_sending.js]
 [test_basic_functionality.js]
 [test_body_length.js]
 [test_byte_range.js]
 [test_cern_meta.js]
 [test_default_index_handler.js]

--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_channels.js head_cache.js head_cache2.js
-tail =
 support-files =
   CA.cert.der
   client_cert_chooser.js
   client_cert_chooser.manifest
   data/image.png
   data/system_root.lnk
   data/test_psl.txt
   data/test_readline1.txt

--- a/netwerk/test/unit_ipc/xpcshell.ini
+++ b/netwerk/test/unit_ipc/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_channels_clone.js head_cc.js
-tail =
 skip-if = toolkit == 'android'
 support-files =
   child_channel_id.js
   !/netwerk/test/unit/test_XHR_redirects.js
   !/netwerk/test/unit/test_bug248970_cookie.js
   !/netwerk/test/unit/test_bug528292.js
   !/netwerk/test/unit/test_cache_jar.js
   !/netwerk/test/unit/test_cacheflags.js

--- a/parser/xml/test/unit/xpcshell.ini
+++ b/parser/xml/test/unit/xpcshell.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
 head =
-tail =
 support-files = results.js
 
 [test_parser.js]
 [test_namespace_support.js]
 [test_xml_declaration.js]
 [test_sanitizer.js]

--- a/python/mozbuild/mozbuild/test/frontend/data/files-test-metadata/default/tests/xpcshell/xpcshell.ini
+++ b/python/mozbuild/mozbuild/test/frontend/data/files-test-metadata/default/tests/xpcshell/xpcshell.ini
@@ -1,1 +1,1 @@
-[test_default_mod.js]
\ No newline at end of file
+[test_default_mod.js]

--- a/python/mozbuild/mozbuild/test/frontend/data/files-test-metadata/tagged/tests/xpcshell.ini
+++ b/python/mozbuild/mozbuild/test/frontend/data/files-test-metadata/tagged/tests/xpcshell.ini
@@ -1,1 +1,1 @@
-[test_bar.js]
\ No newline at end of file
+[test_bar.js]

--- a/rdf/tests/unit/xpcshell.ini
+++ b/rdf/tests/unit/xpcshell.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
 head =
-tail =
 support-files = sample.rdf
 
 [test_rdfredirect.js]

--- a/security/manager/ssl/tests/unit/xpcshell.ini
+++ b/security/manager/ssl/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_psm.js
-tail =
 tags = psm
 support-files =
   bad_certs/**
   ocsp_certs/**
   test_baseline_requirements/**
   test_cert_eku/**
   test_cert_embedded_null/**
   test_cert_isBuiltInRoot_reload/**

--- a/services/cloudsync/tests/xpcshell/xpcshell.ini
+++ b/services/cloudsync/tests/xpcshell/xpcshell.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
 head = head.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 
 [test_module.js]
 [test_tabs.js]
 [test_bookmarks.js]
 [test_lazyload.js]

--- a/services/common/tests/unit/xpcshell.ini
+++ b/services/common/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_global.js head_helpers.js head_http.js
-tail =
 firefox-appdir = browser
 support-files =
   test_storage_adapter/**
   test_blocklist_signatures/**
 
 # Test load modules first so syntax failures are caught early.
 [test_load_modules.js]
 

--- a/services/crypto/component/tests/unit/xpcshell.ini
+++ b/services/crypto/component/tests/unit/xpcshell.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
 head = 
-tail = 
 firefox-appdir = browser
 
 [test_jpake.js]

--- a/services/crypto/tests/unit/xpcshell.ini
+++ b/services/crypto/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_helpers.js ../../../common/tests/unit/head_helpers.js
-tail =
 firefox-appdir = browser
 support-files =
   !/services/common/tests/unit/head_helpers.js
 
 [test_load_modules.js]
 
 [test_crypto_crypt.js]
 [test_crypto_deriveKey.js]

--- a/services/fxaccounts/tests/xpcshell/xpcshell.ini
+++ b/services/fxaccounts/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js ../../../common/tests/unit/head_helpers.js ../../../common/tests/unit/head_http.js
-tail =
 skip-if = (toolkit == 'android' || appname == 'thunderbird')
 support-files =
   !/services/common/tests/unit/head_helpers.js
   !/services/common/tests/unit/head_http.js
 
 [test_accounts.js]
 [test_accounts_device_registration.js]
 [test_client.js]

--- a/services/sync/tests/unit/xpcshell.ini
+++ b/services/sync/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_appinfo.js ../../../common/tests/unit/head_helpers.js head_helpers.js head_http_server.js head_errorhandler_common.js
-tail =
 firefox-appdir = browser
 support-files =
   addon1-search.xml
   bootstrap1-search.xml
   fake_login_manager.js
   missing-sourceuri.xml
   missing-xpi-search.xml
   places_v10_from_v11.sqlite

--- a/storage/test/unit/xpcshell.ini
+++ b/storage/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_storage.js
-tail =
 support-files =
   corruptDB.sqlite
   fakeDB.sqlite
   locale_collation.txt
   vacuumParticipant.js
   vacuumParticipant.manifest
 
 [test_bug-365166.js]

--- a/testing/modules/tests/xpcshell/xpcshell.ini
+++ b/testing/modules/tests/xpcshell/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_assert.js]
 [test_mockRegistrar.js]
 [test_structuredlog.js]

--- a/testing/xpcshell/example/unit/xpcshell.ini
+++ b/testing/xpcshell/example/unit/xpcshell.ini
@@ -1,15 +1,14 @@
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'gonk'
 support-files =
   subdir/file.txt
   file.txt
   import_module.jsm
   import_sub_module.jsm
   load_subscript.js
   location_load.js

--- a/toolkit/components/asyncshutdown/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/asyncshutdown/tests/xpcshell/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 head=head.js
-tail=
 skip-if = toolkit == 'android'
 
 [test_AsyncShutdown.js]
 [test_AsyncShutdown_leave_uncaught.js]
 [test_converters.js]

--- a/toolkit/components/autocomplete/tests/unit/xpcshell.ini
+++ b/toolkit/components/autocomplete/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_autocomplete.js
-tail = 
 
 [test_330578.js]
 [test_378079.js]
 [test_393191.js]
 [test_440866.js]
 [test_463023.js]
 [test_660156.js]
 [test_autocomplete_multiple.js]

--- a/toolkit/components/captivedetect/test/unit/xpcshell.ini
+++ b/toolkit/components/captivedetect/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_setprefs.js
-tail =
 
 [test_captive_portal_not_found.js]
 [test_captive_portal_not_found_404.js]
 [test_captive_portal_found.js]
 [test_captive_portal_found_303.js]
 [test_abort.js]
 [test_abort_during_user_login.js]
 [test_user_cancel.js]

--- a/toolkit/components/commandlines/test/unit/xpcshell.ini
+++ b/toolkit/components/commandlines/test/unit/xpcshell.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android'
 support-files =
   data/test_bug410156.desktop
   data/test_bug410156.url
 
 [test_classinfo.js]
 [test_bug666224.js]

--- a/toolkit/components/commandlines/test/unit_unix/xpcshell.ini
+++ b/toolkit/components/commandlines/test/unit_unix/xpcshell.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
 head = 
-tail = 
 skip-if = toolkit == 'android'
 support-files =
   !/toolkit/components/commandlines/test/unit/data/test_bug410156.desktop
   !/toolkit/components/commandlines/test/unit/data/test_bug410156.url
 
 [test_bug410156.js]

--- a/toolkit/components/commandlines/test/unit_win/xpcshell.ini
+++ b/toolkit/components/commandlines/test/unit_win/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 head = 
-tail =
 support-files =
   !/toolkit/components/commandlines/test/unit/data/test_bug410156.desktop
   !/toolkit/components/commandlines/test/unit/data/test_bug410156.url
 
 [test_bug410156.js]

--- a/toolkit/components/contentprefs/tests/unit/xpcshell.ini
+++ b/toolkit/components/contentprefs/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_contentPrefs.js
-tail =
 
 [test_bug248970.js]
 [test_bug503971.js]
 [test_bug679784.js]
 [test_contentPrefs.js]
 [test_contentPrefsCache.js]
 [test_getPrefAsync.js]
 [test_stringGroups.js]

--- a/toolkit/components/contentprefs/tests/unit_cps2/xpcshell.ini
+++ b/toolkit/components/contentprefs/tests/unit_cps2/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 skip-if = toolkit == 'android'
 support-files = AsyncRunner.jsm
 
 [test_service.js]
 [test_setGet.js]
 [test_getSubdomains.js]
 [test_remove.js]
 [test_removeByDomain.js]

--- a/toolkit/components/crashes/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/crashes/tests/xpcshell/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android'
 
 [test_crash_manager.js]
 [test_crash_service.js]
 [test_crash_store.js]

--- a/toolkit/components/crashmonitor/test/unit/xpcshell.ini
+++ b/toolkit/components/crashmonitor/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 skip-if = toolkit == 'android'
 
 [test_init.js]
 [test_valid_file.js]
 [test_invalid_file.js]
 [test_invalid_json.js]
 [test_missing_file.js]
 [test_register.js]

--- a/toolkit/components/ctypes/tests/unit/xpcshell.ini
+++ b/toolkit/components/ctypes/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 skip-if = toolkit == 'android'
 
 [test_errno.js]
 
 [test_finalizer.js]
 [test_finalizer_shouldfail.js]
 [test_finalizer_shouldaccept.js]
 [test_jsctypes.js]

--- a/toolkit/components/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/components/extensions/test/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 firefox-appdir = browser
 skip-if = appname == "thunderbird"
 support-files =
   data/** head_sync.js
 tags = webextensions
 
 [test_csp_custom_policies.js]
 [test_csp_validator.js]

--- a/toolkit/components/feeds/test/xpcshell.ini
+++ b/toolkit/components/feeds/test/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 skip-if = toolkit == 'android'
 support-files =
     xml/rfc4287/author_namespaces.xml
     xml/rfc4287/entry_link_IANA.xml
     xml/rfc4287/feed_author_email_2.xml
     xml/rfc4287/feed_logo.xml
     xml/rfc4287/entry_author.xml
     xml/rfc4287/entry_link_otherURI_alt.xml

--- a/toolkit/components/filepicker/test/unit/xpcshell.ini
+++ b/toolkit/components/filepicker/test/unit/xpcshell.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android'
 
 [test_filecomplete.js]
 skip-if = os != 'linux'

--- a/toolkit/components/filewatcher/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/filewatcher/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 skip-if = os != "win"
 
 [test_arguments.js]
 [test_no_error_callback.js]
 [test_remove_non_watched.js]
 [test_shared_callback.js]
 [test_watch_file_creation_single.js]
 [test_watch_file_deletion_single.js]

--- a/toolkit/components/formautofill/test/xpcshell/xpcshell.ini
+++ b/toolkit/components/formautofill/test/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = loader.js head.js
-tail =
 skip-if = toolkit == 'android'
 # The following files starting with ".." are installed in the current folder.
 # However, they cannot be referenced directly in the "head" directive above.
 support-files =
   ../head_common.js
   ../loader_common.js
 
 [test_infrastructure.js]

--- a/toolkit/components/jsdownloads/test/unit/xpcshell.ini
+++ b/toolkit/components/jsdownloads/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 skip-if = toolkit == 'android'
 
 # Note: The "tail.js" file is not defined in the "tail" key because it calls
 #       the "add_test_task" function, that does not work properly in tail files.
 support-files =
   common_test_Download.js
 
 [test_DownloadCore.js]

--- a/toolkit/components/lz4/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/lz4/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android'
 support-files =
   data/worker_lz4.js
   data/chrome.manifest
   data/compression.lz
 
 [test_lz4.js]
 [test_lz4_sync.js]

--- a/toolkit/components/mediasniffer/test/unit/xpcshell.ini
+++ b/toolkit/components/mediasniffer/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android'
 support-files =
   data/bug1079747.mp4
   data/detodos.mp3
   data/ff-inst.exe
   data/file.mkv
   data/file.webm
   data/fl10.mp2

--- a/toolkit/components/mozintl/test/xpcshell.ini
+++ b/toolkit/components/mozintl/test/xpcshell.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
 head =
-tail =
 
 [test_mozintl.js]

--- a/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 
 support-files =
   test_loader/module_test_loader.js
 
 [test_available_free_space.js]
 [test_compression.js]
 [test_constants.js]
 [test_creationDate.js]

--- a/toolkit/components/passwordmgr/test/unit/xpcshell.ini
+++ b/toolkit/components/passwordmgr/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 support-files = data/**
 
 # Test JSON file access and import from SQLite, not applicable to Android.
 [test_module_LoginImport.js]
 skip-if = os == "android"
 [test_module_LoginStore.js]
 skip-if = os == "android"
 [test_removeLegacySignonFiles.js]

--- a/toolkit/components/places/tests/bookmarks/xpcshell.ini
+++ b/toolkit/components/places/tests/bookmarks/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_bookmarks.js
-tail =
 skip-if = toolkit == 'android'
 
 [test_1016953-renaming-uncompressed.js]
 [test_1017502-bookmarks_foreign_count.js]
 [test_384228.js]
 [test_385829.js]
 [test_388695.js]
 [test_393498.js]

--- a/toolkit/components/places/tests/expiration/xpcshell.ini
+++ b/toolkit/components/places/tests/expiration/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_expiration.js
-tail = 
 skip-if = toolkit == 'android'
 
 [test_analyze_runs.js]
 # Bug 676989: test hangs consistently on Android
 skip-if = os == "android"
 [test_annos_expire_history.js]
 [test_annos_expire_never.js]
 [test_annos_expire_policy.js]

--- a/toolkit/components/places/tests/favicons/xpcshell.ini
+++ b/toolkit/components/places/tests/favicons/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_favicons.js
-tail =
 skip-if = toolkit == 'android'
 support-files =
   expected-favicon-big32.jpg.png
   expected-favicon-big4.jpg.png
   expected-favicon-big48.ico.png
   expected-favicon-big64.png.png
   expected-favicon-scale160x3.jpg.png
   expected-favicon-scale3x160.jpg.png

--- a/toolkit/components/places/tests/history/xpcshell.ini
+++ b/toolkit/components/places/tests/history/xpcshell.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
 head = head_history.js
-tail =
 
 [test_insert.js]
 [test_remove.js]
 [test_removeVisits.js]
 [test_removeVisitsByFilter.js]
 [test_updatePlaces_sameUri_titleChanged.js]

--- a/toolkit/components/places/tests/migration/xpcshell.ini
+++ b/toolkit/components/places/tests/migration/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_migration.js
-tail =
 
 support-files =
   places_v6.sqlite
   places_v10.sqlite
   places_v11.sqlite
   places_v17.sqlite
   places_v19.sqlite
   places_v21.sqlite

--- a/toolkit/components/places/tests/queries/xpcshell.ini
+++ b/toolkit/components/places/tests/queries/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_queries.js
-tail =
 skip-if = toolkit == 'android'
 
 [test_415716.js]
 [test_abstime-annotation-domain.js]
 [test_abstime-annotation-uri.js]
 [test_async.js]
 [test_containersQueries_sorting.js]
 [test_history_queries_tags_liveUpdate.js]

--- a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
+++ b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_autocomplete.js
-tail =
 skip-if = toolkit == 'android'
 support-files =
   data/engine-rel-searchform.xml
   data/engine-suggestions.xml
   !/toolkit/components/places/tests/favicons/favicon-normal16.png
 
 [test_416211.js]
 [test_416214.js]

--- a/toolkit/components/places/tests/unit/xpcshell.ini
+++ b/toolkit/components/places/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_bookmarks.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 support-files =
   bookmarks.corrupt.html
   bookmarks.json
   bookmarks.preplaces.html
   bookmarks_html_singleframe.html
   bug476292.sqlite

--- a/toolkit/components/promiseworker/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/promiseworker/tests/xpcshell/xpcshell.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
 head=
-tail=
 skip-if = toolkit == 'android'
 support-files=
   data/worker.js
   data/chrome.manifest
 
 [test_Promise.js]

--- a/toolkit/components/satchel/test/unit/xpcshell.ini
+++ b/toolkit/components/satchel/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_satchel.js
-tail =
 skip-if = toolkit == 'android'
 support-files =
   asyncformhistory_expire.sqlite
   formhistory_1000.sqlite
   formhistory_CORRUPT.sqlite
   formhistory_apitest.sqlite
   formhistory_autocomplete.sqlite
   formhistory_v3.sqlite

--- a/toolkit/components/search/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/search/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_search.js
-tail =
 firefox-appdir = browser
 skip-if = toolkit == 'android'
 support-files =
   data/chrome.manifest
   data/engine.xml
   data/engine2.xml
   data/engine-addon.xml
   data/engine-override.xml

--- a/toolkit/components/sqlite/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/sqlite/tests/xpcshell/xpcshell.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android' || (os == 'mac' && appname == 'thunderbird')
 support-files =
   data/worker_sqlite_shared.js
   data/worker_sqlite_internal.js
   data/chrome.manifest
 
 [test_sqlite_internal.js]

--- a/toolkit/components/startup/tests/unit/xpcshell.ini
+++ b/toolkit/components/startup/tests/unit/xpcshell.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
 head = head_startup.js
-tail =
 skip-if = toolkit == 'android'
 
 [test_startup_crash.js]

--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 firefox-appdir = browser
 # The *.xpi files are only needed for test_TelemetryEnvironment.js, but
 # xpcshell fails to install tests if we move them under the test entry.
 support-files =
   ../search/chrome.manifest
   ../search/searchTest.jar
   dictionary.xpi
   experiment.xpi

--- a/toolkit/components/terminator/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/terminator/tests/xpcshell/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 head=
-tail=
 
 [test_terminator_record.js]
 skip-if = debug # Disabled by bug 1242084, bug 1255484 will enable it again.
 [test_terminator_reload.js]
 skip-if = os == "android"

--- a/toolkit/components/thumbnails/test/xpcshell.ini
+++ b/toolkit/components/thumbnails/test/xpcshell.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
 head =
-tail =
 
 [test_thumbnails_interfaces.js]
 skip-if = os == 'android' # xpcom interface not packaged

--- a/toolkit/components/timermanager/tests/unit/xpcshell.ini
+++ b/toolkit/components/timermanager/tests/unit/xpcshell.ini
@@ -1,9 +1,8 @@
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [DEFAULT]
 head = 
-tail = 
 
 [consumerNotifications.js]

--- a/toolkit/components/url-classifier/tests/unit/xpcshell.ini
+++ b/toolkit/components/url-classifier/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_urlclassifier.js
-tail =
 skip-if = toolkit == 'android'
 support-files =
   data/digest1.chunk
   data/digest2.chunk
 
 [test_addsub.js]
 [test_bug1274685_unowned_list.js]
 [test_backoff.js]

--- a/toolkit/components/urlformatter/tests/unit/xpcshell.ini
+++ b/toolkit/components/urlformatter/tests/unit/xpcshell.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
 head = head_urlformatter.js
-tail = 
 skip-if = toolkit == 'android'
 
 [test_urlformatter.js]

--- a/toolkit/components/windowcreator/tests/unit/xpcshell.ini
+++ b/toolkit/components/windowcreator/tests/unit/xpcshell.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
 head = 
-tail = 
 
 [test_wwauthpromptfactory.js]
 [test_wwpromptfactory.js]

--- a/toolkit/content/tests/unit/xpcshell.ini
+++ b/toolkit/content/tests/unit/xpcshell.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
 head = 
-tail = 
 
 [test_contentAreaUtils.js]

--- a/toolkit/crashreporter/test/unit/xpcshell.ini
+++ b/toolkit/crashreporter/test/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_crashreporter.js
-tail =
 skip-if = toolkit == 'android'
 support-files =
   crasher_subprocess_head.js
   crasher_subprocess_tail.js
 
 [test_crash_moz_crash.js]
 [test_crash_purevirtual.js]
 [test_crash_after_js_oom_reported.js]

--- a/toolkit/crashreporter/test/unit_ipc/xpcshell.ini
+++ b/toolkit/crashreporter/test/unit_ipc/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 skip-if = toolkit == 'android'
 support-files =
   !/toolkit/crashreporter/test/unit/crasher_subprocess_head.js
   !/toolkit/crashreporter/test/unit/crasher_subprocess_tail.js
   !/toolkit/crashreporter/test/unit/head_crashreporter.js
 
 [test_content_annotation.js]
 [test_content_exception_time_annotation.js]

--- a/toolkit/forgetaboutsite/test/unit/xpcshell.ini
+++ b/toolkit/forgetaboutsite/test/unit/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 head = head_forgetaboutsite.js ../../../../dom/push/test/xpcshell/head.js
-tail =
 skip-if = toolkit == 'android'
 support-files =
   !/dom/push/test/xpcshell/head.js
 
 [test_removeDataFromDomain.js]

--- a/toolkit/identity/tests/unit/xpcshell.ini
+++ b/toolkit/identity/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_identity.js
-tail =
 skip-if = (appname != "b2g" || toolkit == 'gonk')
 support-files =
   data/idp_1/.well-known/browserid
   data/idp_invalid_1/.well-known/browserid
 
 # Test load modules first so syntax failures are caught early.
 [test_load_modules.js]
 [test_minimalidentity.js]

--- a/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
+++ b/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head.js
-tail =
 firefox-appdir = browser
 skip-if = os == 'android'
 subprocess = true
 support-files =
   data_text_file.txt
   data_test_script.py
 
 [test_subprocess.js]

--- a/toolkit/modules/tests/xpcshell/xpcshell.ini
+++ b/toolkit/modules/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head =
-tail =
 support-files =
   propertyLists/bug710259_propertyListBinary.plist
   propertyLists/bug710259_propertyListXML.plist
   chromeappsstore.sqlite
   zips/zen.zip
 
 [test_BinarySearch.js]
 skip-if = toolkit == 'android'

--- a/toolkit/mozapps/downloads/tests/unit/xpcshell.ini
+++ b/toolkit/mozapps/downloads/tests/unit/xpcshell.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
 head = head_downloads.js
-tail = 
 skip-if = toolkit == 'android'
 
 [test_DownloadPaths.js]
 [test_DownloadUtils.js]
 [test_lowMinutes.js]
 [test_syncedDownloadUtils.js]
 [test_unspecified_arguments.js]

--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -1,13 +1,12 @@
 [DEFAULT]
 skip-if = toolkit == 'android'
 tags = addons
 head = head_addons.js
-tail =
 firefox-appdir = browser
 dupe-manifest =
 support-files =
   data/**
   xpcshell-shared.ini
 
 [test_addon_path_service.js]
 [test_asyncBlocklistLoad.js]

--- a/toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini
+++ b/toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini
@@ -1,16 +1,15 @@
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [DEFAULT]
 tags = appupdate
 head = head_update.js
-tail =
 
 [canCheckForAndCanApplyUpdates.js]
 [urlConstruction.js]
 [updateManagerXML.js]
 [remoteUpdateXML.js]
 [downloadAndHashCheckMar.js]
 [cleanupDownloadingForOlderAppVersion.js]
 [cleanupDownloadingForDifferentChannel.js]

--- a/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
+++ b/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
@@ -4,17 +4,16 @@
 
 ; Tests that require the updater binary. These tests should never run on Android
 ; which doesn't use the updater binary as other applications do and are excluded
 ; from running the tests in the moz.build file.
 
 [DEFAULT]
 tags = appupdate
 head = head_update.js
-tail =
 
 [marSuccessComplete.js]
 skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
 reason = bug 1291985
 [marSuccessPartial.js]
 skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
 reason = bug 1291985
 [marFailurePartial.js]

--- a/toolkit/mozapps/update/tests/unit_service_updater/xpcshell.ini
+++ b/toolkit/mozapps/update/tests/unit_service_updater/xpcshell.ini
@@ -2,17 +2,16 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ; Tests that require the updater binary and the maintenance service.
 
 [DEFAULT]
 tags = appupdate
 head = head_update.js
-tail =
 
 [bootstrapSvc.js]
 skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
 reason = bug 1291985
 run-sequentially = Uses the Mozilla Maintenance Service.
 [marSuccessCompleteSvc.js]
 skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
 reason = bug 1291985

--- a/tools/profiler/tests/xpcshell.ini
+++ b/tools/profiler/tests/xpcshell.ini
@@ -1,18 +1,17 @@
 [DEFAULT]
 head = head_profiler.js
-tail =
 skip-if = toolkit == 'android'
 
 [test_start.js]
 skip-if = true
 [test_get_features.js]
 [test_shared_library.js]
 [test_run.js]
 skip-if = true
 [test_pause.js]
 [test_enterjit_osr.js]
 [test_enterjit_osr_disabling.js]
 skip-if = !debug
 [test_enterjit_osr_enabling.js]
 skip-if = !debug
-[test_asm.js]
\ No newline at end of file
+[test_asm.js]

--- a/uriloader/exthandler/tests/unit/xpcshell.ini
+++ b/uriloader/exthandler/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_handlerService.js
-tail =
 run-sequentially = Bug 912235 - Intermittent failures
 
 [test_getTypeFromExtension_ext_to_type_mapping.js]
 [test_getTypeFromExtension_with_empty_Content_Type.js]
 [test_badMIMEType.js]
 [test_handlerService.js]
 support-files = mailcap
 # Bug 676997: test consistently fails on Android

--- a/uriloader/exthandler/tests/unit_ipc/xpcshell.ini
+++ b/uriloader/exthandler/tests/unit_ipc/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 head = 
-tail = 
 
 [test_encoding.js]
 # Bug 676995: test hangs consistently on Android
 # Bug 907732: thunderbird still uses legacy downloads manager.
 skip-if = (os == "android" || buildapp == '../mail')

--- a/widget/tests/unit/xpcshell.ini
+++ b/widget/tests/unit/xpcshell.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 head = 
-tail = 
 
 [test_taskbar_jumplistitems.js]
 [test_macwebapputils.js]
 skip-if = os != "mac"

--- a/xpcom/tests/unit/xpcshell.ini
+++ b/xpcom/tests/unit/xpcshell.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 head = head_xpcom.js
-tail =
 support-files =
   bug725015.manifest
   compmgr_warnings.manifest
   data/**
   xpcomtest.xpt
   xpcomtest.manifest
 generated-files =
   xpcomtest.xpt