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

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.

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]

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]

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]

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]

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

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]

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]

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]

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]

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]

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)

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]

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]

devtools/client/netmonitor/src/har/test/browser.ini

 [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

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]

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

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]

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]

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