Bug 1546459 - remove subsuite=clipboard from manifests. r=ahal
authorJoel Maher <jmaher@mozilla.com>
Wed, 01 May 2019 08:16:44 +0000
changeset 530870 732976d3f555a01d9032ede89a28121502ee49e2
parent 530869 995c47d0986b486a6323ea87d32962ed634add41
child 530871 0e259884f052230b24601efc3cde3a5ef5d4e6ad
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal
bugs1546459
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1546459 - remove subsuite=clipboard from manifests. r=ahal remove subsuite=clipboard from manifests Differential Revision: https://phabricator.services.mozilla.com/D28521
browser/base/content/test/general/browser.ini
browser/base/content/test/pageActions/browser.ini
browser/base/content/test/tabs/browser.ini
browser/components/aboutconfig/test/browser/browser.ini
browser/components/customizableui/test/browser.ini
browser/components/places/tests/browser/browser.ini
browser/components/urlbar/tests/browser/browser.ini
browser/components/urlbar/tests/legacy/browser.ini
devtools/client/inspector/fonts/test/browser.ini
devtools/client/inspector/markup/test/browser.ini
devtools/client/inspector/rules/test/browser.ini
devtools/client/inspector/shared/test/browser.ini
devtools/client/inspector/test/browser.ini
devtools/client/jsonview/test/browser.ini
devtools/client/netmonitor/src/har/test/browser.ini
devtools/client/netmonitor/test/browser.ini
devtools/client/shared/webpack/shims/test/mochitest.ini
devtools/client/webconsole/test/mochitest/browser.ini
dom/base/test/chrome.ini
dom/base/test/mochitest.ini
dom/browser-element/mochitest/mochitest-oop.ini
dom/browser-element/mochitest/mochitest.ini
dom/events/test/mochitest.ini
dom/plugins/test/mochitest/mochitest.ini
dom/tests/mochitest/general/mochitest.ini
editor/libeditor/tests/browserscope/mochitest.ini
editor/libeditor/tests/mochitest.ini
taskcluster/ci/test/mochitest.yml
taskcluster/ci/test/test-sets.yml
taskcluster/taskgraph/try_option_syntax.py
testing/mochitest/tests/Harness_sanity/mochitest.ini
testing/mozbase/moztest/moztest/resolve.py
testing/mozharness/configs/android/android_common.py
testing/mozharness/configs/unittests/linux_unittest.py
testing/mozharness/configs/unittests/mac_unittest.py
testing/mozharness/configs/unittests/win_unittest.py
testing/mozharness/mozharness/mozilla/testing/errors.py
testing/mozharness/mozharness/mozilla/testing/per_test_base.py
testing/mozharness/mozharness/mozilla/testing/testbase.py
testing/mozharness/scripts/android_emulator_unittest.py
testing/mozharness/scripts/android_hardware_unittest.py
toolkit/components/aboutmemory/tests/chrome.ini
toolkit/components/passwordmgr/test/browser/browser.ini
toolkit/components/viewsource/test/browser/browser.ini
toolkit/content/tests/chrome/chrome.ini
tools/tryselect/try_presets.yml
widget/tests/chrome.ini
widget/tests/mochitest.ini
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -71,17 +71,17 @@ support-files =
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_backButtonFitts.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_beforeunload_duplicate_dialogs.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_blob-channelname.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug321000.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = true # browser_bug321000.js is disabled because newline handling is shaky (bug 592528)
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug356571.js]
 skip-if = (verify && !debug && (os == 'win'))
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug380960.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug386835.js]
@@ -135,35 +135,35 @@ skip-if = true # Bug 1478159
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug520538.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug521216.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug533232.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug537013.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = true # bug 1393813
 # skip-if = e10s # Bug 1134458 - Find bar doesn't work correctly in a detached tab
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug537474.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug555224.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug559991.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug563588.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug565575.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug567306.js]
-subsuite = clipboard
+tags = clipboard
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug1261299.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = toolkit != "cocoa" # Because of tests for supporting Service Menu of macOS, bug 1261299
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug1297539.js]
 skip-if = toolkit != "cocoa" # Because of tests for supporting pasting from Service Menu of macOS, bug 1297539
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug575561.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug575830.js]
@@ -235,29 +235,28 @@ uses-unsafe-cpows = true
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug1015721.js]
 skip-if = os == 'win' || (verify && debug && (os == 'linux'))
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_accesskeys.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_clipboard.js]
 uses-unsafe-cpows = true
-subsuite = clipboard
+tags = clipboard
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_clipboard_pastefile.js]
 skip-if = true # Disabled due to the clipboard not supporting real file types yet (bug 1288773)
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_contentAreaClick.js]
 skip-if = e10s # Clicks in content don't go through contentAreaClick with e10s.
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_contentAltClick.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_contextmenu.js]
-subsuite = clipboard
-tags = fullscreen
+tags = fullscreen clipboard
 skip-if = toolkit == "gtk3" || verify || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1531590
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_contextmenu_input.js]
 skip-if = toolkit == "gtk3" || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1533161
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_ctrlTab.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_datachoices_notification.js]
@@ -295,17 +294,17 @@ skip-if = e10s # Bug 863514 - no gesture
 [browser_invalid_uri_back_forward_manipulation.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_lastAccessedTab.js]
 skip-if = toolkit == "windows" # Disabled on Windows due to frequent failures (bug 969405)
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_menuButtonFitts.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_middleMouse_noJSPaste.js]
-subsuite = clipboard
+tags = clipboard
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_minimize.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_modifiedclick_inherit_principal.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_new_http_window_opened_from_file_tab.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_offlineQuotaNotification.js]
--- a/browser/base/content/test/pageActions/browser.ini
+++ b/browser/base/content/test/pageActions/browser.ini
@@ -6,16 +6,16 @@ support-files =
 support-files =
   page_action_menu_add_search_engine_one.html
   page_action_menu_add_search_engine_many.html
   page_action_menu_add_search_engine_same_names.html
   page_action_menu_add_search_engine_0.xml
   page_action_menu_add_search_engine_1.xml
   page_action_menu_add_search_engine_2.xml
 [browser_page_action_menu_clipboard.js]
-subsuite = clipboard
+tags = clipboard
 [browser_page_action_menu_share_mac.js]
 skip-if = os != "mac" # Mac only feature
 [browser_page_action_menu_share_win.js]
 support-files =
   browser_page_action_menu_share_win.html
 skip-if = os != "win" # Windows only feature
 [browser_page_action_menu.js]
--- a/browser/base/content/test/tabs/browser.ini
+++ b/browser/base/content/test/tabs/browser.ini
@@ -56,17 +56,17 @@ support-files = file_new_tab_page.html
 skip-if = !e10s # Pref and test only relevant for e10s.
 [browser_new_web_tab_in_file_process_pref.js]
 skip-if = !e10s # Pref and test only relevant for e10s.
 [browser_newwindow_tabstrip_overflow.js]
 [browser_open_newtab_start_observer_notification.js]
 [browser_opened_file_tab_navigated_to_web.js]
 [browser_overflowScroll.js]
 [browser_paste_event_at_middle_click_on_link.js]
-subsuite = clipboard
+tags = clipboard
 support-files = file_anchor_elements.html
 [browser_pinnedTabs_clickOpen.js]
 [browser_pinnedTabs_closeByKeyboard.js]
 [browser_pinnedTabs.js]
 [browser_positional_attributes.js]
 skip-if = (verify && (os == 'win' || os == 'mac'))
 [browser_preloadedBrowser_zoom.js]
 [browser_reload_deleted_file.js]
--- a/browser/components/aboutconfig/test/browser/browser.ini
+++ b/browser/components/aboutconfig/test/browser/browser.ini
@@ -1,14 +1,14 @@
 [DEFAULT]
 skip-if = debug || asan # Bug 1507747 and bug 1520398
 support-files =
   head.js
 
 [browser_accessibility.js]
 [browser_basic.js]
 [browser_clipboard.js]
-subsuite = clipboard
+tags = clipboard
 [browser_edit.js]
 [browser_locked.js]
 [browser_observe.js]
 [browser_search.js]
 [browser_warning.js]
