Bug 1546459 - remove subsuite=clipboard from manifests. r=ahal

remove subsuite=clipboard from manifests Differential Revision: https://phabricator.services.mozilla.com/D28521 --HG-- extra : moz-landing-system : lando
2019-05-01 08:16:44 +00:00 · 2019-05-01 08:16:44 +00:00 · 6611f95ab0
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@ -76,7 +76,7 @@ support-files =
 [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]
@ -140,7 +140,7 @@ skip-if = true # Bug 1478159
 [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.
@ -155,10 +155,10 @@ skip-if = true # bug 1393813
 [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]
@ -240,7 +240,7 @@ skip-if = os == 'win' || (verify && debug && (os == 'linux'))
 # 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)
@ -251,8 +251,7 @@ skip-if = e10s # Clicks in content don't go through contentAreaClick with e10s.
 [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]
@ -300,7 +299,7 @@ skip-if = toolkit == "windows" # Disabled on Windows due to frequent failures (b
 [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.
--- a/browser/base/content/test/pageActions/browser.ini
+++ b/browser/base/content/test/pageActions/browser.ini
@ -11,7 +11,7 @@ support-files =
  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]
--- a/browser/base/content/test/tabs/browser.ini
+++ b/browser/base/content/test/tabs/browser.ini
@ -61,7 +61,7 @@ skip-if = !e10s # Pref and test only relevant for e10s.
 [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]
--- a/browser/components/aboutconfig/test/browser/browser.ini
+++ b/browser/components/aboutconfig/test/browser/browser.ini
@ -6,7 +6,7 @@ support-files =
 [browser_accessibility.js]
 [browser_basic.js]
 [browser_clipboard.js]
-subsuite = clipboard
+tags = clipboard
 [browser_edit.js]
 [browser_locked.js]
 [browser_observe.js]
--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@ -57,10 +57,10 @@ skip-if = verify
 [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
@ -72,7 +72,7 @@ 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
@ -169,7 +169,7 @@ tags = fullscreen
 [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]
--- a/browser/components/places/tests/browser/browser.ini
+++ b/browser/components/places/tests/browser/browser.ini
@ -54,9 +54,9 @@ skip-if = (verify && debug && (os == 'win' || os == 'mac'))
 [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'))
@ -82,12 +82,12 @@ skip-if = (verify && debug && (os == 'mac' || os == 'linux'))
 [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
--- a/browser/components/urlbar/tests/browser/browser.ini
+++ b/browser/components/urlbar/tests/browser/browser.ini
@ -62,7 +62,7 @@ support-files =
 [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]
@ -72,7 +72,7 @@ skip-if = os == "linux" # Bug 1533807
 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
@ -117,7 +117,7 @@ support-files =
 [browser_urlbar_whereToOpen.js]
 [browser_urlbarAboutHomeLoading.js]
 [browser_urlbarCopying.js]
-subsuite = clipboard
+tags = clipboard
 support-files =
  authenticate.sjs
 [browser_urlbarCutting.js]
@ -134,7 +134,7 @@ skip-if = os == "linux" # Bug 1073339 - Investigate autocomplete test unreliabil
 [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]
--- a/browser/components/urlbar/tests/legacy/browser.ini
+++ b/browser/components/urlbar/tests/legacy/browser.ini
@ -14,7 +14,7 @@ support-files =
 # 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
@ -76,7 +76,7 @@ skip-if = (os == "linux" || os == "mac") && debug # bug 970052, bug 970053
 [../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]
@ -86,7 +86,7 @@ skip-if = os == "linux" # Bug 1533807
 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 =
@ -111,7 +111,7 @@ support-files =
 [../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]
--- a/devtools/client/inspector/fonts/test/browser.ini
+++ b/devtools/client/inspector/fonts/test/browser.ini
@ -18,7 +18,7 @@ support-files =
 [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]
--- a/devtools/client/inspector/markup/test/browser.ini
+++ b/devtools/client/inspector/markup/test/browser.ini
@ -105,9 +105,9 @@ 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]
@ -160,7 +160,7 @@ skip-if = true # Bug 1177550
 [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]
@ -199,7 +199,7 @@ skip-if = verify
 [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]
--- a/devtools/client/inspector/rules/test/browser.ini
+++ b/devtools/client/inspector/rules/test/browser.ini
@ -109,7 +109,7 @@ skip-if = (verify && !debug && os == 'win')
 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]
@ -255,11 +255,11 @@ skip-if = (os == "win" && debug) # bug 963492: win.
 [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]
--- a/devtools/client/inspector/shared/test/browser.ini
+++ b/devtools/client/inspector/shared/test/browser.ini
@ -22,10 +22,10 @@ support-files =

 [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)
--- a/devtools/client/inspector/test/browser.ini
+++ b/devtools/client/inspector/test/browser.ini
@ -98,7 +98,7 @@ skip-if = (verify && debug)
 [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]
@ -147,17 +147,17 @@ skip-if = (e10s && debug) # Bug 1250058 - Docshell leak on debug e10s
 [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]
@ -189,7 +189,7 @@ skip-if = (os == 'win' && processor == 'aarch64') # bug 1533492
 [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]
--- a/devtools/client/jsonview/test/browser.ini
+++ b/devtools/client/jsonview/test/browser.ini
@ -30,13 +30,13 @@ 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]
--- a/devtools/client/netmonitor/src/har/test/browser.ini
+++ b/devtools/client/netmonitor/src/har/test/browser.ini
@ -1,6 +1,6 @@
 [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
--- a/devtools/client/netmonitor/test/browser.ini
+++ b/devtools/client/netmonitor/test/browser.ini
@ -99,26 +99,26 @@ 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]
--- a/devtools/client/shared/webpack/shims/test/mochitest.ini
+++ b/devtools/client/shared/webpack/shims/test/mochitest.ini
@ -2,5 +2,6 @@
 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
@ -229,19 +229,19 @@ skip-if = (os == "win" && processor == "aarch64") # disabled on aarch64 due to 1
 [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]
@ -272,17 +272,17 @@ skip-if = e10s # SharedWorkers console events are not received on the current pr
 [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]
@ -360,9 +360,9 @@ skip-if = true  # Bug 1438979
 [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]
--- a/dom/base/test/chrome.ini
+++ b/dom/base/test/chrome.ini
@ -25,7 +25,7 @@ support-files =
 [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]
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@ -281,10 +281,11 @@ skip-if = (os == "win" && processor == "aarch64") # bug 1535775
 [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]
@ -633,14 +634,14 @@ skip-if = toolkit == 'android' # Timeouts on android due to page closing issues
 [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
--- a/dom/browser-element/mochitest/mochitest-oop.ini
+++ b/dom/browser-element/mochitest/mochitest-oop.ini
@ -17,7 +17,7 @@ disabled = Disabling some OOP tests for WebIDL scope changes (bug 1310706 for re
 [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)
--- a/dom/browser-element/mochitest/mochitest.ini
+++ b/dom/browser-element/mochitest/mochitest.ini
@ -105,7 +105,7 @@ support-files =
 [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]
--- a/dom/events/test/mochitest.ini
+++ b/dom/events/test/mochitest.ini
@ -148,7 +148,8 @@ support-files = bug1017086_inner.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]
--- a/dom/plugins/test/mochitest/mochitest.ini
+++ b/dom/plugins/test/mochitest/mochitest.ini
@ -1,5 +1,6 @@
 [DEFAULT]
-subsuite = clipboard
+tags = clipboard
+skip-if = headless # crash on shutdown, no other failures
 support-files =
  307-xo-redirect.sjs
  crashing_subpage.html
@ -58,7 +59,7 @@ skip-if = toolkit == 'android' # needs plugin support
 [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]
@ -142,7 +143,7 @@ skip-if = e10s # Bug 1090576
 [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]
@ -150,3 +151,4 @@ skip-if = os != "win" || (os == "win" && processor == "aarch64") # aarch64 due t
 [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
@ -73,20 +73,20 @@ skip-if = toolkit == 'android'
 [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]
--- a/editor/libeditor/tests/browserscope/mochitest.ini
+++ b/editor/libeditor/tests/browserscope/mochitest.ini
@ -53,7 +53,7 @@ support-files =
  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
@ -42,7 +42,8 @@ skip-if = toolkit == 'android'
 [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
@ -59,30 +60,35 @@ skip-if = toolkit == 'android'
 [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]
@ -96,24 +102,24 @@ skip-if = true # bug 1376382
 [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]
@ -137,16 +143,17 @@ skip-if = os == 'android'
 [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]
@ -165,22 +172,22 @@ skip-if = toolkit == 'android' # bug 1309431
 [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]
@ -198,7 +205,7 @@ skip-if = os != "win"
 [test_bug1053048.html]
 [test_bug1067255.html]
 [test_bug1068979.html]
-subsuite = clipboard
+tags = clipboard
 [test_bug1094000.html]
 [test_bug1100966.html]
 skip-if = os == 'android'
@ -208,7 +215,7 @@ skip-if = os == 'android'
 [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]
@ -219,7 +226,8 @@ skip-if = os == 'android'
 [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]
@ -228,7 +236,8 @@ subsuite = clipboard
 [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]
@ -258,7 +267,7 @@ skip-if = toolkit == 'android'
 [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]
@ -267,15 +276,15 @@ subsuite = clipboard
 [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]
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@ -204,34 +204,6 @@ mochitest-chrome:
                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:
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@ -28,7 +28,6 @@ common-tests:
    - mochitest-a11y
    - mochitest-browser-chrome
    - mochitest-chrome
-    - mochitest-clipboard
    - mochitest-devtools-chrome
    - mochitest-gpu
    - mochitest-media
@ -235,7 +234,6 @@ windows-tests:
    - mochitest-a11y
    - mochitest-browser-chrome
    - mochitest-chrome
-    - mochitest-clipboard
    - mochitest-devtools-chrome
    - mochitest-gpu
    - mochitest-media
@ -261,7 +259,6 @@ windows-aarch64-tests:
    - mochitest-a11y
    - mochitest-browser-chrome
    - mochitest-chrome
-    - mochitest-clipboard
    - mochitest-devtools-chrome
    - mochitest-gpu
    - mochitest-media
@ -311,7 +308,6 @@ macosx64-tests:
    - mochitest-a11y
    - mochitest-browser-chrome
    - mochitest-chrome
-    - mochitest-clipboard
    - mochitest-devtools-chrome
    - mochitest-devtools-webreplay
    - mochitest-gpu
@ -364,7 +360,6 @@ linux32-tests:
    - mochitest-a11y
    - mochitest-browser-chrome
    - mochitest-chrome
-    - mochitest-clipboard
    - mochitest-gpu
    - mochitest-media
    - mochitest-webgl1-core
@ -391,7 +386,6 @@ android-common-tests:
    - jsreftest
    - mochitest
    - mochitest-chrome
-    - mochitest-clipboard
    - mochitest-gpu
    - mochitest-media
    - reftest
@ -416,7 +410,6 @@ android-x86_64-tests:
    - cppunit
    - jsreftest
    - marionette
-    - mochitest-clipboard
    - mochitest-gpu
    # various reftest (plain) failures; bug 1501582
    # - reftest
--- a/taskcluster/taskgraph/try_option_syntax.py
+++ b/taskcluster/taskgraph/try_option_syntax.py
@ -87,8 +87,6 @@ UNITTEST_ALIASES = {
    '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'),
--- a/testing/mochitest/tests/Harness_sanity/mochitest.ini
+++ b/testing/mochitest/tests/Harness_sanity/mochitest.ini
@ -33,7 +33,7 @@ support-files = SpecialPowersLoadChromeScript.js
 [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
--- a/testing/mozbase/moztest/moztest/resolve.py
+++ b/testing/mozbase/moztest/moztest/resolve.py
@ -87,13 +87,6 @@ TEST_SUITES = {
        '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',
@ -107,13 +100,6 @@ TEST_SUITES = {
        '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',
@ -139,14 +125,7 @@ TEST_SUITES = {
        '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': {
@ -250,13 +229,10 @@ _test_flavors = {
 }

 _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',
--- a/testing/mozharness/configs/android/android_common.py
+++ b/testing/mozharness/configs/android/android_common.py
@ -132,28 +132,6 @@ config = {
                "--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",
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@ -157,16 +157,13 @@ config = {
                           "--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"],
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@ -123,15 +123,12 @@ config = {
    "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"],
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@ -146,15 +146,12 @@ config = {
    {
        "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"],
--- a/testing/mozharness/mozharness/mozilla/testing/errors.py
+++ b/testing/mozharness/mozharness/mozilla/testing/errors.py
@ -34,7 +34,6 @@ TinderBoxPrintRe = {
    "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+)'''),
--- a/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
+++ b/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
@ -139,9 +139,6 @@ class SingleTestMixin(FetchesMixin):
                #   <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',
--- a/testing/mozharness/mozharness/mozilla/testing/testbase.py
+++ b/testing/mozharness/mozharness/mozilla/testing/testbase.py
@ -315,7 +315,6 @@ You can set this by specifying --test-url URL
            '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',
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@ -318,7 +318,6 @@ class AndroidEmulatorTest(TestingMixin, BaseScript, MozbaseMixin, CodeCoverageMi
        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',
--- a/testing/mozharness/scripts/android_hardware_unittest.py
+++ b/testing/mozharness/scripts/android_hardware_unittest.py
@ -263,7 +263,6 @@ class AndroidHardwareTest(TestingMixin, BaseScript, MozbaseMixin,
        # 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'})]
--- a/toolkit/components/aboutmemory/tests/chrome.ini
+++ b/toolkit/components/aboutmemory/tests/chrome.ini
@ -11,19 +11,19 @@ support-files =
  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]
--- a/toolkit/components/passwordmgr/test/browser/browser.ini
+++ b/toolkit/components/passwordmgr/test/browser/browser.ini
@ -79,7 +79,7 @@ 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]
--- a/toolkit/components/viewsource/test/browser/browser.ini
+++ b/toolkit/components/viewsource/test/browser/browser.ini
@ -6,7 +6,7 @@ support-files = head.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]
--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@ -68,7 +68,7 @@ skip-if = (verify && (os == 'win'))
 [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]
@ -111,7 +111,7 @@ skip-if = toolkit == "cocoa"
 [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]
--- a/tools/tryselect/try_presets.yml
+++ b/tools/tryselect/try_presets.yml
@ -17,7 +17,7 @@ debugger-tests:
        - "'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"

@ -28,7 +28,7 @@ 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:
--- a/widget/tests/chrome.ini
+++ b/widget/tests/chrome.ini
@ -9,7 +9,7 @@ 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
@ -18,7 +18,7 @@ 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
@ -41,7 +41,7 @@ skip-if = (verify && (os == 'win'))
 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

@ -57,7 +57,7 @@ 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"
@ -80,7 +80,7 @@ skip-if = toolkit != "cocoa"
 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
@ -108,8 +108,8 @@ 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
@ -5,8 +5,8 @@ support-files = utils.js
 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]