--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@@ -52,32 +52,32 @@ skip-if = (verify && debug && (os == 'li
 [browser_941083_invalidate_wrapper_cache_createWidget.js]
 skip-if = verify
 [browser_942581_unregisterArea_keeps_placements.js]
 [browser_944887_destroyWidget_should_destroy_in_palette.js]
 [browser_945739_showInPrivateBrowsing_customize_mode.js]
 [browser_947914_button_addons.js]
 skip-if = os == "linux" # Intermittent failures
 [browser_947914_button_copy.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = os == "linux" # Intermittent failures on Linux
 [browser_947914_button_cut.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = os == "linux" # Intermittent failures on Linux
 [browser_947914_button_find.js]
 skip-if = os == "linux" # Intermittent failures
 [browser_947914_button_history.js]
 support-files = dummy_history_item.html
 skip-if = os == "linux" # Intermittent failures
 [browser_947914_button_newPrivateWindow.js]
 skip-if = os == "linux" # Intermittent failures
 [browser_947914_button_newWindow.js]
 skip-if = os == "linux" # Intermittent failures
 [browser_947914_button_paste.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = os == "linux" # Intermittent failures on Linux
 [browser_947914_button_print.js]
 skip-if = os == "linux" # Intermittent failures on Linux
 [browser_947914_button_zoomIn.js]
 skip-if = os == "linux" # Intermittent failures
 [browser_947914_button_zoomOut.js]
 skip-if = os == "linux" # Intermittent failures
 [browser_947914_button_zoomReset.js]
@@ -164,17 +164,17 @@ tags = fullscreen
 [browser_panelUINotifications_multiWindow.js]
 [browser_remove_customized_specials.js]
 [browser_reset_builtin_widget_currentArea.js]
 [browser_switch_to_customize_mode.js]
 [browser_synced_tabs_menu.js]
 [browser_backfwd_enabled_post_customize.js]
 [browser_check_tooltips_in_navbar.js]
 [browser_editcontrols_update.js]
-subsuite = clipboard
+tags = clipboard
 [browser_customization_context_menus.js]
 [browser_newtab_button_customizemode.js]
 [browser_open_from_popup.js]
 [browser_open_in_lazy_tab.js]
 [browser_PanelMultiView_focus.js]
 [browser_PanelMultiView_keyboard.js]
 [browser_reload_tab.js]
 [browser_sidebar_toggle.js]
--- a/browser/components/places/tests/browser/browser.ini
+++ b/browser/components/places/tests/browser/browser.ini
@@ -49,19 +49,19 @@ skip-if = (verify && debug && (os == 'wi
 [browser_bookmarksProperties.js]
 skip-if = (verify && debug && (os == 'win' || os == 'mac'))
 [browser_check_correct_controllers.js]
 [browser_click_bookmarks_on_toolbar.js]
 [browser_controller_onDrop_sidebar.js]
 [browser_controller_onDrop_tagFolder.js]
 [browser_controller_onDrop.js]
 [browser_copy_query_without_tree.js]
-subsuite = clipboard
+tags = clipboard
 [browser_cutting_bookmarks.js]
-subsuite = clipboard
+tags = clipboard
 [browser_drag_bookmarks_on_toolbar.js]
 [browser_enable_toolbar_sidebar.js]
 skip-if = (verify && debug && (os == 'mac' || os == 'linux'))
 [browser_forgetthissite_single.js]
 [browser_history_sidebar_search.js]
 [browser_library_commands.js]
 [browser_library_delete_bookmarks_in_tags.js]
 [browser_library_delete_tags.js]
@@ -77,22 +77,22 @@ skip-if = (verify && debug && (os == 'ma
 [browser_library_panel_leak.js]
 [browser_library_search.js]
 [browser_library_tree_leak.js]
 [browser_library_views_liveupdate.js]
 [browser_library_warnOnOpen.js]
 [browser_markPageAsFollowedLink.js]
 [browser_panelview_bookmarks_delete.js]
 [browser_paste_bookmarks.js]
-subsuite = clipboard
+tags = clipboard
 [browser_paste_into_tags.js]
 [browser_paste_resets_cut_highlights.js]
-subsuite = clipboard
+tags = clipboard
 [browser_remove_bookmarks.js]
-subsuite = clipboard
+tags = clipboard
 [browser_sidebar_open_bookmarks.js]
 [browser_sidebarpanels_click.js]
 skip-if = (os == "mac" && debug) # Bug 1467049
 [browser_sort_in_library.js]
 [browser_stayopenmenu.js]
 [browser_toolbar_drop_text.js]
 [browser_toolbar_library_open_recent.js]
 [browser_toolbar_overflow.js]
--- a/browser/components/urlbar/tests/browser/browser.ini
+++ b/browser/components/urlbar/tests/browser/browser.ini
@@ -57,27 +57,27 @@ support-files =
   print_postdata.sjs
   searchSuggestionEngine.xml
   searchSuggestionEngine.sjs
 [browser_locationBarCommand.js]
 [browser_locationBarExternalLoad.js]
 [browser_moz_action_link.js]
 [browser_new_tab_urlbar_reset.js]
 [browser_pasteAndGo.js]
-subsuite = clipboard
+tags = clipboard
 [browser_percent_encoded.js]
 [browser_populateAfterPushState.js]
 [browser_privateBrowsingWindowChange.js]
 [browser_raceWithTabs.js]
 skip-if = os == "linux" # Bug 1533807
 [browser_redirect_error.js]
 support-files = redirect_error.sjs
 [browser_remotetab.js]
 [browser_removeUnsafeProtocolsFromURLBarPaste.js]
-subsuite = clipboard
+tags = clipboard
 [browser_restoreEmptyInput.js]
 [browser_search_favicon.js]
 skip-if = true # Bug 1526222 - Doesn't currently work with QuantumBar
 [browser_searchTelemetry.js]
 support-files =
   searchSuggestionEngine.xml
   searchSuggestionEngine.sjs
 [browser_selectionKeyNavigation.js]
@@ -112,34 +112,34 @@ run-if = e10s
 [browser_urlbar_speculative_connect.js]
 support-files =
   searchSuggestionEngine2.xml
   searchSuggestionEngine.sjs
 [browser_urlbar_speculative_connect_not_with_client_cert.js]
 [browser_urlbar_whereToOpen.js]
 [browser_urlbarAboutHomeLoading.js]
 [browser_urlbarCopying.js]
-subsuite = clipboard
+tags = clipboard
 support-files =
   authenticate.sjs
 [browser_urlbarCutting.js]
 [browser_urlbarDecode.js]
 [browser_urlbarDelete.js]
 [browser_urlbarEnter.js]
 [browser_urlbarEnterAfterMouseOver.js]
 skip-if = os == "linux" # Bug 1073339 - Investigate autocomplete test unreliability on Linux/e10s
 [browser_urlbarFocusedCmdK.js]
 [browser_urlbarHashChangeProxyState.js]
 [browser_UrlbarInput_formatValue.js]
 [browser_UrlbarInput_hiddenFocus.js]
 [browser_UrlbarInput_overflow.js]
 [browser_UrlbarInput_overflow_resize.js]
 [browser_UrlbarInput_tooltip.js]
 [browser_UrlbarInput_trimURLs.js]
-subsuite = clipboard
+tags = clipboard
 [browser_UrlbarInput_unit.js]
 support-files = empty.xul
 [browser_UrlbarLoadRace.js]
 [browser_urlbarOneOffs_contextMenu.js]
 support-files =
   searchSuggestionEngine.xml
   searchSuggestionEngine.sjs
 [browser_urlbarOneOffs_searchSuggestions.js]
--- a/browser/components/urlbar/tests/legacy/browser.ini
+++ b/browser/components/urlbar/tests/legacy/browser.ini
@@ -9,17 +9,17 @@ support-files =
 # These tests are ones we are not porting to QuantumBar. The ones in the
 # section underneath this are ones that work in both QuantumBar and the legacy
 # address bar.
 
 # Not porting browser_switchtab_override_keynav.js/browser_switchtab_copy.js
 # to QuantumBar as we no longer have moz-action uris, so they aren't relevant
 # any more.
 [browser_switchtab_copy.js]
-subsuite = clipboard
+tags = clipboard
 [browser_switchtab_override_keynav.js]
 # Not porting browser_urlbarAddonIframe.js - we'll be implementing new
 # WebExtension APIs
 [browser_urlbarAddonIframe.js]
 support-files =
   ../browser/Panel.jsm
   ../browser/urlbarAddonIframe.html
   ../browser/urlbarAddonIframe.js
@@ -71,27 +71,27 @@ support-files =
   ../browser/print_postdata.sjs
 [../browser/browser_URLBarSetURI.js]
 skip-if = (os == "linux" || os == "mac") && debug # bug 970052, bug 970053
 [../browser/browser_locationBarCommand.js]
 [../browser/browser_locationBarExternalLoad.js]
 [../browser/browser_moz_action_link.js]
 [../browser/browser_new_tab_urlbar_reset.js]
 [../browser/browser_pasteAndGo.js]
-subsuite = clipboard
+tags = clipboard
 [../browser/browser_percent_encoded.js]
 [../browser/browser_populateAfterPushState.js]
 [../browser/browser_privateBrowsingWindowChange.js]
 [../browser/browser_raceWithTabs.js]
 skip-if = os == "linux" # Bug 1533807
 [../browser/browser_redirect_error.js]
 support-files = ../browser/redirect_error.sjs
 [../browser/browser_remotetab.js]
 [../browser/browser_removeUnsafeProtocolsFromURLBarPaste.js]
-subsuite = clipboard
+tags = clipboard
 [../browser/browser_search_favicon.js]
 [../browser/browser_searchTelemetry.js]
 support-files =
   ../browser/searchSuggestionEngine.xml
   ../browser/searchSuggestionEngine.sjs
 [../browser/browser_stop_pending.js]
 support-files =
   ../browser/slow-page.sjs
@@ -106,17 +106,17 @@ skip-if = true # Bug 1507755
 [../browser/browser_tabMatchesInAwesomebar_perwindowpb.js]
 skip-if = os == 'linux' # Bug 1104755
 [../browser/browser_tabMatchesInAwesomebar.js]
 support-files =
   ../browser/moz.png
 [../browser/browser_textruns.js]
 [../browser/browser_urlbarAboutHomeLoading.js]
 [../browser/browser_urlbarCopying.js]
-subsuite = clipboard
+tags = clipboard
 support-files =
   ../browser/authenticate.sjs
 [../browser/browser_urlbarCutting.js]
 [../browser/browser_urlbarDecode.js]
 [../browser/browser_urlbar_blanking.js]
 support-files =
   ../browser/file_blank_but_not_blank.html
 [../browser/browser_urlbar_content_opener.js]
--- a/devtools/client/inspector/fonts/test/browser.ini
+++ b/devtools/client/inspector/fonts/test/browser.ini
@@ -13,17 +13,17 @@ support-files =
   !/devtools/client/shared/test/shared-head.js
   !/devtools/client/shared/test/telemetry-test-helpers.js
   !/devtools/client/shared/test/test-actor.js
   !/devtools/client/shared/test/test-actor-registry.js
 
 [browser_fontinspector.js]
 [browser_fontinspector_copy-URL.js]
 skip-if = !e10s # too slow on !e10s, logging fully serialized actors (Bug 1446595)
-subsuite = clipboard
+tags = clipboard
 [browser_fontinspector_all-fonts.js]
 [browser_fontinspector_edit-previews.js]
 [browser_fontinspector_editor-font-size-conversion.js]
 [browser_fontinspector_editor-keywords.js]
 [browser_fontinspector_editor-letter-spacing-conversion.js]
 [browser_fontinspector_editor-values.js]
 [browser_fontinspector_expand-css-code.js]
 [browser_fontinspector_font-type-telemetry.js]
--- a/devtools/client/inspector/markup/test/browser.ini
+++ b/devtools/client/inspector/markup/test/browser.ini
@@ -100,19 +100,19 @@ skip-if = os == "mac" # Full keyboard na
 [browser_markup_anonymous_01.js]
 [browser_markup_anonymous_02.js]
 skip-if = (os == 'win' && processor == 'aarch64') # bug 1531584
 [browser_markup_anonymous_03.js]
 skip-if = (os == 'win' && processor == 'aarch64') # bug 1531584
 [browser_markup_anonymous_04.js]
 skip-if = (os == 'win' && processor == 'aarch64') # bug 1531584
 [browser_markup_copy_html.js]
-subsuite = clipboard
+tags = clipboard
 [browser_markup_copy_image_data.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) || (os == "win" && processor == "aarch64") # bug 1328915, disable linux32 debug devtools for timeouts, disabled on aarch64 due to 1531598
 [browser_markup_css_completion_style_attribute_01.js]
 [browser_markup_css_completion_style_attribute_02.js]
 [browser_markup_css_completion_style_attribute_03.js]
 [browser_markup_display_node_01.js]
 [browser_markup_display_node_02.js]
 [browser_markup_dragdrop_autoscroll_01.js]
 [browser_markup_dragdrop_autoscroll_02.js]
@@ -155,17 +155,17 @@ skip-if = true # Bug 1177550
 [browser_markup_flex_display_badge_telemetry.js]
 [browser_markup_grid_display_badge_01.js]
 [browser_markup_grid_display_badge_02.js]
 [browser_markup_grid_display_badge_telemetry.js]
 [browser_markup_links_01.js]
 [browser_markup_links_02.js]
 [browser_markup_links_03.js]
 [browser_markup_links_04.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) || (os == "win" && processor == "aarch64") # bug 1328915, disable linux32 debug devtools for timeouts, aarch64 due to 1531598
 [browser_markup_links_05.js]
 [browser_markup_links_06.js]
 [browser_markup_links_07.js]
 [browser_markup_load_01.js]
 skip-if = verify
 [browser_markup_html_edit_01.js]
 [browser_markup_html_edit_02.js]
@@ -194,17 +194,17 @@ skip-if = verify
 [browser_markup_screenshot_node_iframe.js]
 [browser_markup_screenshot_node_shadowdom.js]
 [browser_markup_scrollable_badge.js]
 [browser_markup_search_01.js]
 [browser_markup_shadowdom.js]
 [browser_markup_shadowdom_clickreveal.js]
 [browser_markup_shadowdom_clickreveal_scroll.js]
 [browser_markup_shadowdom_copy_paths.js]
-subsuite = clipboard
+tags = clipboard
 [browser_markup_shadowdom_delete.js]
 [browser_markup_shadowdom_dynamic.js]
 [browser_markup_shadowdom_hover.js]
 [browser_markup_shadowdom_marker_and_before_pseudos.js]
 [browser_markup_shadowdom_maxchildren.js]
 [browser_markup_shadowdom_mutations_shadow.js]
 [browser_markup_shadowdom_navigation.js]
 [browser_markup_shadowdom_nested_pick_inspect.js]
--- a/devtools/client/inspector/rules/test/browser.ini
+++ b/devtools/client/inspector/rules/test/browser.ini
@@ -104,17 +104,17 @@ skip-if = (verify && !debug && os == 'wi
 [browser_rules_completion-popup-hidden-after-navigation.js]
 [browser_rules_content_01.js]
 [browser_rules_content_02.js]
 [browser_rules_variables_01.js]
 [browser_rules_variables_02.js]
 skip-if = e10s && debug # Bug 1250058 - Docshell leak on debug e10s
 [browser_rules_variables_03-case-sensitive.js]
 [browser_rules_copy_styles.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_rules_cssom.js]
 [browser_rules_cubicbezier-appears-on-swatch-click.js]
 [browser_rules_cubicbezier-commit-on-ENTER.js]
 [browser_rules_cubicbezier-revert-on-ESC.js]
 [browser_rules_custom.js]
 [browser_rules_cycle-angle.js]
 [browser_rules_cycle-color.js]
@@ -250,21 +250,21 @@ skip-if = (os == "win" && debug) # bug 9
 [browser_rules_search-filter_04.js]
 [browser_rules_search-filter_05.js]
 [browser_rules_search-filter_06.js]
 [browser_rules_search-filter_07.js]
 [browser_rules_search-filter_08.js]
 [browser_rules_search-filter_09.js]
 [browser_rules_search-filter_10.js]
 [browser_rules_search-filter_context-menu.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_rules_search-filter_escape-keypress.js]
 [browser_rules_select-and-copy-styles.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_rules_selector-highlighter-on-navigate.js]
 [browser_rules_selector-highlighter_01.js]
 [browser_rules_selector-highlighter_02.js]
 [browser_rules_selector-highlighter_03.js]
 [browser_rules_selector-highlighter_04.js]
 [browser_rules_selector-highlighter_05.js]
 [browser_rules_selector_highlight.js]
--- a/devtools/client/inspector/shared/test/browser.ini
+++ b/devtools/client/inspector/shared/test/browser.ini
@@ -17,20 +17,20 @@ support-files =
   !/devtools/client/inspector/test/shared-head.js
   !/devtools/client/shared/test/shared-head.js
   !/devtools/client/shared/test/telemetry-test-helpers.js
   !/devtools/client/shared/test/test-actor.js
   !/devtools/client/shared/test/test-actor-registry.js
 
 [browser_styleinspector_context-menu-copy-color_01.js]
 [browser_styleinspector_context-menu-copy-color_02.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_styleinspector_context-menu-copy-urls.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_styleinspector_csslogic-content-stylesheets.js]
 skip-if = e10s && debug # Bug 1250058 (docshell leak when opening 2 toolboxes)
 [browser_styleinspector_output-parser.js]
 [browser_styleinspector_refresh_when_active.js]
 [browser_styleinspector_refresh_when_style_changes.js]
 [browser_styleinspector_tooltip-background-image.js]
 [browser_styleinspector_tooltip-closes-on-new-selection.js]
--- a/devtools/client/inspector/test/browser.ini
+++ b/devtools/client/inspector/test/browser.ini
@@ -93,17 +93,17 @@ skip-if = (os == 'win' && (debug||asan))
 [browser_inspector_highlighter-cssshape_06-translate.js]
 [browser_inspector_highlighter-cssshape_07.js]
 [browser_inspector_highlighter-cssshape_iframe_01.js]
 skip-if = (verify && debug)
 [browser_inspector_highlighter-csstransform_01.js]
 [browser_inspector_highlighter-csstransform_02.js]
 [browser_inspector_highlighter-embed.js]
 [browser_inspector_highlighter-eyedropper-clipboard.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_inspector_highlighter-eyedropper-csp.js]
 [browser_inspector_highlighter-eyedropper-events.js]
 skip-if = os == 'win' # bug 1413442
 [browser_inspector_highlighter-eyedropper-image.js]
 [browser_inspector_highlighter-eyedropper-label.js]
 [browser_inspector_highlighter-eyedropper-show-hide.js]
 [browser_inspector_highlighter-eyedropper-xul.js]
@@ -142,27 +142,27 @@ skip-if = (os == 'win' && !debug) # Bug 
 [browser_inspector_infobar_04.js]
 [browser_inspector_infobar_textnode.js]
 [browser_inspector_initialization.js]
 skip-if = (e10s && debug) # Bug 1250058 - Docshell leak on debug e10s
 [browser_inspector_inspect-object-element.js]
 [browser_inspector_inspect_node_contextmenu.js]
 [browser_inspector_invalidate.js]
 [browser_inspector_keyboard-shortcuts-copy-outerhtml.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_inspector_keyboard-shortcuts.js]
 [browser_inspector_menu-01-sensitivity.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) || (os == "win" && processor == "aarch64") # bug 1328915, disable linux32 debug devtools for timeouts, aarch64 due to 1531598
 [browser_inspector_menu-03-paste-items.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_inspector_menu-03-paste-items-svg.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_inspector_menu-04-use-in-console.js]
 [browser_inspector_menu-05-attribute-items.js]
 skip-if = (os == 'win' && processor == 'aarch64') # bug 1533492
 [browser_inspector_menu-06-other.js]
 [browser_inspector_navigation.js]
 [browser_inspector_navigate_to_errors.js]
 [browser_inspector_open_on_neterror.js]
@@ -184,17 +184,17 @@ skip-if = (os == 'win' && processor == '
 [browser_inspector_search-03.js]
 [browser_inspector_search-04.js]
 [browser_inspector_search-05.js]
 [browser_inspector_search-06.js]
 [browser_inspector_search-07.js]
 [browser_inspector_search-08.js]
 [browser_inspector_search-clear.js]
 [browser_inspector_search-filter_context-menu.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_inspector_search_keyboard_trap.js]
 [browser_inspector_search-label.js]
 [browser_inspector_search-reserved.js]
 [browser_inspector_search-selection.js]
 [browser_inspector_search-sidebar.js]
 [browser_inspector_search-suggests-ids-and-classes.js]
 [browser_inspector_select-docshell.js]
--- a/devtools/client/jsonview/test/browser.ini
+++ b/devtools/client/jsonview/test/browser.ini
@@ -25,23 +25,23 @@ support-files =
 
 [browser_json_refresh.js]
 [browser_jsonview_bug_1380828.js]
 [browser_jsonview_chunked_json.js]
 support-files =
   chunked_json.sjs
 [browser_jsonview_content_type.js]
 [browser_jsonview_copy_headers.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_jsonview_copy_json.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_jsonview_copy_rawdata.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_jsonview_csp_json.js]
 [browser_jsonview_empty_object.js]
 [browser_jsonview_encoding.js]
 [browser_jsonview_filter.js]
 [browser_jsonview_ignore_charset.js]
 [browser_jsonview_invalid_json.js]
 [browser_jsonview_manifest.js]
--- a/devtools/client/netmonitor/src/har/test/browser.ini
+++ b/devtools/client/netmonitor/src/har/test/browser.ini
@@ -1,11 +1,11 @@
 [DEFAULT]
-tags = devtools
-subsuite = clipboard
+tags = devtools clipboard
+subsuite = devtools
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 support-files =
   head.js
   html_har_import-test-page.html
   html_har_post-data-test-page.html
   sjs_cache-test-server.sjs
   sjs_cookies-test-server.sjs
   !/devtools/client/netmonitor/test/head.js
--- a/devtools/client/netmonitor/test/browser.ini
+++ b/devtools/client/netmonitor/test/browser.ini
@@ -94,36 +94,36 @@ skip-if = (verify && !debug && (os == 'l
 [browser_net_columns_time.js]
 [browser_net_complex-params.js]
 skip-if = (verify && !debug && (os == 'win'))
 [browser_net_content-type.js]
 skip-if = (verify && !debug && (os == 'mac'))
 [browser_net_brotli.js]
 [browser_net_curl-utils.js]
 [browser_net_copy_image_as_data_uri.js]
-subsuite = clipboard
+tags = clipboard
 [browser_net_copy_svg_image_as_data_uri.js]
-subsuite = clipboard
+tags = clipboard
 [browser_net_copy_url.js]
-subsuite = clipboard
+tags = clipboard
 [browser_net_propertiesview-copy.js]
-subsuite = clipboard
+tags = clipboard
 [browser_net_copy_params.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (verify && !debug && (os == 'mac')) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_net_copy_response.js]
-subsuite = clipboard
+tags = clipboard
 [browser_net_copy_headers.js]
-subsuite = clipboard
+tags = clipboard
 [browser_net_cookies_sorted.js]
 skip-if = (verify && debug && os == 'win')
 [browser_net_copy_as_curl.js]
-subsuite = clipboard
+tags = clipboard
 [browser_net_copy_as_fetch.js]
-subsuite = clipboard
+tags = clipboard
 [browser_net_use_as_fetch.js]
 [browser_net_cors_requests.js]
 [browser_net_cyrillic-01.js]
 [browser_net_cyrillic-02.js]
 [browser_net_frame.js]
 skip-if = (os == 'mac') || (os == 'win' && os_version == '10.0') # Bug 1479782
 [browser_net_header-docs.js]
 [browser_net_edit_resend_cancel.js]
--- a/devtools/client/shared/webpack/shims/test/mochitest.ini
+++ b/devtools/client/shared/webpack/shims/test/mochitest.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 support-files =
 
 [test_clipboard.html]
-subsuite = clipboard
+tags = clipboard
+subsuite = devtools
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
--- a/devtools/client/webconsole/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/test/mochitest/browser.ini
@@ -224,29 +224,29 @@ skip-if = (os == "win" && processor == "
 [browser_jsterm_hide_when_devtools_chrome_enabled_false.js]
 [browser_jsterm_history.js]
 [browser_jsterm_history_arrow_keys.js]
 [browser_jsterm_history_nav.js]
 [browser_jsterm_history_persist.js]
 [browser_jsterm_inspect.js]
 [browser_jsterm_instance_of.js]
 [browser_jsterm_middle_click_paste.js]
-subsuite = clipboard
+tags = clipboard
 [browser_jsterm_multiline.js]
 [browser_jsterm_no_input_and_tab_key_pressed.js]
 skip-if = (os == "win" && processor == "aarch64") # disabled on aarch64 due to 1531573
 [browser_jsterm_null_undefined.js]
 [browser_jsterm_popup_close_on_tab_switch.js]
 [browser_jsterm_screenshot_command_clipboard.js]
-subsuite = clipboard
+tags = clipboard
 [browser_jsterm_screenshot_command_user.js]
-subsuite = clipboard
+tags = clipboard
 [browser_jsterm_screenshot_command_file.js]
 [browser_jsterm_selfxss.js]
-subsuite = clipboard
+tags = clipboard
 [browser_jsterm_syntax_highlight_output.js]
 skip-if = (os == "win" && processor == "aarch64") # disabled on aarch64 due to 1531574
 [browser_webconsole_allow_mixedcontent_securityerrors.js]
 tags = mcb
 [browser_webconsole_batching.js]
 [browser_webconsole_block_mixedcontent_securityerrors.js]
 tags = mcb
 [browser_webconsole_cached_messages.js]
@@ -267,27 +267,27 @@ skip-if = true # Bug 1405250
 [browser_webconsole_console_group.js]
 [browser_webconsole_console_logging_workers_api.js]
 skip-if = e10s # SharedWorkers console events are not received on the current process because they could run on any process.
 [browser_webconsole_console_table.js]
 [browser_webconsole_console_timeStamp.js]
 [browser_webconsole_console_trace_distinct.js]
 [browser_webconsole_console_trace_duplicates.js]
 [browser_webconsole_context_menu_export_console_output_clipboard.js]
-subsuite = clipboard
+tags = clipboard
 [browser_webconsole_context_menu_copy_entire_message.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 [browser_webconsole_context_menu_copy_link_location.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'linux' && bits == 32 && debug) || (os == 'linux') # bug 1328915, disable linux32 debug devtools for timeouts, bug 1473120
 [browser_webconsole_context_menu_copy_message_with_framework_stacktrace.js]
-subsuite = clipboard
+tags = clipboard
 [browser_webconsole_context_menu_copy_object.js]
-subsuite = clipboard
+tags = clipboard
 [browser_webconsole_context_menu_object_in_sidebar.js]
 [browser_webconsole_context_menu_open_url.js]
 [browser_webconsole_context_menu_store_as_global.js]
 [browser_webconsole_cors_errors.js]
 [browser_webconsole_csp_ignore_reflected_xss_message.js]
 [browser_webconsole_csp_violation.js]
 [browser_webconsole_cspro.js]
 [browser_webconsole_document_focus.js]
@@ -355,19 +355,19 @@ skip-if = true  # Bug 1438979
 [browser_webconsole_object_inspector_key_sorting.js]
 [browser_webconsole_object_inspector_local_session_storage.js]
 [browser_webconsole_object_inspector_selected_text.js]
 [browser_webconsole_object_inspector_scroll.js]
 [browser_webconsole_object_inspector_while_debugging_and_inspecting.js]
 [browser_webconsole_observer_notifications.js]
 [browser_webconsole_optimized_out_vars.js]
 [browser_webconsole_output_copy.js]
-subsuite = clipboard
+tags = clipboard
 [browser_webconsole_output_copy_newlines.js]
-subsuite = clipboard
+tags = clipboard
 [browser_webconsole_output_order.js]
 [browser_webconsole_persist.js]
 [browser_webconsole_primitive_stacktrace.js]
 [browser_webconsole_reopen_closed_tab.js]
 [browser_webconsole_repeat_different_objects.js]
 [browser_webconsole_reverse_search.js]
 [browser_webconsole_reverse_search_initial_value.js]
 [browser_webconsole_reverse_search_keyboard_navigation.js]
--- a/dom/base/test/chrome.ini
+++ b/dom/base/test/chrome.ini
@@ -20,17 +20,17 @@ support-files =
 [test_blockParsing.html]
 [test_blocking_image.html]
 [test_bug419527.xhtml]
 [test_bug945152.html]
 [test_bug1008126.html]
 [test_bug1016960.html]
 [test_anchor_target_blank_referrer.html]
 [test_copypaste.xul]
-subsuite = clipboard
+tags = clipboard
 [test_domrequesthelper.xul]
 [test_fragment_sanitization.xul]
 [test_messagemanager_principal.html]
 [test_messagemanager_send_principal.html]
 [test_mozbrowser_apis_allowed.html]
 [test_navigator_resolve_identity_xrays.xul]
 support-files = file_navigator_resolve_identity_xrays.xul
 [test_sandboxed_blob_uri.html]
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -276,20 +276,21 @@ skip-if = (os == "win" && processor == "
 tags = audiochannel
 skip-if = (os == "win" && processor == "aarch64") # bug 1535775
 [test_base.xhtml]
 [test_bug5141.html]
 [test_bug28293.html]
 [test_bug28293.xhtml]
 [test_bug51034.html]
 [test_bug116083.html]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless # fails in clipboard mode
 [test_bug166235.html]
-subsuite = clipboard
-skip-if = toolkit == 'android'
+tags = clipboard
+skip-if = toolkit == 'android' || headless # headless != clipboard
 [test_bug199959.html]
 [test_bug218236.html]
 [test_bug218277.html]
 [test_bug238409.html]
 [test_bug254337.html]
 [test_bug270145.xhtml]
 [test_bug276037-1.html]
 [test_bug276037-2.xhtml]
@@ -628,24 +629,24 @@ skip-if = toolkit == 'android' # Timeout
 [test_change_policy.html]
 [test_clearTimeoutIntervalNoArg.html]
 [test_constructor-assignment.html]
 [test_constructor.html]
 [test_content_iterator_post_order.html]
 [test_content_iterator_pre_order.html]
 [test_content_iterator_subtree.html]
 [test_copyimage.html]
-subsuite = clipboard
-skip-if = toolkit == 'android' #bug 904183
+tags = clipboard
+skip-if = toolkit == 'android' || headless #bug 904183
 [test_copypaste.html]
-subsuite = clipboard
-skip-if = toolkit == 'android' #bug 904183
+tags = clipboard
+skip-if = toolkit == 'android' || headless #bug 904183
 [test_copypaste.xhtml]
-subsuite = clipboard
-skip-if = toolkit == 'android' && !e10s #bug 904183
+tags = clipboard
+skip-if = (toolkit == 'android' && !e10s) || headless  #bug 904183
 [test_createHTMLDocument.html]
 [test_data_uri.html]
 skip-if = verify
 [test_document.all_iteration.html]
 [test_document.all_unqualified.html]
 [test_document_constructor.html]
 [test_document_importNode_document.html]
 [test_custom_element.html]
--- a/dom/browser-element/mochitest/mochitest-oop.ini
+++ b/dom/browser-element/mochitest/mochitest-oop.ini
@@ -12,17 +12,17 @@ support-files =
 [test_browserElement_oop_AlertInFrame.html]
 [test_browserElement_oop_Auth.html]
 [test_browserElement_oop_BackForward.html]
 disabled = Disabling some OOP tests for WebIDL scope changes (bug 1310706 for re-enabling)
 [test_browserElement_oop_BrowserWindowResize.html]
 [test_browserElement_oop_Close.html]
 [test_browserElement_oop_CookiesNotThirdParty.html]
 [test_browserElement_oop_CopyPaste.html]
-subsuite = clipboard
+tags = clipboard
 [test_browserElement_oop_DataURI.html]
 [test_browserElement_oop_DocumentFirstPaint.html]
 disabled = Disabling some OOP tests for WebIDL scope changes (bug 1310706 for re-enabling)
 [test_browserElement_oop_ErrorSecurity.html]
 [test_browserElement_oop_FirstPaint.html]
 [test_browserElement_oop_ForwardName.html]
 [test_browserElement_oop_FrameWrongURI.html]
 [test_browserElement_oop_Iconchange.html]
--- a/dom/browser-element/mochitest/mochitest.ini
+++ b/dom/browser-element/mochitest/mochitest.ini
@@ -100,17 +100,17 @@ support-files =
 [test_browserElement_inproc_Auth.html]
 [test_browserElement_inproc_BrowserWindowNamespace.html]
 [test_browserElement_inproc_BrowserWindowResize.html]
 [test_browserElement_inproc_Close.html]
 [test_browserElement_inproc_CloseFromOpener.html]
 [test_browserElement_inproc_ContextmenuEvents.html]
 [test_browserElement_inproc_CookiesNotThirdParty.html]
 [test_browserElement_inproc_CopyPaste.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == "android" && !e10s) # Disabled on Android, see bug 1230421
 [test_browserElement_inproc_DataURI.html]
 [test_browserElement_inproc_ExposableURI.html]
 [test_browserElement_inproc_FirstPaint.html]
 [test_browserElement_inproc_ForwardName.html]
 [test_browserElement_inproc_FrameWrongURI.html]
 [test_browserElement_inproc_Iconchange.html]
 [test_browserElement_inproc_LoadEvents.html]
--- a/dom/events/test/mochitest.ini
+++ b/dom/events/test/mochitest.ini
@@ -143,17 +143,18 @@ support-files = bug1017086_inner.html
 support-files = bug1017086_inner.html
 [test_bug1079236.html]
 [test_bug1127588.html]
 [test_bug1145910.html]
 [test_bug1150308.html]
 [test_bug1248459.html]
 [test_bug1264380.html]
 [test_bug1327798.html]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless
 [test_bug1514940.html]
 skip-if = !debug
 [test_click_on_reframed_generated_text.html]
 [test_click_on_restyled_element.html]
 [test_clickevent_on_input.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_continuous_wheel_events.html]
 skip-if = (verify && debug && (os == 'linux' || os == 'win'))
--- a/dom/plugins/test/mochitest/mochitest.ini
+++ b/dom/plugins/test/mochitest/mochitest.ini
@@ -1,10 +1,11 @@
 [DEFAULT]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless # crash on shutdown, no other failures
 support-files =
   307-xo-redirect.sjs
   crashing_subpage.html
   1028200-subpageA.html
   1028200-subpageA1.html
   1028200-subpageB.html
   1028200-subpageB1.html
   1028200-subpageC.html
@@ -53,17 +54,17 @@ skip-if = !crashreporter
 skip-if = toolkit == 'android' # needs plugin support
 [test_bug852315.html]
 [test_bug854082.html]
 [test_bug863792.html]
 [test_bug967694.html]
 [test_bug985859.html]
 [test_bug986930.html]
 [test_bug1092842.html]
-skip-if = (verify && (os == 'win'))
+skip-if = (verify && (os == 'win')) || (os == "win" && webrender) # win/webrender bug 1296400
 [test_bug1165981.html]
 skip-if = (processor == 'aarch64' && os == 'win') # aarch64 due to 1538785
 [test_bug1245545.html]
 [test_bug1307694.html]
 skip-if = verify || (processor == 'aarch64' && os == 'win') # aarch64 due to 1541241
 [test_cocoa_focus.html]
 skip-if = toolkit != "cocoa" || e10s # Bug 1194534
 support-files = cocoa_focus.html
@@ -137,16 +138,17 @@ skip-if = e10s # Bug 1090576
 [test_secondPlugin.html]
 [test_src_url_change.html]
 [test_streamatclose.html]
 [test_streamNotify.html]
 [test_stringHandling.html]
 [test_visibility.html]
 skip-if = toolkit == "cocoa"
 [test_windowed_invalidate.html]
-skip-if = os != "win"
+skip-if = os != "win" || webrender # win/webrender bug 1296400
 [test_windowless_flash.html]
 skip-if = !(os == "win" && processor == "x86_64") || verify
 [test_windowless_ime.html]
 skip-if = os != "win" || (os == "win" && processor == "aarch64") # aarch64 due to 1536350
 [test_x11_error_crash.html]
 skip-if = !crashreporter || e10s || toolkit != "gtk3"
 [test_zero_opacity.html]
+skip-if = os == "win" && webrender # win/webrender bug 1296400
--- a/dom/tests/mochitest/general/mochitest.ini
+++ b/dom/tests/mochitest/general/mochitest.ini
@@ -68,30 +68,30 @@ skip-if = toolkit == 'android'
 [test_bug504220.html]
 [test_bug628069_1.html]
 [test_bug628069_2.html]
 [test_bug631440.html]
 [test_bug653364.html]
 [test_bug861217.html]
 [test_bug1012662_editor.html]
 skip-if = (toolkit == 'android') # Disabled on Android, see bug 1230231
-subsuite = clipboard
+tags = clipboard
 [test_bug1012662_noeditor.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = (toolkit == 'android') # Disabled on Android, see bug 1230231
 [test_bug1161721.html]
 [test_bug1170911.html]
-subsuite = clipboard
+tags = clipboard
 [test_bug1208217.html]
 [test_bug1313753.html]
 [test_bug1434273.html]
 [test_clientRects.html]
 [test_clipboard_disallowed.html]
 [test_clipboard_events.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = headless # bug 1403542
 [test_consoleAPI.html]
 [test_contentViewer_overrideDPPX.html]
 [test_CCW_optimization.html]
 [test_datatransfer_disallowed.html]
 [test_devicePixelRatio_with_zoom.html]
 [test_DOMMatrix.html]
 [test_domWindowUtils.html]
--- a/editor/libeditor/tests/browserscope/mochitest.ini
+++ b/editor/libeditor/tests/browserscope/mochitest.ini
@@ -48,12 +48,12 @@ support-files =
   lib/richtext/LICENSE
   lib/richtext/README.Mozilla
   lib/richtext/richtext/editable.html
   lib/richtext/richtext/richtext.html
   lib/richtext/richtext/js/range.js
   lib/richtext/currentStatus.js
 
 [test_richtext2.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == 'android') || (debug && os == 'linux' && bits == 32) # Bug 1202045
 [test_richtext.html]
 
--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@@ -37,88 +37,94 @@ support-files = test_bug332636.html^head
 [test_bug366682.html]
 skip-if = os == 'android'
 [test_bug372345.html]
 skip-if = toolkit == 'android'
 [test_bug404320.html]
 [test_bug408231.html]
 skip-if = toolkit == 'android'
 [test_bug410986.html]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless
 [test_bug414526.html]
 [test_bug417418.html]
 skip-if = android_version == '18' # bug 1147989
 [test_bug426246.html]
 [test_bug430392.html]
 [test_bug432225.html]
 skip-if = toolkit == 'android'
 [test_bug439808.html]
 [test_bug442186.html]
 [test_bug449243.html]
 [test_bug455992.html]
 [test_bug456244.html]
 [test_bug460740.html]
 [test_bug471319.html]
 [test_bug471722.html]
 [test_bug478725.html]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless
 [test_bug480647.html]
 [test_bug480972.html]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless
 [test_bug483651.html]
 [test_bug484181.html]
 skip-if = toolkit == 'android'
 [test_bug487524.html]
 [test_bug490879.html]
-subsuite = clipboard
-skip-if = toolkit == 'android' # bug 1299578
+tags = clipboard
+skip-if = toolkit == 'android' || headless # bug 1299578
 [test_bug502673.html]
 [test_bug514156.html]
 [test_bug520189.html]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless
 [test_bug525389.html]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless
 [test_bug537046.html]
 [test_bug549262.html]
 skip-if = toolkit == 'android'
 [test_bug550434.html]
 skip-if = android_version == '18' # bug 1147989
 [test_bug551704.html]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless
 [test_bug552782.html]
 [test_bug567213.html]
 [test_bug569988.html]
 skip-if = os == 'android'
 [test_bug570144.html]
 [test_bug578771.html]
 skip-if = android_version == '18' # bug 1147989
 [test_bug586662.html]
 skip-if = true # bug 1376382
 [test_bug587461.html]
 [test_bug590554.html]
 [test_bug592592.html]
 [test_bug596001.html]
-subsuite = clipboard
+tags = clipboard
 [test_bug596333.html]
 skip-if = toolkit == 'android'
 [test_bug596506.html]
 [test_bug597331.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = toolkit == 'android' && !e10s # Bug 718316
 [test_bug597784.html]
 [test_bug599322.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = toolkit == 'android' && !e10s
 [test_bug599983.html]
 [test_bug600570.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = toolkit == 'android' && !e10s # Bug 718316
 [test_bug602130.html]
 [test_bug603556.html]
-subsuite = clipboard
+tags = clipboard
 [test_bug604532.html]
 skip-if = toolkit == 'android'
 [test_bug607584.html]
 [test_bug611182.html]
 skip-if = toolkit == 'android'
 [test_bug612128.html]
 [test_bug612447.html]
 [test_bug620906.html]
@@ -132,26 +138,27 @@ skip-if = os == 'android'
 [test_bug636465.html]
 skip-if = os == 'android'
 [test_bug638596.html]
 [test_bug641466.html]
 [test_bug645914.html]
 [test_bug646194.html]
 [test_bug668599.html]
 [test_bug674770-1.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = toolkit == 'android' || verify
 [test_bug674770-2.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = toolkit == 'android'
 [test_bug674861.html]
 [test_bug676401.html]
 [test_bug677752.html]
 [test_bug681229.html]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless
 [test_bug686203.html]
 [test_bug692520.html]
 [test_bug697842.html]
 [test_bug725069.html]
 [test_bug735059.html]
 [test_bug738366.html]
 [test_bug740784.html]
 [test_bug742261.html]
@@ -160,32 +167,32 @@ subsuite = clipboard
 [test_bug767684.html]
 [test_bug772796.html]
 skip-if = toolkit == 'android' # bug 1309431
 [test_bug773262.html]
 [test_bug780035.html]
 [test_bug787432.html]
 [test_bug790475.html]
 [test_bug795418.html]
-subsuite = clipboard
+tags = clipboard
 [test_bug795418-2.html]
-subsuite = clipboard
+tags = clipboard
 [test_bug795418-3.html]
-subsuite = clipboard
+tags = clipboard
 [test_bug795418-4.html]
-subsuite = clipboard
+tags = clipboard
 [test_bug795418-5.html]
-subsuite = clipboard
+tags = clipboard
 [test_bug795418-6.html]
-subsuite = clipboard
+tags = clipboard
 [test_bug795785.html]
 skip-if = toolkit == 'android' && !is_fennec # Bug 1525959
 [test_bug796839.html]
 [test_bug830600.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = toolkit == 'android' && e10s
 [test_bug832025.html]
 [test_bug850043.html]
 [test_bug857487.html]
 [test_bug858918.html]
 [test_bug915962.html]
 [test_bug974309.html]
 skip-if = toolkit == 'android'
@@ -193,47 +200,49 @@ skip-if = toolkit == 'android'
 skip-if = os != "win"
 [test_bug966552.html]
 skip-if = os != "win"
 [test_bug998188.html]
 [test_bug1026397.html]
 [test_bug1053048.html]
 [test_bug1067255.html]
 [test_bug1068979.html]
-subsuite = clipboard
+tags = clipboard
 [test_bug1094000.html]
 [test_bug1100966.html]
 skip-if = os == 'android'
 [test_bug1102906.html]
 skip-if = os == 'android'
 [test_bug1109465.html]
 [test_bug1130651.html]
 [test_bug1140105.html]
 [test_bug1140617.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = toolkit == 'android' && !e10s # bug 1299578
 [test_bug1153237.html]
 [test_bug1154791.html]
 skip-if = os == 'android'
 [test_bug1162952.html]
 [test_bug1181130-1.html]
 [test_bug1181130-2.html]
 [test_bug1186799.html]
 [test_bug1230473.html]
 [test_bug1247483.html]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless
 [test_bug1248128.html]
 [test_bug1250010.html]
 [test_bug1257363.html]
 [test_bug1248185.html]
 [test_bug1258085.html]
 [test_bug1268736.html]
 [test_bug1270235.html]
 [test_bug1306532.html]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless
 [test_bug1310912.html]
 skip-if = toolkit == 'android' # bug 1315898
 [test_bug1314790.html]
 [test_bug1315065.html]
 [test_bug1316302.html]
 [test_bug1318312.html]
 [test_bug1328023.html]
 [test_bug1330796.html]
@@ -253,34 +262,34 @@ skip-if = toolkit == 'android' # bug 131
 [test_bug1425997.html]
 [test_bug1497480.html]
 skip-if = toolkit == 'android'
 
 [test_abs_positioner_appearance.html]
 [test_abs_positioner_positioning_elements.html]
 skip-if = os == 'android' # Bug 1525959
 [test_CF_HTML_clipboard.html]
-subsuite = clipboard
+tags = clipboard
 [test_composition_event_created_in_chrome.html]
 [test_contenteditable_focus.html]
 [test_documentCharacterSet.html]
 [test_dom_input_event_on_htmleditor.html]
 [test_dom_input_event_on_texteditor.html]
 [test_dragdrop.html]
 skip-if = os == 'android'
 [test_handle_new_lines.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = android_version == '24'
 [test_inline_style_cache.html]
 [test_inlineTableEditing.html]
 [test_insertParagraph_in_inline_editing_host.html]
 [test_keypress_untrusted_event.html]
 [test_middle_click_paste.html]
-subsuite = clipboard
-skip-if = android_version == '24'
+tags = clipboard
+skip-if = android_version == '24' || headless
 [test_nsIEditorMailSupport_insertAsCitedQuotation.html]
 [test_nsIHTMLEditor_getSelectedElement.html]
 [test_nsIHTMLEditor_removeInlineProperty.html]
 [test_nsIHTMLEditor_selectElement.html]
 [test_nsIHTMLEditor_setCaretAfterElement.html]
 [test_nsIHTMLObjectResizer_hideResizers.html]
 [test_nsIPlaintextEditor_insertLineBreak.html]
 [test_nsITableEditor_deleteTableCell.html]
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -199,44 +199,16 @@ mochitest-chrome:
                 android-em.*:
                     - --test-suite=mochitest-chrome
                 default: []
         chunked:
             by-test-platform:
                 android-em.*: false
                 default: true
 
-mochitest-clipboard:
-    description: "Mochitest clipboard run"
-    treeherder-symbol: M(cl)
-    loopback-video: true
-    tier:
-        by-test-platform:
-            windows10-aarch64.*: 2
-            default: default
-    instance-size: xlarge
-    max-run-time:
-        by-test-platform:
-            windows10-64-ccov/debug: 7200
-            macosx64-ccov/debug: 7200
-            default: 3600
-    e10s:
-        by-test-platform:
-            linux32/debug: both
-            default: true
-    mozharness:
-        mochitest-flavor: plain
-        extra-options:
-            by-test-platform:
-                android-em.*:
-                    # note that Android runs fewer suites than other platforms
-                    - --test-suite=mochitest-plain-clipboard
-                default:
-                    - --mochitest-suite=mochitest-plain-clipboard,mochitest-chrome-clipboard,mochitest-browser-chrome-clipboard
-
 mochitest-devtools-chrome:
     description: "Mochitest devtools-chrome run"
     suite:
         name: mochitest-devtools-chrome-chunked
     treeherder-symbol: M(dt)
     loopback-video: true
     tier:
         by-test-platform:
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -23,17 +23,16 @@ common-tests:
     - gtest
     - jittest
     - jsreftest
     - marionette
     - mochitest
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
-    - mochitest-clipboard
     - mochitest-devtools-chrome
     - mochitest-gpu
     - mochitest-media
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     - reftest
     - reftest-no-accel
     - telemetry-tests-client
@@ -230,17 +229,16 @@ windows-tests:
     - gtest
     - jittest
     - jsreftest
     - marionette
     - mochitest
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
-    - mochitest-clipboard
     - mochitest-devtools-chrome
     - mochitest-gpu
     - mochitest-media
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
     - reftest
@@ -256,17 +254,16 @@ windows-aarch64-tests:
     - gtest
     - jittest
     - jsreftest
     - marionette
     - mochitest
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
-    - mochitest-clipboard
     - mochitest-devtools-chrome
     - mochitest-gpu
     - mochitest-media
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
     - reftest
@@ -306,17 +303,16 @@ macosx64-tests:
     - gtest
     - jittest
     - jsreftest
     - marionette
     - mochitest
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
-    - mochitest-clipboard
     - mochitest-devtools-chrome
     - mochitest-devtools-webreplay
     - mochitest-gpu
     - mochitest-media
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     # - mochitest-webgl2-ext test timeouts
@@ -359,17 +355,16 @@ linux32-tests:
     - gtest
     - jittest
     - jsreftest
     - marionette
     - mochitest
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
-    - mochitest-clipboard
     - mochitest-gpu
     - mochitest-media
     - mochitest-webgl1-core
     - reftest
     - reftest-no-accel
     - web-platform-tests
     - web-platform-tests-reftests
     - web-platform-tests-wdspec
@@ -386,17 +381,16 @@ desktop-instrumentation:
     - browser-instrumentation
 
 android-common-tests:
     - crashtest
     - geckoview-junit
     - jsreftest
     - mochitest
     - mochitest-chrome
-    - mochitest-clipboard
     - mochitest-gpu
     - mochitest-media
     - reftest
     - test-verify
     - xpcshell
 
 android-opt-tests:
     # Robocop tests often fail on Debug builds
@@ -411,17 +405,16 @@ android-x86_64-opt-tests:
     - web-platform-tests
     - web-platform-tests-reftests
 
 android-x86_64-tests:
     - gtest
     - cppunit
     - jsreftest
     - marionette
-    - mochitest-clipboard
     - mochitest-gpu
     # various reftest (plain) failures; bug 1501582
     # - reftest
 
 android-x86-tests:
     - web-platform-tests
     - web-platform-tests-reftests
 
--- a/taskcluster/taskgraph/try_option_syntax.py
+++ b/taskcluster/taskgraph/try_option_syntax.py
@@ -82,18 +82,16 @@ UNITTEST_ALIASES = {
     'mochitest-e10s-browser-chrome': alias_prefix('mochitest-browser-chrome-e10s'),
     'mochitest-chrome': alias_contains('mochitest-chrome'),
     'mochitest-dt': alias_prefix('mochitest-devtools-chrome'),
     'mochitest-e10s-dt': alias_prefix('mochitest-devtools-chrome-e10s'),
     'mochitest-gl': alias_prefix('mochitest-webgl'),
     'mochitest-gl-e10s': alias_prefix('mochitest-webgl-e10s'),
     'mochitest-gpu': alias_prefix('mochitest-gpu'),
     'mochitest-gpu-e10s': alias_prefix('mochitest-gpu-e10s'),
-    'mochitest-clipboard': alias_prefix('mochitest-clipboard'),
-    'mochitest-clipboard-e10s': alias_prefix('mochitest-clipboard-e10s'),
     'mochitest-media': alias_prefix('mochitest-media'),
     'mochitest-media-e10s': alias_prefix('mochitest-media-e10s'),
     'mochitest-vg': alias_prefix('mochitest-valgrind'),
     'reftest': alias_matches(r'^(plain-)?reftest.*$'),
     'reftest-no-accel': alias_matches(r'^(plain-)?reftest-no-accel.*$'),
     'reftests': alias_matches(r'^(plain-)?reftest.*$'),
     'reftests-e10s': alias_matches(r'^(plain-)?reftest-e10s.*$'),
     'reftest-gpu': alias_matches(r'^(plain-)?reftest-gpu.*$'),
--- a/testing/mochitest/tests/Harness_sanity/mochitest.ini
+++ b/testing/mochitest/tests/Harness_sanity/mochitest.ini
@@ -28,17 +28,17 @@ support-files = SpecialPowersLoadChromeS
 [test_SpecialPowersLoadChromeScript_function.html]
 [test_SpecialPowersLoadPrivilegedScript.html]
 [test_bug649012.html]
 [test_sanity_cleanup.html]
 [test_sanity_cleanup2.html]
 [test_sanityEventUtils.html]
 skip-if = toolkit == 'android' || (verify && (os == 'win')) # bug 688052
 [test_sanitySimpletest.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = toolkit == 'android' && !e10s # bug 688052
 [test_sanity_manifest.html]
 skip-if = toolkit == 'android' # we use the old manifest style on android
 fail-if = true
 [test_sanity_manifest_pf.html]
 skip-if = toolkit == 'android' # we use the old manifest style on android
 fail-if = true
 [test_sanity_waitForCondition.html]
--- a/testing/mozbase/moztest/moztest/resolve.py
+++ b/testing/mozbase/moztest/moztest/resolve.py
@@ -82,43 +82,29 @@ TEST_SUITES = {
     },
     'mochitest-browser-chrome': {
         'aliases': ('bc', 'browser'),
         'mach_command': 'mochitest',
         'kwargs': {'flavor': 'browser-chrome', 'test_paths': None},
         'task_regex': ['mochitest-browser-chrome($|.*(-1|[^0-9])$)',
                        'test-verify($|.*(-1|[^0-9])$)'],
     },
-    'mochitest-browser-chrome-clipboard': {
-        'aliases': ('cl', 'clipboard',),
-        'mach_command': 'mochitest',
-        'kwargs': {'flavor': 'browser-chrome', 'subsuite': 'clipboard', 'test_paths': None},
-        'task_regex': ['mochitest-clipboard($|.*(-1|[^0-9])$)',
-                       'test-verify($|.*(-1|[^0-9])$)'],
-    },
     'mochitest-browser-chrome-screenshots': {
         'aliases': ('ss', 'screenshots-chrome'),
         'mach_command': 'mochitest',
         'kwargs': {'flavor': 'browser-chrome', 'subsuite': 'screenshots', 'test_paths': None},
         'task_regex': ['browser-screenshots($|.*(-1|[^0-9])$)'],
     },
     'mochitest-chrome': {
         'aliases': ('mc',),
         'mach_command': 'mochitest',
         'kwargs': {'flavor': 'chrome', 'test_paths': None, 'e10s': False},
         'task_regex': ['mochitest-chrome($|.*(-1|[^0-9])$)',
                        'test-verify($|.*(-1|[^0-9])$)'],
     },
-    'mochitest-chrome-clipboard': {
-        'aliases': ('cl', 'clipboard',),
-        'mach_command': 'mochitest',
-        'kwargs': {'flavor': 'chrome', 'subsuite': 'clipboard', 'test_paths': None, 'e10s': False},
-        'task_regex': ['mochitest-clipboard($|.*(-1|[^0-9])$)',
-                       'test-verify($|.*(-1|[^0-9])$)'],
-    },
     'mochitest-chrome-gpu': {
         'aliases': ('gpu',),
         'mach_command': 'mochitest',
         'kwargs': {'flavor': 'chrome', 'subsuite': 'gpu', 'test_paths': None, 'e10s': False},
         'task_regex': ['mochitest-gpu($|.*(-1|[^0-9])$)',
                        'test-verify($|.*(-1|[^0-9])$)'],
     },
     'mochitest-devtools-chrome': {
@@ -134,24 +120,17 @@ TEST_SUITES = {
         'kwargs': {'flavor': 'plain', 'subsuite': 'media', 'test_paths': None},
         'task_regex': ['mochitest-media($|.*(-1|[^0-9])$)',
                        'test-verify($|.*(-1|[^0-9])$)'],
     },
     'mochitest-plain': {
         'aliases': ('mp', 'plain',),
         'mach_command': 'mochitest',
         'kwargs': {'flavor': 'plain', 'test_paths': None},
-        'task_regex': ['mochitest(?!-a11y|-browser|-chrome|-clip|-devtools|-gpu|-harness|-media|-screen|-webgl)($|.*(-1|[^0-9])$)',  # noqa
-                       'test-verify($|.*(-1|[^0-9])$)'],
-    },
-    'mochitest-plain-clipboard': {
-        'aliases': ('cl', 'clipboard',),
-        'mach_command': 'mochitest',
-        'kwargs': {'flavor': 'plain', 'subsuite': 'clipboard', 'test_paths': None},
-        'task_regex': ['mochitest-clipboard($|.*(-1|[^0-9])$)',
+        'task_regex': ['mochitest(?!-a11y|-browser|-chrome|-devtools|-gpu|-harness|-media|-screen|-webgl)($|.*(-1|[^0-9])$)',  # noqa
                        'test-verify($|.*(-1|[^0-9])$)'],
     },
     'mochitest-plain-gpu': {
         'aliases': ('gpu',),
         'mach_command': 'mochitest',
         'kwargs': {'flavor': 'plain', 'subsuite': 'gpu', 'test_paths': None},
         'task_regex': ['mochitest-gpu($|.*(-1|[^0-9])$)',
                        'test-verify($|.*(-1|[^0-9])$)'],
@@ -245,23 +224,20 @@ for i in range(1, MOCHITEST_TOTAL_CHUNKS
     'python': 'python',
     'reftest': 'reftest',
     'steeplechase': '',
     'web-platform-tests': 'web-platform-tests',
     'xpcshell': 'xpcshell',
 }
 
 _test_subsuites = {
-    ('browser-chrome', 'clipboard'): 'mochitest-browser-chrome-clipboard',
     ('browser-chrome', 'devtools'): 'mochitest-devtools-chrome',
     ('browser-chrome', 'gpu'): 'mochitest-browser-chrome-gpu',
     ('browser-chrome', 'screenshots'): 'mochitest-browser-chrome-screenshots',
-    ('chrome', 'clipboard'): 'mochitest-chrome-clipboard',
     ('chrome', 'gpu'): 'mochitest-chrome-gpu',
-    ('mochitest', 'clipboard'): 'mochitest-plain-clipboard',
     ('mochitest', 'gpu'): 'mochitest-plain-gpu',
     ('mochitest', 'media'): 'mochitest-media',
     ('mochitest', 'robocop'): 'robocop',
     ('mochitest', 'webgl1-core'): 'mochitest-webgl1-core',
     ('mochitest', 'webgl1-ext'): 'mochitest-webgl1-ext',
     ('mochitest', 'webgl2-core'): 'mochitest-webgl2-core',
     ('mochitest', 'webgl2-ext'): 'mochitest-webgl2-ext',
     ('mochitest', 'webgl2-deqp'): 'mochitest-webgl2-deqp',
--- a/testing/mozharness/configs/android/android_common.py
+++ b/testing/mozharness/configs/android/android_common.py
@@ -127,38 +127,16 @@ config = {
                 "--log-raw-level=%(log_raw_level)s",
                 "--log-errorsummary=%(error_summary_file)s",
                 "--log-tbpl-level=%(log_tbpl_level)s",
                 "--screenshot-on-fail",
                 "--subsuite=gpu",
                 "--deviceSerial=%(device_serial)s",
             ],
         },
-        "mochitest-plain-clipboard": {
-            "run_filename": "runtestsremote.py",
-            "testsdir": "mochitest",
-            "options": [
-                "--app=%(app)s",
-                "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s",
-                "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s",
-                "--certificate-path=%(certs_path)s",
-                "--symbols-path=%(symbols_path)s",
-                "--quiet",
-                "--log-raw=%(raw_log_file)s",
-                "--log-raw-level=%(log_raw_level)s",
-                "--log-errorsummary=%(error_summary_file)s",
-                "--log-tbpl-level=%(log_tbpl_level)s",
-                "--screenshot-on-fail",
-                "--subsuite=clipboard",
-                "--deviceSerial=%(device_serial)s",
-            ],
-        },
         "mochitest-media": {
             "run_filename": "runtestsremote.py",
             "testsdir": "mochitest",
             "options": [
                 "--app=%(app)s",
                 "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s",
                 "--utility-path=%(utility_path)s",
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -152,26 +152,23 @@ config = {
     # local mochi suites
     "all_mochitest_suites": {
         "mochitest-valgrind-plain": ["--valgrind=/usr/bin/valgrind",
                            "--valgrind-supp-files=" + VALGRIND_SUPP_ARCH +
                                "," + VALGRIND_SUPP_CROSS_ARCH,
                            "--timeout=900", "--max-timeouts=50"],
         "mochitest-plain": [],
         "mochitest-plain-gpu": ["--subsuite=gpu"],
-        "mochitest-plain-clipboard": ["--subsuite=clipboard"],
         "mochitest-plain-chunked": ["--chunk-by-dir=4"],
         "mochitest-plain-chunked-coverage": ["--chunk-by-dir=4", "--timeout=1200"],
         "mochitest-media": ["--subsuite=media"],
         "mochitest-chrome": ["--flavor=chrome"],
         "mochitest-chrome-gpu": ["--flavor=chrome", "--subsuite=gpu", "--disable-e10s"],
-        "mochitest-chrome-clipboard": ["--flavor=chrome", "--subsuite=clipboard", "--disable-e10s"],
         "mochitest-chrome-chunked": ["--flavor=chrome", "--chunk-by-dir=4"],
         "mochitest-browser-chrome": ["--flavor=browser"],
-        "mochitest-browser-chrome-clipboard": ["--flavor=browser", "--subsuite=clipboard"],
         "mochitest-browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"],
         "mochitest-browser-chrome-coverage": ["--flavor=browser", "--chunk-by-runtime", "--timeout=1200"],
         "mochitest-browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"],
         "mochitest-browser-chrome-instrumentation": ["--flavor=browser"],
         "mochitest-webgl1-core": ["--subsuite=webgl1-core"],
         "mochitest-webgl1-ext": ["--subsuite=webgl1-ext"],
         "mochitest-webgl2-core": ["--subsuite=webgl2-core"],
         "mochitest-webgl2-ext": ["--subsuite=webgl2-ext"],
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -118,25 +118,22 @@ config = {
             ],
             "run_filename": "rungtests.py",
         },
     },
     # local mochi suites
     "all_mochitest_suites": {
         "mochitest-plain": [],
         "mochitest-plain-gpu": ["--subsuite=gpu"],
-        "mochitest-plain-clipboard": ["--subsuite=clipboard"],
         "mochitest-plain-chunked": ["--chunk-by-dir=4"],
         "mochitest-media": ["--subsuite=media"],
         "mochitest-chrome": ["--flavor=chrome"],
         "mochitest-chrome-gpu": ["--flavor=chrome", "--subsuite=gpu", "--disable-e10s"],
-        "mochitest-chrome-clipboard": ["--flavor=chrome", "--subsuite=clipboard", "--disable-e10s"],
         "mochitest-chrome-chunked": ["--flavor=chrome", "--chunk-by-dir=4"],
         "mochitest-browser-chrome": ["--flavor=browser"],
-        "mochitest-browser-chrome-clipboard": ["--flavor=browser", "--subsuite=clipboard"],
         "mochitest-browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"],
         "mochitest-browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"],
         "mochitest-browser-chrome-instrumentation": ["--flavor=browser"],
         "mochitest-webgl1-core": ["--subsuite=webgl1-core"],
         "mochitest-webgl1-ext": ["--subsuite=webgl1-ext"],
         "mochitest-webgl2-core": ["--subsuite=webgl2-core"],
         "mochitest-webgl2-ext": ["--subsuite=webgl2-ext"],
         "mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"],
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -141,25 +141,22 @@ config = {
             "run_filename": "rungtests.py",
         },
     },
     # local mochi suites
     "all_mochitest_suites":
     {
         "mochitest-plain": [],
         "mochitest-plain-gpu": ["--subsuite=gpu"],
-        "mochitest-plain-clipboard": ["--subsuite=clipboard"],
         "mochitest-plain-chunked": ["--chunk-by-dir=4"],
         "mochitest-media": ["--subsuite=media"],
         "mochitest-chrome": ["--flavor=chrome"],
         "mochitest-chrome-gpu": ["--flavor=chrome", "--subsuite=gpu", "--disable-e10s"],
-        "mochitest-chrome-clipboard": ["--flavor=chrome", "--subsuite=clipboard", "--disable-e10s"],
         "mochitest-chrome-chunked": ["--flavor=chrome", "--chunk-by-dir=4"],
         "mochitest-browser-chrome": ["--flavor=browser"],
-        "mochitest-browser-chrome-clipboard": ["--flavor=browser", "--subsuite=clipboard"],
         "mochitest-browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"],
         "mochitest-browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"],
         "mochitest-browser-chrome-instrumentation": ["--flavor=browser"],
         "mochitest-webgl1-core": ["--subsuite=webgl1-core"],
         "mochitest-webgl1-ext": ["--subsuite=webgl1-ext"],
         "mochitest-webgl2-core": ["--subsuite=webgl2-core"],
         "mochitest-webgl2-ext": ["--subsuite=webgl2-ext"],
         "mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"],
--- a/testing/mozharness/mozharness/mozilla/testing/errors.py
+++ b/testing/mozharness/mozharness/mozilla/testing/errors.py
@@ -29,17 +29,16 @@ TinderBoxPrintRe = {
     "mochitest-chrome_summary": _mochitest_summary,
     "mochitest-webgl1-core_summary": _mochitest_summary,
     "mochitest-webgl1-ext_summary": _mochitest_summary,
     "mochitest-webgl2-core_summary": _mochitest_summary,
     "mochitest-webgl2-ext_summary": _mochitest_summary,
     "mochitest-webgl2-deqp_summary": _mochitest_summary,
     "mochitest-media_summary": _mochitest_summary,
     "mochitest-plain_summary": _mochitest_summary,
-    "mochitest-plain-clipboard_summary": _mochitest_summary,
     "mochitest-plain-gpu_summary": _mochitest_summary,
     "marionette_summary": {
         'regex': re.compile(r'''(passed|failed|todo):\ +(\d+)'''),
         'pass_group': "passed",
         'fail_group': "failed",
         'known_fail_group': "todo",
     },
     "reftest_summary": {
--- a/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
+++ b/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
@@ -134,19 +134,16 @@ class SingleTestMixin(FetchesMixin):
                 continue
 
             self.info("Per-test run found test %s (%s/%s)" % (file, entry[0], entry[1]))
             subsuite_mapping = {
                 # Map (<suite>, <subsuite>): <full-suite>
                 #   <suite> is associated with a manifest, explicitly in code above
                 #   <subsuite> comes from "subsuite" tags in some manifest entries
                 #   <full-suite> is a unique id for the suite, matching desktop mozharness configs
-                ('mochitest-browser-chrome', 'clipboard'): 'mochitest-browser-chrome-clipboard',
-                ('mochitest-chrome', 'clipboard'): 'mochitest-chrome-clipboard',
-                ('mochitest-plain', 'clipboard'): 'mochitest-plain-clipboard',
                 ('mochitest-browser-chrome', 'devtools'): 'mochitest-devtools-chrome',
                 ('mochitest-browser-chrome', 'screenshots'): 'mochitest-browser-chrome-screenshots',  # noqa
                 ('mochitest-plain', 'media'): 'mochitest-media',
                 # below should be on test-verify-gpu job
                 ('mochitest-chrome', 'gpu'): 'mochitest-chrome-gpu',
                 ('mochitest-plain', 'gpu'): 'mochitest-plain-gpu',
                 ('mochitest-plain', 'webgl1-core'): 'mochitest-webgl1-core',
                 ('mochitest-plain', 'webgl1-ext'): 'mochitest-webgl1-ext',
--- a/testing/mozharness/mozharness/mozilla/testing/testbase.py
+++ b/testing/mozharness/mozharness/mozilla/testing/testbase.py
@@ -310,17 +310,16 @@ You can set this by specifying --test-ur
         # Some platforms define more suite categories/names than others.
         # This is a difference in the convention of the configs more than
         # to how these tests are run, so we pave over these differences here.
         aliases = {
             'robocop': 'mochitest',
             'mochitest-chrome': 'mochitest',
             'mochitest-media': 'mochitest',
             'mochitest-plain': 'mochitest',
-            'mochitest-plain-clipboard': 'mochitest',
             'mochitest-plain-gpu': 'mochitest',
             'mochitest-webgl1-core': 'mochitest',
             'mochitest-webgl1-ext': 'mochitest',
             'mochitest-webgl2-core': 'mochitest',
             'mochitest-webgl2-ext': 'mochitest',
             'mochitest-webgl2-deqp': 'mochitest',
             'geckoview': 'mochitest',
             'geckoview-junit': 'mochitest',
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@@ -313,17 +313,16 @@ class AndroidEmulatorTest(TestingMixin, 
             return [(self.test_suite, self.test_suite)]
         # per-test mode: determine test suites to run
 
         # For each test category, provide a list of supported sub-suites and a mapping
         # between the per_test_base suite name and the android suite name.
         all = [('mochitest', {'mochitest-plain': 'mochitest-plain',
                               'mochitest-chrome': 'mochitest-chrome',
                               'mochitest-media': 'mochitest-media',
-                              'mochitest-plain-clipboard': 'mochitest-plain-clipboard',
                               'mochitest-plain-gpu': 'mochitest-plain-gpu'}),
                ('reftest', {'reftest': 'reftest',
                             'crashtest': 'crashtest',
                             'jsreftest': 'jsreftest'}),
                ('xpcshell', {'xpcshell': 'xpcshell'})]
         suites = []
         for (category, all_suites) in all:
             cat_suites = self.query_per_test_category_suites(category, all_suites)
--- a/testing/mozharness/scripts/android_hardware_unittest.py
+++ b/testing/mozharness/scripts/android_hardware_unittest.py
@@ -258,17 +258,16 @@ class AndroidHardwareTest(TestingMixin, 
         return cmd
 
     def _query_suites(self):
         if self.test_suite:
             return [(self.test_suite, self.test_suite)]
         # per-test mode: determine test suites to run
         all = [('mochitest', {'mochitest-plain': 'mochitest-plain',
                               'mochitest-chrome': 'mochitest-chrome',
-                              'mochitest-plain-clipboard': 'mochitest-plain-clipboard',
                               'mochitest-plain-gpu': 'mochitest-plain-gpu'}),
                ('reftest', {'reftest': 'reftest', 'crashtest': 'crashtest'}),
                ('xpcshell', {'xpcshell': 'xpcshell'})]
         suites = []
         for (category, all_suites) in all:
             cat_suites = self.query_per_test_category_suites(category, all_suites)
             for k in cat_suites.keys():
                 suites.append((k, cat_suites[k]))
--- a/toolkit/components/aboutmemory/tests/chrome.ini
+++ b/toolkit/components/aboutmemory/tests/chrome.ini
@@ -6,26 +6,26 @@ support-files =
   crash-dump-good.json
   memory-reports-bad.json
   memory-reports-diff1.json
   memory-reports-diff2.json
   memory-reports-good.json
   remote.xul
 
 [test_aboutmemory.xul]
-subsuite = clipboard
+tags = clipboard
 [test_aboutmemory2.xul]
-subsuite = clipboard
+tags = clipboard
 [test_aboutmemory3.xul]
-subsuite = clipboard
+tags = clipboard
 [test_aboutmemory4.xul]
-subsuite = clipboard
+tags = clipboard
 [test_aboutmemory5.xul]
-subsuite = clipboard
+tags = clipboard
 skip-if = asan # Bug 1116230
 [test_aboutmemory6.xul]
 [test_aboutmemory7.xul]
-subsuite = clipboard
+tags = clipboard
 [test_memoryReporters.xul]
 [test_memoryReporters2.xul]
 [test_sqliteMultiReporter.xul]
 [test_dumpGCAndCCLogsToFile.xul]
 skip-if = (verify && debug && (os == 'mac'))
--- a/toolkit/components/passwordmgr/test/browser/browser.ini
+++ b/toolkit/components/passwordmgr/test/browser/browser.ini
@@ -74,17 +74,17 @@ skip-if = verify
 [browser_notifications_2.js]
 skip-if = !verify # Bug 1272849
 [browser_openPasswordManager.js]
 [browser_passwordmgr_editing.js]
 skip-if = os == "linux"
 [browser_context_menu.js]
 [browser_context_menu_iframe.js]
 [browser_passwordmgr_contextmenu.js]
-subsuite = clipboard
+tags = clipboard
 [browser_passwordmgr_fields.js]
 [browser_passwordmgr_observers.js]
 [browser_passwordmgr_sort.js]
 [browser_passwordmgr_switchtab.js]
 [browser_passwordmgrdlg.js]
 [browser_private_window.js]
 support-files =
   subtst_privbrowsing_1.html
--- a/toolkit/components/viewsource/test/browser/browser.ini
+++ b/toolkit/components/viewsource/test/browser/browser.ini
@@ -1,14 +1,14 @@
 [DEFAULT]
 support-files = head.js
   file_bug464222.html
 
 [browser_bug464222.js]
 [browser_viewsource_newwindow.js]
 [browser_bug713810.js]
 [browser_contextmenu.js]
-subsuite = clipboard
+tags = clipboard
 skip-if = (os == "win" && processor == "aarch64") # disabled on aarch64 due to 1531590
 [browser_gotoline.js]
 [browser_open_docgroup.js]
 [browser_srcdoc.js]
 [browser_viewsourceprefs.js]
--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@@ -63,17 +63,17 @@ skip-if = (verify && (os == 'win'))
 [test_autocomplete4.xul]
 [test_autocomplete5.xul]
 [test_autocomplete_emphasis.xul]
 [test_autocomplete_with_composition_on_input.html]
 [test_autocomplete_with_composition_on_textbox.xul]
 [test_autocomplete_placehold_last_complete.xul]
 [test_browser_drop.xul]
 [test_bug253481.xul]
-subsuite = clipboard
+tags = clipboard
 [test_bug263683.xul]
 skip-if = debug && (os == 'win' || os == 'linux')
 [test_bug304188.xul]
 skip-if = webrender
 [test_bug331215.xul]
 skip-if = webrender || (os == 'win' && debug) # Bug 1339326
 [test_bug360220.xul]
 [test_bug360437.xul]
@@ -106,17 +106,17 @@ skip-if = toolkit == "cocoa"
 [test_custom_element_base.xul]
 [test_custom_element_delay_connection.xul]
 [test_deck.xul]
 [test_dialogfocus.xul]
 [test_edit_contextmenu.html]
 [test_editor_for_input_with_autocomplete.html]
 [test_editor_for_textbox_with_autocomplete.xul]
 [test_findbar.xul]
-subsuite = clipboard
+tags = clipboard
 [test_findbar_entireword.xul]
 [test_findbar_events.xul]
 [test_focus_anons.xul]
 [test_frames.xul]
 [test_hiddenitems.xul]
 [test_hiddenpaging.xul]
 [test_keys.xul]
 [test_labelcontrol.xul]
--- a/tools/tryselect/try_presets.yml
+++ b/tools/tryselect/try_presets.yml
@@ -12,28 +12,28 @@
 debugger-tests:
     selector: fuzzy
     description: >-
         Runs the tests relevant to the Firefox Devtools Debugger
     query:
         - "'debugger"
         - "'mozlint-eslint"
         - "!asan 'devtools !shippable | 'linux32 | 'macosx64"
-        - "!android !asan 'linux32 | 'macosx64 | !shippable 'mochitest-chrome | 'mochitest-clipboard"
+        - "!android !asan 'linux32 | 'macosx64 | !shippable 'mochitest-chrome"
         - "!asan !shippable 'linux64/ 'xpcshell"
         - "!qr !macosx !shippable 'damp"
 
 devtools:
     selector: fuzzy
     description: >-
         Runs the tests relevant to the Firefox Devtools
     query:
         - "'debugger | 'node-devtools"
         - "'mozlint-eslint"
-        - "'mochitest-devtools | 'mochitest-chrome | 'mochitest-clipboard 'linux64 | 'mac | 'windows10 !asan !shippable !-sw !qr"
+        - "'mochitest-devtools | 'mochitest-chrome | 'mac | 'windows10 !asan !shippable !-sw !qr"
         - "'xpcshell 'linux64/ !asan !shippable"
 
 perf:
     selector: fuzzy
     description: >-
         Runs all performance (raptor and talos) tasks across all platforms.
         This preset can be filtered down further (e.g to limit it to a specific
         platform) via |mach try --preset perf -xq "'windows"|.
--- a/widget/tests/chrome.ini
+++ b/widget/tests/chrome.ini
@@ -4,26 +4,26 @@ support-files =
   empty_window.xul
   utils.js
 
 [test_bug343416.xul]
 skip-if = debug
 [test_bug429954.xul]
 support-files = window_bug429954.xul
 [test_bug444800.xul]
-subsuite = clipboard
+tags = clipboard
 [test_bug478536.xul]
 skip-if = true # Bug 561929
 support-files = window_bug478536.xul
 [test_bug517396.xul]
 skip-if = (verify && (os == 'win'))
 [test_bug538242.xul]
 support-files = window_bug538242.xul
 [test_bug565392.html]
-subsuite = clipboard
+tags = clipboard
 skip-if = toolkit != "windows"
 [test_bug593307.xul]
 support-files = window_bug593307_offscreen.xul window_bug593307_centerscreen.xul
 [test_bug1151186.html]
 skip-if = os == 'linux' && debug #Bug 1176038
 [test_keycodes.xul]
 [test_wheeltransaction.xul]
 support-files = window_wheeltransaction.xul
@@ -36,33 +36,33 @@ support-files = window_composition_text_
 support-files = file_input_events_on_deactive_window.html
 [test_position_on_resize.xul]
 skip-if = (verify && (os == 'win'))
 [test_sizemode_events.xul]
 [test_taskbar_progress.xul]
 skip-if = toolkit != "cocoa" && toolkit != "windows" || (os == "win" && os_version == "10.0" && !ccov) # Bug 1456811
 [test_bug760802.xul]
 [test_clipboard.xul]
-subsuite = clipboard
+tags = clipboard
 [test_panel_mouse_coords.xul]
 skip-if = toolkit == "windows" # bug 1009955
 
 # Cocoa
 [test_native_menus.xul]
 skip-if = toolkit != "cocoa"
 support-files = native_menus_window.xul
 [test_native_mouse_mac.xul]
 skip-if = toolkit != "cocoa" || os_version == '10.10' # 10.10: bug 1137575
 support-files = native_mouse_mac_window.xul
 [test_bug413277.html]
 skip-if = toolkit != "cocoa"
 [test_bug428405.xul]
 skip-if = toolkit != "cocoa"
 [test_bug466599.xul]
-subsuite = clipboard
+tags = clipboard
 skip-if = toolkit != "cocoa"
 [test_bug485118.xul]
 skip-if = toolkit != "cocoa"
 [test_bug522217.xul]
 tags = fullscreen
 skip-if = toolkit != "cocoa"
 support-files = window_bug522217.xul
 [test_platform_colors.xul]
@@ -75,17 +75,17 @@ support-files = standalone_native_menu_w
 skip-if = toolkit != "cocoa"
 support-files = bug586713_window.xul
 [test_key_event_counts.xul]
 skip-if = toolkit != "cocoa"
 [test_bug596600.xul]
 support-files = file_bug596600.html
 skip-if = toolkit != "cocoa"
 [test_bug673301.xul]
-subsuite = clipboard
+tags = clipboard
 skip-if = toolkit != "cocoa"
 [test_secure_input.html]
 support-files = file_secure_input.html
 skip-if = toolkit != "cocoa"
 [test_native_key_bindings_mac.html]
 skip-if = toolkit != "cocoa" || verify
 [test_system_status_bar.xul]
 skip-if = toolkit != "cocoa"
@@ -103,13 +103,13 @@ support-files = chrome_context_menus_win
 [test_plugin_input_event.html]
 skip-if = toolkit != "windows"
 [test_mouse_scroll.xul]
 skip-if = toolkit != "windows"
 support-files = window_mouse_scroll_win.html
 
 # Privacy relevant
 [test_bug1123480.xul]
-subsuite = clipboard
+tags = clipboard
 [test_transferable_overflow.xul]
 skip-if = (verify && (os == 'mac' || os == 'linux'))
-subsuite = clipboard
+tags = clipboard
 
--- a/widget/tests/mochitest.ini
+++ b/widget/tests/mochitest.ini
@@ -1,16 +1,16 @@
 [DEFAULT]
 support-files = utils.js
 
 [test_AltGr_key_events_in_web_content_on_windows.html]
 skip-if = toolkit != 'windows' || headless # headless: Bug 1410525
 [test_actionhint.html]
 [test_assign_event_data.html]
-subsuite = clipboard
-skip-if = toolkit == "cocoa" || (toolkit == 'android' && debug) || android_version == '24' # Mac: Bug 933303, Android bug 1285414
+tags = clipboard
+skip-if = toolkit == "cocoa" || (toolkit == 'android' && debug) || android_version == '24' || (headless && os == "win") # Mac: Bug 933303, Android bug 1285414
 [test_keypress_event_with_alt_on_mac.html]
 skip-if = toolkit != "cocoa"
 [test_picker_no_crash.html]
 skip-if = toolkit != "windows" || e10s # Bug 1267491
 support-files = window_picker_no_crash_child.html
 [test_scrollbar_colors.html]
 skip-if = (os == 'linux' && headless) || os == 'android' # bug 1460109