From 40f9a2dd0bf4a56284d116324437164a402dd57a Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Tue, 24 May 2022 10:05:59 +0000
Subject: [PATCH] Bug 1764717 - Part 6: Use type-specific findMessage(s) in
 devtools/client/webconsole/test/browser/browser_webconsole_*. r=nchevobbe

Differential Revision: https://phabricator.services.mozilla.com/D147026
---
 ...nsole_allow_mixedcontent_securityerrors.js |  2 +-
 .../browser/browser_webconsole_async_stack.js |  8 ++---
 .../browser/browser_webconsole_batching.js    |  4 ++-
 ...rowser_webconsole_bidi_string_isolation.js |  2 +-
 ...nsole_block_mixedcontent_securityerrors.js |  4 +--
 .../browser_webconsole_cached_messages.js     |  4 +--
 ...webconsole_cached_messages_no_duplicate.js |  4 ++-
 .../browser/browser_webconsole_clear_cache.js | 10 +++----
 .../browser_webconsole_clickable_urls.js      |  2 +-
 ...ebconsole_close_groups_after_navigation.js |  2 +-
 .../browser_webconsole_console_api_iframe.js  |  2 +-
 .../browser_webconsole_console_group.js       | 16 +++++-----
 ...webconsole_console_group_open_no_scroll.js |  6 ++--
 ..._webconsole_console_logging_workers_api.js | 16 +++++-----
 ..._webconsole_console_profile_unavailable.js |  2 +-
 ...owser_webconsole_console_table_fallback.js |  2 +-
 ...owser_webconsole_console_trace_distinct.js |  4 +--
 ...ser_webconsole_console_trace_duplicates.js |  2 +-
 ...onsole_context_menu_copy_entire_message.js | 12 ++++----
 ...ser_webconsole_context_menu_copy_object.js |  2 +-
 ...sole_context_menu_export_console_output.js |  4 ++-
 ...bconsole_context_menu_object_in_sidebar.js |  6 ++--
 ...rowser_webconsole_context_menu_open_url.js |  8 +++--
 ...onsole_context_menu_reveal_in_inspector.js |  4 +--
 ...webconsole_context_menu_store_as_global.js |  2 +-
 ...onsole_csp_ignore_reflected_xss_message.js |  2 +-
 .../browser_webconsole_csp_violation.js       |  8 ++---
 ..._webconsole_css_error_impacted_elements.js |  4 +--
 .../browser_webconsole_duplicate_errors.js    |  2 +-
 ...ser_webconsole_error_with_grouped_stack.js |  2 +-
 ..._webconsole_error_with_longstring_stack.js |  2 +-
 .../browser_webconsole_error_with_unicode.js  |  2 +-
 .../browser_webconsole_error_with_url.js      |  2 +-
 .../browser/browser_webconsole_eval_error.js  |  4 +--
 .../browser_webconsole_eval_sources.js        |  4 +--
 .../browser_webconsole_filter_by_input.js     |  4 +--
 ...rowser_webconsole_filter_by_regex_input.js |  4 +--
 .../browser_webconsole_filter_groups.js       |  6 ++--
 ...ser_webconsole_filter_navigation_marker.js | 14 ++++-----
 .../browser_webconsole_filter_scroll.js       | 14 +++++----
 .../browser/browser_webconsole_filters.js     |  4 +--
 .../browser_webconsole_filters_persist.js     |  8 +++--
 .../browser_webconsole_iframe_wrong_hud.js    |  4 +--
 ...sole_ineffective_iframe_sandbox_warning.js |  6 +---
 .../browser/browser_webconsole_input_focus.js |  4 ++-
 ...sswords_about_blank_web_console_warning.js |  6 +---
 ..._insecure_passwords_web_console_warning.js |  4 +--
 ..._webconsole_inspect_cross_domain_object.js |  2 +-
 ...owser_webconsole_keyboard_accessibility.js |  2 +-
 ...er_webconsole_location_styleeditor_link.js |  2 +-
 .../browser_webconsole_logErrorInPage.js      |  2 +-
 .../browser_webconsole_logWarningInPage.js    |  2 +-
 .../browser/browser_webconsole_longstring.js  |  6 ++--
 .../browser_webconsole_longstring_getter.js   | 10 +++++--
 .../browser_webconsole_mime_css_blocked.js    |  2 +-
 .../browser_webconsole_network_attach.js      |  4 ++-
 ...r_webconsole_network_message_ctrl_click.js |  4 ++-
 ...console_network_messages_resend_request.js |  8 +++--
 ...webconsole_network_messages_status_code.js |  4 ++-
 .../browser_webconsole_nodes_highlight.js     |  2 +-
 .../browser_webconsole_nodes_select.js        |  2 +-
 ..._webconsole_non_javascript_mime_warning.js |  6 +---
 ...onsole_non_javascript_mime_worker_error.js | 12 ++------
 ..._webconsole_non_standard_doctype_errors.js | 17 +++++------
 .../browser_webconsole_object_ctrl_click.js   |  2 +-
 ...bconsole_object_in_sidebar_keyboard_nav.js |  2 +-
 .../browser_webconsole_object_inspector.js    |  2 +-
 ...er_webconsole_object_inspector__proto__.js |  2 +-
 ...ser_webconsole_object_inspector_entries.js |  4 ++-
 ...ser_webconsole_object_inspector_getters.js |  2 +-
 ...sole_object_inspector_getters_prototype.js |  2 +-
 ...nsole_object_inspector_getters_shadowed.js |  2 +-
 ..._object_inspector_local_session_storage.js |  6 ++--
 ...console_object_inspector_nested_promise.js |  4 +--
 ...ebconsole_object_inspector_nested_proxy.js |  2 +-
 ...ole_object_inspector_private_properties.js |  4 ++-
 ...wser_webconsole_object_inspector_scroll.js |  2 +-
 ...ser_webconsole_object_inspector_symbols.js |  4 ++-
 .../browser_webconsole_output_order.js        |  4 +--
 ...wser_webconsole_promise_rejected_object.js |  7 ++---
 .../browser_webconsole_reopen_closed_tab.js   |  2 +-
 ..._webconsole_requestStorageAccess_errors.js |  2 +-
 ...owser_webconsole_responsive_design_mode.js |  4 +--
 ...console_sandbox_update_after_navigation.js | 15 ++++++++--
 ...browser_webconsole_script_errordoc_urls.js |  6 +++-
 .../test/browser/browser_webconsole_scroll.js | 10 ++++---
 ...onsole_show_subresource_security_errors.js |  2 +-
 ...ser_webconsole_shows_reqs_in_netmonitor.js |  2 +-
 ...debar_object_expand_when_message_pruned.js |  4 +--
 .../browser_webconsole_sourcemap_css.js       |  2 +-
 .../browser_webconsole_sourcemap_error.js     |  6 ++--
 .../browser_webconsole_sourcemap_invalid.js   |  2 +-
 .../browser_webconsole_sourcemap_nosource.js  |  4 +--
 ...nsole_stacktrace_location_debugger_link.js |  2 +-
 .../browser_webconsole_strict_mode_errors.js  |  2 +-
 .../browser_webconsole_telemetry_js_errors.js |  4 +--
 ...webconsole_telemetry_jump_to_definition.js |  4 ++-
 ...er_webconsole_telemetry_object_expanded.js |  4 ++-
 .../browser_webconsole_time_methods.js        | 12 ++++----
 ...er_webconsole_trackingprotection_errors.js | 14 ++++-----
 .../browser_webconsole_uncaught_exception.js  |  2 +-
 .../browser/browser_webconsole_view_source.js |  2 +-
 .../browser_webconsole_visibility_messages.js |  8 ++---
 ...wser_webconsole_warn_about_replaced_api.js | 15 +++++-----
 ...bconsole_warning_group_content_blocking.js |  6 ++--
 ...rowser_webconsole_warning_group_cookies.js |  4 +--
 ...wser_webconsole_warning_group_multiples.js |  8 +++--
 ...console_warning_group_storage_isolation.js |  2 +-
 .../browser_webconsole_warning_groups.js      | 10 ++++---
 ...ser_webconsole_warning_groups_filtering.js | 30 ++++++++++---------
 ...le_warning_groups_outside_console_group.js | 16 +++++-----
 ...rowser_webconsole_warning_groups_toggle.js | 18 ++++++-----
 ...bconsole_webextension_promise_rejection.js |  4 +--
 .../browser/browser_webconsole_websocket.js   |  4 +--
 ...browser_webconsole_worker_promise_error.js |  4 +--
 .../browser_webconsole_worklet_error.js       |  2 +-
 116 files changed, 336 insertions(+), 280 deletions(-)

diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_allow_mixedcontent_securityerrors.js b/devtools/client/webconsole/test/browser/browser_webconsole_allow_mixedcontent_securityerrors.js
index ae7eb1d76704..68851372b70f 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_allow_mixedcontent_securityerrors.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_allow_mixedcontent_securityerrors.js
@@ -36,7 +36,7 @@ add_task(async function() {
     "\u201chttp://example.com/tests/image/test/mochitest/blue.png\u201d on a secure page";
 
   const waitUntilWarningMessage = text =>
-    waitFor(() => findMessage(hud, text, ".message.warn"), undefined, 100);
+    waitFor(() => findWarningMessage(hud, text), undefined, 100);
 
   const onMixedActiveContent = waitUntilWarningMessage(activeContentText);
   const onMixedDisplayContent = waitUntilWarningMessage(displayContentText);
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_async_stack.js b/devtools/client/webconsole/test/browser/browser_webconsole_async_stack.js
index 9f516b6ef86d..24e648e720dd 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_async_stack.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_async_stack.js
@@ -43,14 +43,14 @@ add_task(async function() {
   ].join("\n");
 
   const traceMsgNode = await waitFor(
-    () => findMessage(hud, "Trace message", ".console-api.trace"),
+    () => findConsoleAPIMessage(hud, "Trace message", ".trace"),
     "Wait for the trace message to be logged"
   );
   let frames = await getSimplifiedStack(traceMsgNode);
   is(frames, expectedFrames, "console.trace has expected frames");
 
   const consoleErrorMsgNode = await waitFor(
-    () => findMessage(hud, "console error message", ".console-api.error"),
+    () => findConsoleAPIMessage(hud, "console error message", ".error"),
     "Wait for the console error message to be logged"
   );
   consoleErrorMsgNode.querySelector(".arrow").click();
@@ -59,10 +59,10 @@ add_task(async function() {
 
   const errorMsgNode = await waitFor(
     () =>
-      findMessage(
+      findErrorMessage(
         hud,
         "Uncaught Error: Thrown error message",
-        ".javascript.error"
+        ".javascript"
       ),
     "Wait for the thrown error message to be logged"
   );
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_batching.js b/devtools/client/webconsole/test/browser/browser_webconsole_batching.js
index 65ef1026fb73..0eabb7c7ae7d 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_batching.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_batching.js
@@ -46,7 +46,9 @@ async function testBatchLoggingAndClear(hud, messageNumber) {
   ) {
     content.wrappedJSObject.batchLogAndClear(numMessages);
   });
-  await waitFor(() => findMessage(hud, l10n.getStr("consoleCleared")));
+  await waitFor(() =>
+    findConsoleAPIMessage(hud, l10n.getStr("consoleCleared"))
+  );
   ok(true, "console cleared message is displayed");
 
   // Passing the text argument as an empty string will returns all the message,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_bidi_string_isolation.js b/devtools/client/webconsole/test/browser/browser_webconsole_bidi_string_isolation.js
index 8b2b1dfd4432..ecb1f99d3aaf 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_bidi_string_isolation.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_bidi_string_isolation.js
@@ -48,7 +48,7 @@ add_task(async function() {
   ];
   for (let i = 0; i < texts.length; ++i) {
     const msgId = "msg" + String(i + 1).padStart(2, "0");
-    const message = await waitFor(() => findMessage(hud, msgId));
+    const message = await waitFor(() => findConsoleAPIMessage(hud, msgId));
     const objectBox = message.querySelector(".objectBox");
     is(objectBox.textContent, texts[i], "Should have all the relevant text");
     checkRects(objectBox);
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_block_mixedcontent_securityerrors.js b/devtools/client/webconsole/test/browser/browser_webconsole_block_mixedcontent_securityerrors.js
index dd23b7ef4176..9ce3ac2cbb65 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_block_mixedcontent_securityerrors.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_block_mixedcontent_securityerrors.js
@@ -40,7 +40,7 @@ add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
 
   const waitForErrorMessage = text =>
-    waitFor(() => findMessage(hud, text, ".message.error"), undefined, 100);
+    waitFor(() => findErrorMessage(hud, text), undefined, 100);
 
   const onBlockedIframe = waitForErrorMessage(blockedActiveContentText);
   const onBlockedImage = waitForErrorMessage(blockedDisplayContentText);
@@ -73,7 +73,7 @@ add_task(async function() {
   gIdentityHandler.disableMixedContentProtection();
 
   const waitForWarningMessage = text =>
-    waitFor(() => findMessage(hud, text, ".message.warn"), undefined, 100);
+    waitFor(() => findWarningMessage(hud, text), undefined, 100);
 
   const onMixedActiveContent = waitForWarningMessage(activeContentText);
   const onMixedDisplayContent = waitForWarningMessage(displayContentText);
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_cached_messages.js b/devtools/client/webconsole/test/browser/browser_webconsole_cached_messages.js
index 3e3ca3759a39..7d5faaf537da 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_cached_messages.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_cached_messages.js
@@ -108,7 +108,7 @@ async function logMessages() {
 
 async function testMessagesVisibility(hud, checkNetworkMessage = true) {
   // wait for the last logged message to be displayed
-  await waitFor(() => findMessage(hud, "info Bazzle", ".message.info"));
+  await waitFor(() => findConsoleAPIMessage(hud, "info Bazzle", ".info"));
 
   const messages = Array.from(hud.ui.outputNode.querySelectorAll(".message"));
   const EXPECTED_MESSAGES = [
@@ -178,7 +178,7 @@ async function testMessagesVisibility(hud, checkNetworkMessage = true) {
 
   // We can't assert the CSS warning position, so we only check that it's visible.
   await waitFor(
-    () => findMessage(hud, "cssColorBug611032", ".message.warn.css"),
+    () => findWarningMessage(hud, "cssColorBug611032", ".css"),
     "Couldn't find the CSS warning message"
   );
   ok(true, "css warning message is visible");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_cached_messages_no_duplicate.js b/devtools/client/webconsole/test/browser/browser_webconsole_cached_messages_no_duplicate.js
index 81b73861b582..2f1e20e6f4e1 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_cached_messages_no_duplicate.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_cached_messages_no_duplicate.js
@@ -26,7 +26,9 @@ add_task(async function() {
 
   info("wait until all the messages are displayed");
   await waitFor(
-    () => findMessage(hud, "message 1") && findMessage(hud, "message 50")
+    () =>
+      findConsoleAPIMessage(hud, "message 1") &&
+      findConsoleAPIMessage(hud, "message 50")
   );
 
   is(
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_clear_cache.js b/devtools/client/webconsole/test/browser/browser_webconsole_clear_cache.js
index f99a60cd2057..581c196eba6a 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_clear_cache.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_clear_cache.js
@@ -21,8 +21,8 @@ add_task(async function() {
   await closeToolbox();
   hud = await openConsole(tab);
 
-  await waitFor(() => findMessage(hud, EXPECTED_REPORT));
-  await waitFor(() => findMessage(hud, CACHED_MESSAGE));
+  await waitFor(() => findErrorMessage(hud, EXPECTED_REPORT));
+  await waitFor(() => findConsoleAPIMessage(hud, CACHED_MESSAGE));
 
   info(
     "Click the clear output button and wait until there's no messages in the output"
@@ -37,12 +37,12 @@ add_task(async function() {
   info("Log a smoke message in order to know that the console is ready");
   await logTextToConsole(hud, "Smoke message");
   is(
-    findMessage(hud, CACHED_MESSAGE),
+    findConsoleAPIMessage(hud, CACHED_MESSAGE),
     undefined,
     "The cached message is not visible anymore"
   );
   is(
-    findMessage(hud, EXPECTED_REPORT),
+    findErrorMessage(hud, EXPECTED_REPORT),
     undefined,
     "The cached error message is not visible anymore as well"
   );
@@ -65,7 +65,7 @@ add_task(async function() {
   info("Log a smoke message in order to know that the console is ready");
   await logTextToConsole(hud, "Second smoke message");
   is(
-    findMessage(hud, NEW_CACHED_MESSAGE),
+    findConsoleAPIMessage(hud, NEW_CACHED_MESSAGE),
     undefined,
     "The new cached message is not visible anymore"
   );
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_clickable_urls.js b/devtools/client/webconsole/test/browser/browser_webconsole_clickable_urls.js
index 1509fad7b353..86f341df5427 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_clickable_urls.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_clickable_urls.js
@@ -24,7 +24,7 @@ add_task(async function() {
     }
   );
 
-  const node = await waitFor(() => findMessage(hud, firstURL));
+  const node = await waitFor(() => findConsoleAPIMessage(hud, firstURL));
   const [urlEl1, urlEl2] = Array.from(node.querySelectorAll("a.url"));
 
   let onTabLoaded = BrowserTestUtils.waitForNewTab(gBrowser, firstURL, true);
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_close_groups_after_navigation.js b/devtools/client/webconsole/test/browser/browser_webconsole_close_groups_after_navigation.js
index 4e35de7845da..9f514242c9ae 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_close_groups_after_navigation.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_close_groups_after_navigation.js
@@ -12,7 +12,7 @@ add_task(async function() {
     "Open the console and wait for the console.group message to be rendered"
   );
   const hud = await openNewTabAndConsole(TEST_URI);
-  await waitFor(() => findMessage(hud, "hello", ".startGroup"));
+  await waitFor(() => findConsoleAPIMessage(hud, "hello", ".startGroup"));
 
   info("Refresh tab several times and check for correct message indentation");
   for (let i = 0; i < 5; i++) {
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_console_api_iframe.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_api_iframe.js
index f5e23a182bb5..75971e463a8b 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_console_api_iframe.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_api_iframe.js
@@ -13,7 +13,7 @@ add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
   const loggedString = "iframe added";
   // Wait for the initial message to be displayed.
-  await waitFor(() => findMessage(hud, loggedString));
+  await waitFor(() => findConsoleAPIMessage(hud, loggedString));
   ok(true, "The initial message is displayed in the console");
   // Create a promise for the message logged after the reload.
   const onMessage = waitForMessage(hud, loggedString);
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_console_group.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_group.js
index b1be2501545e..327ac558033a 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_console_group.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_group.js
@@ -25,7 +25,7 @@ add_task(async function() {
   await onMessagesLogged;
 
   info("Test a group at root level");
-  let node = findMessage(hud, "group-1");
+  let node = findConsoleAPIMessage(hud, "group-1");
   testClass(node, "startGroup");
   testIndent(node, 0);
   await testGroupToggle({
@@ -37,12 +37,12 @@ add_task(async function() {
   });
 
   info("Test a message in a 1 level deep group");
-  node = findMessage(hud, "log-1");
+  node = findConsoleAPIMessage(hud, "log-1");
   testClass(node, "log");
   testIndent(node, 1);
 
   info("Test a group in a 1 level deep group");
-  node = findMessage(hud, "group-2");
+  node = findConsoleAPIMessage(hud, "group-2");
   testClass(node, "startGroup");
   testIndent(node, 1);
   await testGroupToggle({
@@ -54,24 +54,24 @@ add_task(async function() {
   });
 
   info("Test a message in a 2 level deep group");
-  node = findMessage(hud, "log-2");
+  node = findConsoleAPIMessage(hud, "log-2");
   testClass(node, "log");
   testIndent(node, 2);
 
   info(
     "Test a message in a 1 level deep group, after closing a 2 level deep group"
   );
-  node = findMessage(hud, "log-3");
+  node = findConsoleAPIMessage(hud, "log-3");
   testClass(node, "log");
   testIndent(node, 1);
 
   info("Test a message at root level, after closing all the groups");
-  node = findMessage(hud, "log-4");
+  node = findConsoleAPIMessage(hud, "log-4");
   testClass(node, "log");
   testIndent(node, 0);
 
   info("Test a collapsed group at root level");
-  node = findMessage(hud, "group-3");
+  node = findConsoleAPIMessage(hud, "group-3");
   testClass(node, "startGroupCollapsed");
   testIndent(node, 0);
   await testGroupToggle({
@@ -93,7 +93,7 @@ add_task(async function() {
   });
 
   info("Test a message at root level, after closing a collapsed group");
-  node = findMessage(hud, "log-6");
+  node = findConsoleAPIMessage(hud, "log-6");
   testClass(node, "log");
   testIndent(node, 0);
   const nodes = hud.ui.outputNode.querySelectorAll(".message");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_console_group_open_no_scroll.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_group_open_no_scroll.js
index 613b45641e35..fef3f2c115ec 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_console_group_open_no_scroll.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_group_open_no_scroll.js
@@ -16,8 +16,8 @@ add_task(async function() {
   const outputScroller = hud.ui.outputScroller;
 
   // Let's wait until the first message and the group are displayed.
-  await waitFor(() => findMessage(hud, "log-0"));
-  const groupMessage = await waitFor(() => findMessage(hud, "GROUP"));
+  await waitFor(() => findConsoleAPIMessage(hud, "log-0"));
+  const groupMessage = await waitFor(() => findConsoleAPIMessage(hud, "GROUP"));
 
   is(hasVerticalOverflow(outputScroller), true, "output node overflows");
   is(
@@ -28,7 +28,7 @@ add_task(async function() {
 
   info("Expand the group");
   groupMessage.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, "in group"));
+  await waitFor(() => findConsoleAPIMessage(hud, "in group"));
 
   is(hasVerticalOverflow(outputScroller), true, "output node overflows");
   is(
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_console_logging_workers_api.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_logging_workers_api.js
index 9f937e0dc2f8..3f8be177d58f 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_console_logging_workers_api.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_logging_workers_api.js
@@ -23,7 +23,7 @@ async function testWorkerMessage(directConnectionToWorkerThread = false) {
   const hud = await openNewTabAndConsole(TEST_URI);
 
   const cachedMessage = await waitFor(() =>
-    findMessage(hud, "initial-message-from-worker")
+    findConsoleAPIMessage(hud, "initial-message-from-worker")
   );
   ok(true, "We get the cached message from the worker");
 
@@ -50,7 +50,9 @@ async function testWorkerMessage(directConnectionToWorkerThread = false) {
     content.wrappedJSObject.logFromWorker("live-message");
   });
 
-  const liveMessage = await waitFor(() => findMessage(hud, "log-from-worker"));
+  const liveMessage = await waitFor(() =>
+    findConsoleAPIMessage(hud, "log-from-worker")
+  );
   ok(true, "We get the cached message from the worker");
 
   ok(
@@ -75,7 +77,7 @@ async function testWorkerMessage(directConnectionToWorkerThread = false) {
     });
 
     const symbolMessage = await waitFor(() =>
-      findMessage(hud, 'Symbol("logged-symbol-from-worker")')
+      findConsoleAPIMessage(hud, 'Symbol("logged-symbol-from-worker")')
     );
     ok(symbolMessage, "Symbol logged from worker is visible in the console");
   }
@@ -84,8 +86,8 @@ async function testWorkerMessage(directConnectionToWorkerThread = false) {
   hud.ui.window.document.querySelector(".devtools-clear-icon").click();
   await waitFor(
     () =>
-      !findMessage(hud, "initial-message-from-worker") &&
-      !findMessage(hud, "log-from-worker")
+      !findConsoleAPIMessage(hud, "initial-message-from-worker") &&
+      !findConsoleAPIMessage(hud, "log-from-worker")
   );
   ok(true, "Messages were removed");
 
@@ -104,12 +106,12 @@ async function testWorkerMessage(directConnectionToWorkerThread = false) {
   await onSmokeMessage;
 
   is(
-    findMessage(newHud, "initial-message-from-worker"),
+    findConsoleAPIMessage(newHud, "initial-message-from-worker"),
     undefined,
     "Message cache was cleared"
   );
   is(
-    findMessage(newHud, "log-from-worker"),
+    findConsoleAPIMessage(newHud, "log-from-worker"),
     undefined,
     "Live message were cleared as well"
   );
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_console_profile_unavailable.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_profile_unavailable.js
index 1a67d47d650e..4033b606b38a 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_console_profile_unavailable.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_profile_unavailable.js
@@ -19,7 +19,7 @@ add_task(async function consoleProfileWarningWithNewPerfPanel() {
   });
 
   await waitFor(
-    () => findMessage(hud, EXPECTED_WARNING),
+    () => findWarningMessage(hud, EXPECTED_WARNING),
     "Wait until the warning about console.profile is displayed"
   );
   ok(true, "The expected warning was displayed.");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_console_table_fallback.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_table_fallback.js
index e459b63d45d7..ba7b6d2b2edd 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_console_table_fallback.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_table_fallback.js
@@ -27,7 +27,7 @@ add_task(async function() {
   for (const [input, output] of tests) {
     execute(hud, input);
     const message = await waitFor(
-      () => findMessage(hud, output, ".console-api"),
+      () => findConsoleAPIMessage(hud, output),
       `Waiting for output for ${input}`
     );
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_console_trace_distinct.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_trace_distinct.js
index 99b123af7eb8..481c896c8390 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_console_trace_distinct.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_trace_distinct.js
@@ -14,9 +14,9 @@ const TEST_URI = `data:text/html,<!DOCTYPE html><meta charset=utf8><script>
 
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
-  await waitFor(() => findMessage(hud, "trace"));
+  await waitFor(() => findConsoleAPIMessage(hud, "trace"));
   ok(true, "console.trace() message is displayed in the console");
-  const messages = findMessages(hud, "console.trace()");
+  const messages = findConsoleAPIMessages(hud, "console.trace()");
   is(messages.length, 4, "There are 4 console.trace() messages");
 
   info("Wait until the stacktraces are displayed");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_console_trace_duplicates.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_trace_duplicates.js
index 508176c4187d..42f89ab69c6c 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_console_trace_duplicates.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_trace_duplicates.js
@@ -10,7 +10,7 @@ const TEST_URI =
 add_task(async function testTraceMessages() {
   const hud = await openNewTabAndConsole(TEST_URI);
 
-  const message = await waitFor(() => findMessage(hud, "foo1"));
+  const message = await waitFor(() => findConsoleAPIMessage(hud, "foo1"));
   // Wait until stacktrace is displayed.
   await waitFor(() => !!message.querySelector(".frames"));
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_entire_message.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_entire_message.js
index 2ad03fb9580e..402075a9df96 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_entire_message.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_entire_message.js
@@ -67,7 +67,9 @@ async function testMessagesCopy(hud, timestamp) {
   const newLineString = "\n";
 
   info("Test copy menu item for the simple log");
-  let message = await waitFor(() => findMessage(hud, "simple text message"));
+  let message = await waitFor(() =>
+    findConsoleAPIMessage(hud, "simple text message")
+  );
   let clipboardText = await copyMessageContent(hud, message);
   ok(true, "Clipboard text was found and saved");
 
@@ -90,7 +92,7 @@ async function testMessagesCopy(hud, timestamp) {
   }
 
   info("Test copy menu item for the console.trace message");
-  message = await waitFor(() => findMessage(hud, "console.trace"));
+  message = await waitFor(() => findConsoleAPIMessage(hud, "console.trace"));
   // Wait for the stacktrace to be rendered.
   await waitFor(() => message.querySelector(".frames"));
   clipboardText = await copyMessageContent(hud, message);
@@ -125,7 +127,7 @@ async function testMessagesCopy(hud, timestamp) {
   );
 
   info("Test copy menu item for the error message");
-  message = await waitFor(() => findMessage(hud, "Error:"));
+  message = await waitFor(() => findConsoleAPIMessage(hud, "Error:"));
   // Wait for the stacktrace to be rendered.
   await waitFor(() => message.querySelector(".frames"));
   clipboardText = await copyMessageContent(hud, message);
@@ -154,7 +156,7 @@ async function testMessagesCopy(hud, timestamp) {
   );
 
   info("Test copy menu item for the reference error message");
-  message = await waitFor(() => findMessage(hud, "ReferenceError:"));
+  message = await waitFor(() => findErrorMessage(hud, "ReferenceError:"));
   clipboardText = await copyMessageContent(hud, message);
   ok(true, "Clipboard text was found and saved");
   lines = clipboardText.split(newLineString);
@@ -185,7 +187,7 @@ async function testMessagesCopy(hud, timestamp) {
     "The Learn More text wasn't put in the clipboard"
   );
 
-  message = await waitFor(() => findMessage(hud, "repeated 2"));
+  message = await waitFor(() => findConsoleAPIMessage(hud, "repeated 2"));
   clipboardText = await copyMessageContent(hud, message);
   ok(true, "Clipboard text was found and saved");
 }
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_object.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_object.js
index 9b1939dc2ceb..dd481ef941b9 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_object.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_object.js
@@ -26,7 +26,7 @@ add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
 
   const [msgWithText, msgWithObj, msgNested] = await waitFor(() =>
-    findMessages(hud, "foo")
+    findConsoleAPIMessages(hud, "foo")
   );
   ok(
     msgWithText && msgWithObj && msgNested,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js
index 29acd2ae7405..0a0103bf7dec 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js
@@ -62,7 +62,9 @@ add_task(async function testExportToClipboard() {
 
   info("Test export to clipboard ");
   // Let's wait until we have all the logged messages.
-  const lastMessage = await waitFor(() => findMessage(hud, "item-99"));
+  const lastMessage = await waitFor(() =>
+    findConsoleAPIMessage(hud, "item-99")
+  );
 
   const clipboardText = await exportAllToClipboard(hud, lastMessage);
   ok(true, "Clipboard text was found and saved");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_object_in_sidebar.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_object_in_sidebar.js
index 434f4cd2da35..733ccf395a74 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_object_in_sidebar.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_object_in_sidebar.js
@@ -23,7 +23,9 @@ add_task(async function() {
 
   const hud = await openNewTabAndConsole(TEST_URI);
 
-  const message = await waitFor(() => findMessage(hud, "Object { a: 1 }"));
+  const message = await waitFor(() =>
+    findConsoleAPIMessage(hud, "Object { a: 1 }")
+  );
   const [objectA, objectB] = message.querySelectorAll(
     ".object-inspector .objectBox-object"
   );
@@ -85,7 +87,7 @@ add_task(async function() {
   ok(sidebarText.includes("b: 1"), "Sidebar contents shown for {b:1}");
 
   info("Showing sidebar for Error object");
-  const errorMsg = findMessage(hud, "CustomServerError:");
+  const errorMsg = findConsoleAPIMessage(hud, "CustomServerError:");
   await showSidebarWithContextMenu(hud, errorMsg, false);
 
   sidebarContents = hud.ui.document.querySelector(".sidebar-contents");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_open_url.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_open_url.js
index 2a9126dbddbb..76af47b37be2 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_open_url.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_open_url.js
@@ -24,7 +24,9 @@ add_task(async function() {
   await SpecialPowers.spawn(gBrowser.selectedBrowser, [], () => {
     content.wrappedJSObject.console.log("simple text message");
   });
-  let message = await waitFor(() => findMessage(hud, "simple text message"));
+  let message = await waitFor(() =>
+    findConsoleAPIMessage(hud, "simple text message")
+  );
   ok(message, "Text log found in the console");
 
   info("Open and check the context menu for the logged text message");
@@ -40,7 +42,7 @@ add_task(async function() {
   });
 
   info("Open context menu for the link");
-  message = await waitFor(() => findMessage(hud, "Visit"));
+  message = await waitFor(() => findConsoleAPIMessage(hud, "Visit"));
   const urlNode = message.querySelector("a.url");
   menuPopup = await openContextMenu(hud, urlNode);
   openUrlItem = menuPopup.querySelector("#console-menu-open-url");
@@ -67,7 +69,7 @@ add_task(async function() {
   await SpecialPowers.spawn(gBrowser.selectedBrowser, [], () => {
     content.wrappedJSObject.location.reload();
   });
-  message = await waitFor(() => findMessage(hud, "test-console.html"));
+  message = await waitFor(() => findNetworkMessage(hud, "test-console.html"));
   ok(message, "Network log found in the console");
 
   info("Open and check the context menu for the logged network message");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_reveal_in_inspector.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_reveal_in_inspector.js
index afa75a317db9..e50fe82698f7 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_reveal_in_inspector.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_reveal_in_inspector.js
@@ -26,8 +26,8 @@ const revealInInspectorMenuItemId = "#console-menu-open-node";
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
 
-  const msgWithText = await waitFor(() => findMessage(hud, `foo`));
-  const msgWithObj = await waitFor(() => findMessage(hud, `Object`));
+  const msgWithText = await waitFor(() => findConsoleAPIMessage(hud, `foo`));
+  const msgWithObj = await waitFor(() => findConsoleAPIMessage(hud, `Object`));
   const nonDomEl = await waitFor(() =>
     findMessage(hud, `<span>`, ".objectBox-node")
   );
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_store_as_global.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_store_as_global.js
index 294344cee09c..0f4d3a650909 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_store_as_global.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_store_as_global.js
@@ -21,7 +21,7 @@ const TEST_URI = `data:text/html;charset=utf-8,<!DOCTYPE html><script>
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
 
-  const messages = await waitFor(() => findMessages(hud, "foo"));
+  const messages = await waitFor(() => findConsoleAPIMessages(hud, "foo"));
   is(messages.length, 5, "Five messages should have appeared");
   const [msgWithText, msgWithObj, msgNested, msgLongStr, msgSymbol] = messages;
   let varIdx = 0;
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_csp_ignore_reflected_xss_message.js b/devtools/client/webconsole/test/browser/browser_webconsole_csp_ignore_reflected_xss_message.js
index 8acf0a19594c..8139bb18e891 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_csp_ignore_reflected_xss_message.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_csp_ignore_reflected_xss_message.js
@@ -20,7 +20,7 @@ add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
   await navigateTo(TEST_FILE);
 
-  await waitFor(() => findMessage(hud, EXPECTED_RESULT, ".message.warn"));
+  await waitFor(() => findWarningMessage(hud, EXPECTED_RESULT));
   ok(
     true,
     `CSP logs displayed in console when using "reflected-xss" directive`
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_csp_violation.js b/devtools/client/webconsole/test/browser/browser_webconsole_csp_violation.js
index acce48d8d4be..47be234c2191 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_csp_violation.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_csp_violation.js
@@ -37,7 +37,7 @@ add_task(async function() {
     const VIOLATION_LOCATION_JS = "test-csp-violation-inline.html:14:24";
     await navigateTo(TEST_VIOLATION);
     // Triggering the Violation via HTML
-    let msg = await waitFor(() => findMessage(hud, CSP_VIOLATION));
+    let msg = await waitFor(() => findErrorMessage(hud, CSP_VIOLATION));
     let locationNode = msg.querySelector(".message-location");
     info(`EXPECT ${VIOLATION_LOCATION_HTML} GOT: ${locationNode.textContent}`);
     ok(
@@ -67,7 +67,7 @@ add_task(async function() {
     const CSP_VIOLATION = `Content Security Policy: The page’s settings blocked the loading of a resource at https://evil.com/ (“base-uri”).`;
     const VIOLATION_LOCATION = "test-csp-violation-base-uri.html:15:24";
     await navigateTo(TEST_VIOLATION);
-    let msg = await waitFor(() => findMessage(hud, CSP_VIOLATION));
+    let msg = await waitFor(() => findErrorMessage(hud, CSP_VIOLATION));
     ok(msg, "Base-URI validation was Printed");
     // Triggering the Violation via JS
     await clearOutput(hud);
@@ -93,7 +93,7 @@ add_task(async function() {
     const VIOLATION_LOCATION = "test-csp-violation-form-action.html:14:39";
 
     await navigateTo(TEST_VIOLATION);
-    const msg = await waitFor(() => findMessage(hud, CSP_VIOLATION));
+    const msg = await waitFor(() => findErrorMessage(hud, CSP_VIOLATION));
     const locationNode = msg.querySelector(".message-location");
     info(`EXPECT ${VIOLATION_LOCATION} GOT: ${locationNode.textContent}`);
     ok(
@@ -111,7 +111,7 @@ add_task(async function() {
       `Content Security Policy: The page’s settings blocked` +
       ` the loading of a resource at ${TEST_VIOLATION} (“frame-ancestors”).`;
     await navigateTo(TEST_VIOLATION);
-    const msg = await waitFor(() => findMessage(hud, CSP_VIOLATION));
+    const msg = await waitFor(() => findErrorMessage(hud, CSP_VIOLATION));
     ok(msg, "Frame-Ancestors violation by html was printed");
   }
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_css_error_impacted_elements.js b/devtools/client/webconsole/test/browser/browser_webconsole_css_error_impacted_elements.js
index 288fbcc49dfc..91a657c7ffea 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_css_error_impacted_elements.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_css_error_impacted_elements.js
@@ -48,7 +48,7 @@ add_task(async function() {
 
   info("Check the CSS warning message for the top level document");
   let messageNode = await waitFor(() =>
-    findMessage(hud, "Error in parsing value for ‘cursor’", ".message.css")
+    findWarningMessage(hud, "Error in parsing value for ‘cursor’", ".css")
   );
 
   info("Click on the expand arrow");
@@ -88,7 +88,7 @@ add_task(async function() {
 
   info("Check the CSS warning message for the third-party iframe");
   messageNode = await waitFor(() =>
-    findMessage(hud, "Error in parsing value for ‘color’", ".message.css")
+    findWarningMessage(hud, "Error in parsing value for ‘color’", ".css")
   );
 
   info("Click on the expand arrow");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_duplicate_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_duplicate_errors.js
index 556cdf75defe..46247a2a3d7e 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_duplicate_errors.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_duplicate_errors.js
@@ -18,7 +18,7 @@ add_task(async function() {
   }
   const hud = await openNewTabAndConsole(TEST_URI);
 
-  await waitFor(() => findMessage(hud, "fooDuplicateError1", ".message.error"));
+  await waitFor(() => findErrorMessage(hud, "fooDuplicateError1"));
 
   const errorMessages = hud.ui.outputNode.querySelectorAll(".message.error");
   is(
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_error_with_grouped_stack.js b/devtools/client/webconsole/test/browser/browser_webconsole_error_with_grouped_stack.js
index 125fff38c577..bb0e70ec524c 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_error_with_grouped_stack.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_error_with_grouped_stack.js
@@ -18,7 +18,7 @@ add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
 
   info("Wait for the error to be logged");
-  const msgNode = await waitFor(() => findMessage(hud, MESSAGE));
+  const msgNode = await waitFor(() => findConsoleAPIMessage(hud, MESSAGE));
   ok(!msgNode.classList.contains("open"), `Error logged not expanded`);
 
   const groupNode = await waitFor(() => msgNode.querySelector(".group"));
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_error_with_longstring_stack.js b/devtools/client/webconsole/test/browser/browser_webconsole_error_with_longstring_stack.js
index 2b39ff6b60f9..9a703c46e6a1 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_error_with_longstring_stack.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_error_with_longstring_stack.js
@@ -16,7 +16,7 @@ add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
 
   info("Wait for the error to be logged");
-  const msgNode = await waitFor(() => findMessage(hud, MESSAGE));
+  const msgNode = await waitFor(() => findConsoleAPIMessage(hud, MESSAGE));
   ok(msgNode, `Error logged`);
 
   const errorNode = msgNode.querySelector(".objectBox-stackTrace");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_error_with_unicode.js b/devtools/client/webconsole/test/browser/browser_webconsole_error_with_unicode.js
index b78c46c17337..3c96f2b7d299 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_error_with_unicode.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_error_with_unicode.js
@@ -20,6 +20,6 @@ add_task(async function() {
 
   info("generate exception and wait for the message");
 
-  const msg = await waitFor(() => findMessage(hud, EXPECTED_REPORT));
+  const msg = await waitFor(() => findErrorMessage(hud, EXPECTED_REPORT));
   ok(msg, `Message found: "${EXPECTED_REPORT}"`);
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_error_with_url.js b/devtools/client/webconsole/test/browser/browser_webconsole_error_with_url.js
index 787832485613..73c2daaf5bee 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_error_with_url.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_error_with_url.js
@@ -35,7 +35,7 @@ add_task(async function() {
 
   const EXPECTED_MESSAGE = `get more information on this error`;
 
-  const msg = await waitFor(() => findMessage(hud, EXPECTED_MESSAGE));
+  const msg = await waitFor(() => findErrorMessage(hud, EXPECTED_MESSAGE));
   ok(msg, `Link in error message are cropped as expected`);
 
   const [comLink, orgLink] = Array.from(msg.querySelectorAll("a"));
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_eval_error.js b/devtools/client/webconsole/test/browser/browser_webconsole_eval_error.js
index 28a1fe575538..c42793342923 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_eval_error.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_eval_error.js
@@ -48,7 +48,7 @@ add_task(async function() {
     `Uncaught Object { fav: "eggplant" }`
   );
   info("Check that object in errors can be expanded");
-  const rejectedObjectMessage = findMessage(hud, "eggplant", ".error");
+  const rejectedObjectMessage = findErrorMessage(hud, "eggplant");
   const oi = rejectedObjectMessage.querySelector(".tree");
   ok(true, "The object was rendered in an ObjectInspector");
 
@@ -78,7 +78,7 @@ add_task(async function() {
 
   execute(hud, `1 + @`);
   const messageNode = await waitFor(() =>
-    findMessage(hud, "illegal character U+0040")
+    findErrorMessage(hud, "illegal character U+0040")
   );
   is(
     messageNode.querySelector(".frames"),
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_eval_sources.js b/devtools/client/webconsole/test/browser/browser_webconsole_eval_sources.js
index d91ef5e03e7b..3b5466e2c13a 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_eval_sources.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_eval_sources.js
@@ -14,7 +14,7 @@ add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
   const toolbox = await gDevTools.getToolboxForTab(gBrowser.selectedTab);
 
-  let messageNode = await waitFor(() => findMessage(hud, "BAR"));
+  let messageNode = await waitFor(() => findErrorMessage(hud, "BAR"));
   await clickFirstStackElement(hud, messageNode, true);
 
   const dbg = toolbox.getPanel("jsdebugger");
@@ -33,7 +33,7 @@ add_task(async function() {
   await testOpenInDebugger(hud, toolbox, "BAZ", false);
 
   // Test that stacks in console.trace() calls work.
-  messageNode = await waitFor(() => findMessage(hud, "TRACE"));
+  messageNode = await waitFor(() => findConsoleAPIMessage(hud, "TRACE"));
   await clickFirstStackElement(hud, messageNode, false);
 
   is(
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_filter_by_input.js b/devtools/client/webconsole/test/browser/browser_webconsole_filter_by_input.js
index d143684558db..708bf503415c 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_filter_by_input.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_filter_by_input.js
@@ -66,8 +66,8 @@ add_task(async function() {
   const lastSeason = SEASONS[SEASONS.length - 1];
   await waitFor(
     () =>
-      findMessage(hud, lastSeason.english) &&
-      findMessage(hud, lastSeason.chinese)
+      findConsoleAPIMessage(hud, lastSeason.english) &&
+      findConsoleAPIMessage(hud, lastSeason.chinese)
   );
 
   // One external Javascript file outputs every season name in English, and the
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_filter_by_regex_input.js b/devtools/client/webconsole/test/browser/browser_webconsole_filter_by_regex_input.js
index 7b46faaf4e4c..8e8ea435bc39 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_filter_by_regex_input.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_filter_by_regex_input.js
@@ -20,7 +20,7 @@ add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
   const { outputNode } = hud.ui;
 
-  await waitFor(() => findMessage(hud, MESSAGES[5]), null, 200);
+  await waitFor(() => findConsoleAPIMessage(hud, MESSAGES[5]), null, 200);
 
   let filteredNodes;
 
@@ -89,7 +89,7 @@ add_task(async function() {
 
 async function setFilterInput(hud, value, lastMessage) {
   await setFilterState(hud, { text: value });
-  await waitFor(() => findMessage(hud, lastMessage), null, 200);
+  await waitFor(() => findConsoleAPIMessage(hud, lastMessage), null, 200);
 }
 
 function checkFilteredMessages(filteredNodes, expectedMessages, expectedCount) {
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_filter_groups.js b/devtools/client/webconsole/test/browser/browser_webconsole_filter_groups.js
index 0e066eeecfbd..79401600828f 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_filter_groups.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_filter_groups.js
@@ -12,7 +12,9 @@ const TEST_URI =
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
 
-  await waitFor(() => findMessage(hud, "[a]") && findMessage(hud, "[j]"));
+  await waitFor(
+    () => findConsoleAPIMessage(hud, "[a]") && findConsoleAPIMessage(hud, "[j]")
+  );
 
   /*
    * The output looks like the following:
@@ -214,7 +216,7 @@ add_task(async function() {
     text: "",
   });
 
-  const subGroup = findMessage(hud, "[subgroup]");
+  const subGroup = findConsoleAPIMessage(hud, "[subgroup]");
   toggleGroup(subGroup);
 
   await setFilterState(hud, {
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_filter_navigation_marker.js b/devtools/client/webconsole/test/browser/browser_webconsole_filter_navigation_marker.js
index 542e0e2d9728..80f73823282a 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_filter_navigation_marker.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_filter_navigation_marker.js
@@ -15,7 +15,7 @@ add_task(async function() {
 
   const hud = await openNewTabAndConsole(TEST_URI);
   await waitFor(
-    () => findMessage(hud, "hello world"),
+    () => findConsoleAPIMessage(hud, "hello world"),
     "Wait for log message to be rendered"
   );
   ok(true, "Log message rendered");
@@ -27,13 +27,13 @@ add_task(async function() {
 
   // Wait for the navigation message to be displayed.
   await waitFor(
-    () => findMessage(hud, "Navigated to"),
+    () => findMessageByType(hud, "Navigated to", ".navigationMarker"),
     "Wait for navigation message to be rendered"
   );
 
   // Wait for 2 hellow world messages to be displayed.
   await waitFor(
-    () => findMessages(hud, "hello world").length == 2,
+    () => findConsoleAPIMessages(hud, "hello world").length == 2,
     "Wait for log message to be rendered after navigation"
   );
 
@@ -47,11 +47,11 @@ add_task(async function() {
   });
 
   await waitFor(
-    () => !findMessage(hud, "hello world"),
+    () => !findConsoleAPIMessage(hud, "hello world"),
     "Wait for the log messages to be hidden"
   );
   ok(
-    findMessage(hud, "Navigated to"),
+    findMessageByType(hud, "Navigated to", ".navigationMarker"),
     "The navigation marker is still visible"
   );
 
@@ -60,7 +60,7 @@ add_task(async function() {
   await navigateTo(newUrl);
   // Wait for the navigation message to be displayed.
   await waitFor(
-    () => findMessage(hud, "Navigated to " + newUrl),
+    () => findMessageByType(hud, "Navigated to " + newUrl, ".navigationMarker"),
     "Wait for example.net navigation message to be rendered"
   );
   ok(true, "Navigation message for example.net was displayed as expected");
@@ -70,7 +70,7 @@ add_task(async function() {
   await navigateTo(newUrl);
   // Wait for the navigation message to be displayed.
   await waitFor(
-    () => findMessage(hud, "Navigated to " + newUrl),
+    () => findMessageByType(hud, "Navigated to " + newUrl, ".navigationMarker"),
     "Wait for example.com navigation message to be rendered"
   );
   ok(true, "Navigation message for example.com was displayed as expected");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_filter_scroll.js b/devtools/client/webconsole/test/browser/browser_webconsole_filter_scroll.js
index 6dbf944c9678..9d500dddcba6 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_filter_scroll.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_filter_scroll.js
@@ -17,7 +17,7 @@ add_task(async function() {
   const outputContainer = ui.outputNode.querySelector(".webconsole-output");
 
   info("Console should be scrolled to bottom on initial load from page logs");
-  await waitFor(() => findMessage(hud, "init-99"));
+  await waitFor(() => findConsoleAPIMessage(hud, "init-99"));
   ok(hasVerticalOverflow(outputContainer), "There is a vertical overflow");
   ok(
     isScrolledToBottom(outputContainer),
@@ -28,7 +28,7 @@ add_task(async function() {
     "Filter out some messages and check that the scroll position is not impacted"
   );
   let onMessagesFiltered = waitFor(
-    () => !findMessage(hud, "init-0"),
+    () => !findConsoleAPIMessage(hud, "init-0"),
     null,
     200
   );
@@ -43,7 +43,7 @@ add_task(async function() {
     "Clear the text filter and check that the scroll position is not impacted"
   );
   let onMessagesUnFiltered = waitFor(
-    () => findMessage(hud, "init-0"),
+    () => findConsoleAPIMessage(hud, "init-0"),
     null,
     200
   );
@@ -64,7 +64,7 @@ add_task(async function() {
 
   await setFilterState(hud, { text: "init-9" });
   onMessagesFiltered = waitFor(
-    async () => !findMessage(hud, "init-0"),
+    async () => !findConsoleAPIMessage(hud, "init-0"),
     null,
     200
   );
@@ -78,7 +78,11 @@ add_task(async function() {
   info(
     "Clear the text filter and check that the scroll position is not impacted"
   );
-  onMessagesUnFiltered = waitFor(() => findMessage(hud, "init-0"), null, 200);
+  onMessagesUnFiltered = waitFor(
+    () => findConsoleAPIMessage(hud, "init-0"),
+    null,
+    200
+  );
   await setFilterState(hud, { text: "" });
   await onMessagesUnFiltered;
   is(
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_filters.js b/devtools/client/webconsole/test/browser/browser_webconsole_filters.js
index b8219d480cf9..c2549186e9dd 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_filters.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_filters.js
@@ -25,8 +25,8 @@ add_task(async function() {
   });
 
   // Wait for the messages
-  await waitFor(() => findMessage(hud, "status=404", ".network.error"));
-  await waitFor(() => findMessage(hud, "status=500", ".network.error"));
+  await waitFor(() => findErrorMessage(hud, "status=404", ".network"));
+  await waitFor(() => findErrorMessage(hud, "status=500", ".network"));
 
   // Check defaults.
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_filters_persist.js b/devtools/client/webconsole/test/browser/browser_webconsole_filters_persist.js
index 8d1a7b228fa8..c14661f1e024 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_filters_persist.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_filters_persist.js
@@ -32,7 +32,9 @@ add_task(async function() {
   });
 
   // Wait for the CSS warning to be displayed so we don't have a pending promise.
-  await waitFor(() => findMessage(hud, "Expected color but found ‘blouge’"));
+  await waitFor(() =>
+    findWarningMessage(hud, "Expected color but found ‘blouge’")
+  );
 
   info("Close and re-open the console");
   await closeTabAndToolbox();
@@ -45,7 +47,9 @@ add_task(async function() {
   });
 
   // Wait for the CSS warning to be displayed so we don't have a pending promise.
-  await waitFor(() => findMessage(hud, "Expected color but found ‘blouge’"));
+  await waitFor(() =>
+    findWarningMessage(hud, "Expected color but found ‘blouge’")
+  );
 
   // Check that the ui settings were persisted.
   await closeTabAndToolbox();
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_iframe_wrong_hud.js b/devtools/client/webconsole/test/browser/browser_webconsole_iframe_wrong_hud.js
index e8f4a609a8af..515609d74565 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_iframe_wrong_hud.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_iframe_wrong_hud.js
@@ -29,11 +29,11 @@ add_task(async function() {
   await reloadBrowser({ browser: tab1.linkedBrowser });
 
   info("Waiting for messages");
-  await waitFor(() => findMessage(hud1, TEST_IFRAME_URI, ".message.network"));
+  await waitFor(() => findMessageByType(hud1, TEST_IFRAME_URI, ".network"));
 
   const hud2 = await openConsole(tab2);
   is(
-    findMessage(hud2, TEST_IFRAME_URI),
+    findMessageByType(hud2, TEST_IFRAME_URI, ".network"),
     undefined,
     "iframe network request is not displayed in tab2"
   );
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_ineffective_iframe_sandbox_warning.js b/devtools/client/webconsole/test/browser/browser_webconsole_ineffective_iframe_sandbox_warning.js
index 39e907a5253e..a24210a13647 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_ineffective_iframe_sandbox_warning.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_ineffective_iframe_sandbox_warning.js
@@ -44,11 +44,7 @@ async function testWarningMessageVisibility(uri, visible) {
   });
   await onSentinelMessage;
 
-  const warning = findMessage(
-    hud,
-    INEFFECTIVE_IFRAME_SANDBOXING_MSG,
-    ".message.warn"
-  );
+  const warning = findWarningMessage(hud, INEFFECTIVE_IFRAME_SANDBOXING_MSG);
   is(
     !!warning,
     visible,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_input_focus.js b/devtools/client/webconsole/test/browser/browser_webconsole_input_focus.js
index fa9e9b846776..6ec566e6929b 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_input_focus.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_input_focus.js
@@ -32,7 +32,9 @@ add_task(async function() {
   SpecialPowers.spawn(gBrowser.selectedBrowser, [], function() {
     content.wrappedJSObject.console.log("console message 2");
   });
-  const msg = await waitFor(() => findMessage(hud, "console message 2"));
+  const msg = await waitFor(() =>
+    findConsoleAPIMessage(hud, "console message 2")
+  );
   ok(isInputFocused(hud), "input node is focused, first time");
 
   // Checking that there's still a selection in the input
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js b/devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js
index b2f30ab04d50..f7b87ad57b11 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js
@@ -17,10 +17,6 @@ const INSECURE_PASSWORD_MSG =
 add_task(async function() {
   await pushPref("dom.security.https_first", false);
   const hud = await openNewTabAndConsole(TEST_URI);
-  await waitFor(
-    () => findMessage(hud, INSECURE_PASSWORD_MSG, ".message.warn"),
-    "",
-    100
-  );
+  await waitFor(() => findWarningMessage(hud, INSECURE_PASSWORD_MSG), "", 100);
   ok(true, "Insecure password error displayed successfully");
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_web_console_warning.js b/devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_web_console_warning.js
index 12c43e73f97b..ff4b8a1e82d6 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_web_console_warning.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_web_console_warning.js
@@ -42,9 +42,7 @@ add_task(async function() {
 
 async function testUriWarningMessage(uri, warningMessage) {
   const hud = await openNewTabAndConsole(uri);
-  const message = await waitFor(() =>
-    findMessage(hud, warningMessage, ".message.warn")
-  );
+  const message = await waitFor(() => findWarningMessage(hud, warningMessage));
   ok(message, "Warning message displayed successfully");
   await testLearnMoreLinkClick(message, INSECURE_PASSWORDS_URI);
 }
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_inspect_cross_domain_object.js b/devtools/client/webconsole/test/browser/browser_webconsole_inspect_cross_domain_object.js
index ae4f6a6bb13a..ea14c97c6585 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_inspect_cross_domain_object.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_inspect_cross_domain_object.js
@@ -24,7 +24,7 @@ add_task(async function() {
     // is being switched, so here we directly open the "real" test URI. See Bug 1614291.
     hud = await openNewTabAndConsole(TEST_URI);
     info("Wait for the 'foobar' message to be logged by the frame");
-    node = await waitFor(() => findMessage(hud, "foobar"));
+    node = await waitFor(() => findConsoleAPIMessage(hud, "foobar"));
   } else {
     hud = await openNewTabAndConsole(
       "data:text/html;charset=utf8,<!DOCTYPE html><p>hello"
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_keyboard_accessibility.js b/devtools/client/webconsole/test/browser/browser_webconsole_keyboard_accessibility.js
index fbfa8f7fb6fb..707e2c467a43 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_keyboard_accessibility.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_keyboard_accessibility.js
@@ -18,7 +18,7 @@ add_task(async function() {
   info("Web Console opened");
   const outputScroller = hud.ui.outputScroller;
   await waitFor(
-    () => findMessage(hud, "console message 100"),
+    () => findConsoleAPIMessage(hud, "console message 100"),
     "waiting for all the messages to be displayed",
     100,
     1000
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_location_styleeditor_link.js b/devtools/client/webconsole/test/browser/browser_webconsole_location_styleeditor_link.js
index 14660009f082..81ee713fe3b3 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_location_styleeditor_link.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_location_styleeditor_link.js
@@ -27,7 +27,7 @@ add_task(async function() {
 async function testViewSource(hud, toolbox, text) {
   info(`Testing message with text "${text}"`);
   const messageNode = await waitFor(
-    () => findMessage(hud, text),
+    () => findWarningMessage(hud, text),
     `couldn't find message containing "${text}"`
   );
   const messageLocationNode = messageNode.querySelector(".message-location");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_logErrorInPage.js b/devtools/client/webconsole/test/browser/browser_webconsole_logErrorInPage.js
index 2684efa19ecc..fef02703e0ed 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_logErrorInPage.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_logErrorInPage.js
@@ -14,7 +14,7 @@ add_task(async function() {
 
   toolbox.target.logErrorInPage("beware the octopus", "content javascript");
 
-  const node = await waitFor(() => findMessage(hud, "octopus"));
+  const node = await waitFor(() => findErrorMessage(hud, "octopus"));
   ok(node, "text is displayed in web console");
   ok(node.classList.contains("error"), "the log represents an error");
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_logWarningInPage.js b/devtools/client/webconsole/test/browser/browser_webconsole_logWarningInPage.js
index a4c7563f4fe4..e2b4d3467f76 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_logWarningInPage.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_logWarningInPage.js
@@ -14,7 +14,7 @@ add_task(async function() {
 
   toolbox.target.logWarningInPage("beware the octopus", "content javascript");
 
-  const node = await waitFor(() => findMessage(hud, "octopus"));
+  const node = await waitFor(() => findWarningMessage(hud, "octopus"));
   ok(node, "text is displayed in web console");
   ok(node.classList.contains("warn"), "the log represents a warning");
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_longstring.js b/devtools/client/webconsole/test/browser/browser_webconsole_longstring.js
index 64b64e565a76..2980fdc44bd1 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_longstring.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_longstring.js
@@ -27,7 +27,7 @@ add_task(async function() {
 
   info("wait for long string expansion");
   const onLongStringFullTextDisplayed = waitFor(() =>
-    findMessage(hud, LONGSTRING)
+    findConsoleAPIMessage(hud, LONGSTRING)
   );
   arrow.click();
   await onLongStringFullTextDisplayed;
@@ -35,7 +35,9 @@ add_task(async function() {
   ok(true, "The full text of the longString is displayed");
 
   info("wait for long string collapse");
-  const onLongStringCollapsed = waitFor(() => !findMessage(hud, LONGSTRING));
+  const onLongStringCollapsed = waitFor(
+    () => !findConsoleAPIMessage(hud, LONGSTRING)
+  );
   arrow.click();
   await onLongStringCollapsed;
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_longstring_getter.js b/devtools/client/webconsole/test/browser/browser_webconsole_longstring_getter.js
index 5b893c408cd7..c49a46e92b31 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_longstring_getter.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_longstring_getter.js
@@ -18,7 +18,9 @@ add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
 
   // Retrieve the logged message.
-  const message = await waitFor(() => findMessage(hud, "Test message"));
+  const message = await waitFor(() =>
+    findConsoleAPIMessage(hud, "Test message")
+  );
 
   // Wait until the SVGAnimatedString is expanded.
   await waitFor(() => message.querySelectorAll(".arrow").length > 1);
@@ -28,7 +30,7 @@ add_task(async function() {
 
   info("wait for long string expansion");
   const onLongStringFullTextDisplayed = waitFor(() =>
-    findMessage(hud, LONGSTRING)
+    findConsoleAPIMessage(hud, LONGSTRING)
   );
   arrow.click();
   await onLongStringFullTextDisplayed;
@@ -36,7 +38,9 @@ add_task(async function() {
   ok(true, "The full text of the longString is displayed");
 
   info("wait for long string collapse");
-  const onLongStringCollapsed = waitFor(() => !findMessage(hud, LONGSTRING));
+  const onLongStringCollapsed = waitFor(
+    () => !findConsoleAPIMessage(hud, LONGSTRING)
+  );
   arrow.click();
   await onLongStringCollapsed;
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_mime_css_blocked.js b/devtools/client/webconsole/test/browser/browser_webconsole_mime_css_blocked.js
index 65b943ace92a..3ff9d995bc52 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_mime_css_blocked.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_mime_css_blocked.js
@@ -11,6 +11,6 @@ const TEST_URI = `data:text/html,<!DOCTYPE html><link rel="stylesheet" href="${C
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
   const MSG = `The stylesheet ${CSS_URI} was not loaded because its MIME type, “text/bogus”, is not “text/css”`;
-  await waitFor(() => findMessage(hud, MSG, ".message.error"), "", 100);
+  await waitFor(() => findErrorMessage(hud, MSG), "", 100);
   ok(true, "MIME type error displayed");
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_network_attach.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_attach.js
index 53a638aaaffe..4c075b38e562 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_network_attach.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_attach.js
@@ -41,7 +41,9 @@ add_task(async function task() {
   const { hud } = await toolbox.selectTool("webconsole");
 
   const xhrUrl = TEST_PATH + "test-data.json";
-  const messageNode = await waitFor(() => findMessage(hud, xhrUrl));
+  const messageNode = await waitFor(() =>
+    findMessageByType(hud, xhrUrl, ".network")
+  );
   const urlNode = messageNode.querySelector(".url");
   info("Network message found.");
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_network_message_ctrl_click.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_message_ctrl_click.js
index 5ba319c4f755..41d189f70511 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_network_message_ctrl_click.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_message_ctrl_click.js
@@ -19,7 +19,9 @@ add_task(async function() {
   await SpecialPowers.spawn(gBrowser.selectedBrowser, [], () => {
     content.wrappedJSObject.location.reload();
   });
-  const message = await waitFor(() => findMessage(hud, "test-console.html"));
+  const message = await waitFor(() =>
+    findMessageByType(hud, "test-console.html", ".network")
+  );
   ok(message, "Network log found in the console");
 
   const currentTab = gBrowser.selectedTab;
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_resend_request.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_resend_request.js
index d4c6f04de540..ab201755f39f 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_resend_request.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_resend_request.js
@@ -28,7 +28,9 @@ add_task(async function task() {
   await navigateTo(documentUrl);
   info("Document loaded.");
 
-  const message = await waitFor(() => findMessage(hud, documentUrl));
+  const message = await waitFor(() =>
+    findMessageByType(hud, documentUrl, ".network")
+  );
 
   const menuPopup = await openContextMenu(hud, message);
   const openResendRequestMenuItem = menuPopup.querySelector(
@@ -38,7 +40,9 @@ add_task(async function task() {
 
   // Wait for message containing the resent request url
   openResendRequestMenuItem.click();
-  await waitFor(() => findMessages(hud, documentUrl).length === 2);
+  await waitFor(
+    () => findMessagesByType(hud, documentUrl, ".network").length === 2
+  );
 
   ok(true, "The resent request url is correct.");
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_status_code.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_status_code.js
index b642d0838871..ef00a3b1de6d 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_status_code.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_status_code.js
@@ -39,7 +39,9 @@ add_task(async function task() {
   await onNetworkMessageUpdate;
 
   const xhrUrl = TEST_PATH + "test-data.json";
-  const messageNode = await waitFor(() => findMessage(hud, xhrUrl, ".network"));
+  const messageNode = await waitFor(() =>
+    findMessageByType(hud, xhrUrl, ".network")
+  );
   ok(!!messageNode, "Network message found.");
 
   const statusCodeNode = await waitFor(() =>
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_nodes_highlight.js b/devtools/client/webconsole/test/browser/browser_webconsole_nodes_highlight.js
index 6a716b882e6b..1a8670eb4c1c 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_nodes_highlight.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_nodes_highlight.js
@@ -34,7 +34,7 @@ add_task(async function() {
     content.wrappedJSObject.logNode("h1");
   });
 
-  const msg = await waitFor(() => findMessage(hud, "<h1>"));
+  const msg = await waitFor(() => findConsoleAPIMessage(hud, "<h1>"));
   const node = msg.querySelector(".objectBox-node");
   ok(node !== null, "Node was logged as expected");
   const view = node.ownerDocument.defaultView;
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_nodes_select.js b/devtools/client/webconsole/test/browser/browser_webconsole_nodes_select.js
index cd93c8e9da32..4cc629fd3c63 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_nodes_select.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_nodes_select.js
@@ -34,7 +34,7 @@ add_task(async function() {
     content.wrappedJSObject.logNode("h1");
   });
 
-  const msg = await waitFor(() => findMessage(hud, "<h1>"));
+  const msg = await waitFor(() => findConsoleAPIMessage(hud, "<h1>"));
   const node = msg.querySelector(".objectBox-node");
   ok(node !== null, "Node was logged as expected");
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_warning.js b/devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_warning.js
index a4c56ab5d6a9..541a62777bac 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_warning.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_warning.js
@@ -15,10 +15,6 @@ const MIME_WARNING_MSG =
 
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
-  await waitFor(
-    () => findMessage(hud, MIME_WARNING_MSG, ".message.warn"),
-    "",
-    100
-  );
+  await waitFor(() => findWarningMessage(hud, MIME_WARNING_MSG), "", 100);
   ok(true, "MIME type warning displayed");
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_worker_error.js b/devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_worker_error.js
index c0da968c0566..0bfca53e2e65 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_worker_error.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_worker_error.js
@@ -20,15 +20,7 @@ const MIME_ERROR_MSG2 = `Loading script from “${JS_URI}” with importScripts(
 
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
-  await waitFor(
-    () => findMessage(hud, MIME_ERROR_MSG1, ".message.error"),
-    "",
-    100
-  );
-  await waitFor(
-    () => findMessage(hud, MIME_ERROR_MSG2, ".message.error"),
-    "",
-    100
-  );
+  await waitFor(() => findErrorMessage(hud, MIME_ERROR_MSG1), "", 100);
+  await waitFor(() => findErrorMessage(hud, MIME_ERROR_MSG2), "", 100);
   ok(true, "MIME type error displayed");
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_non_standard_doctype_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_non_standard_doctype_errors.js
index 44c6387fa28c..4bab0fc1c98e 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_non_standard_doctype_errors.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_non_standard_doctype_errors.js
@@ -23,10 +23,9 @@ add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI_QUIRKY_DOCTYPE);
 
   const quirkyDocTypeMessage = await waitFor(() =>
-    findMessage(
+    findWarningMessage(
       hud,
-      `This page is in Quirks Mode. Page layout may be impacted. For Standards Mode use “<!DOCTYPE html>”`,
-      ".message.warn"
+      `This page is in Quirks Mode. Page layout may be impacted. For Standards Mode use “<!DOCTYPE html>”`
     )
   );
   ok(!!quirkyDocTypeMessage, "Quirky doctype warning message is visible");
@@ -50,10 +49,9 @@ add_task(async function() {
   await navigateTo(TEST_URI_ALMOST_STANDARD_DOCTYPE);
 
   const almostStandardDocTypeMessage = await waitFor(() =>
-    findMessage(
+    findWarningMessage(
       hud,
-      `This page is in Almost Standards Mode. Page layout may be impacted. For Standards Mode use “<!DOCTYPE html>”`,
-      ".message.warn"
+      `This page is in Almost Standards Mode. Page layout may be impacted. For Standards Mode use “<!DOCTYPE html>”`
     )
   );
   ok(
@@ -80,10 +78,9 @@ add_task(async function() {
   await navigateTo(TEST_URI_NO_DOCTYPE);
 
   const noDocTypeMessage = await waitFor(() =>
-    findMessage(
+    findWarningMessage(
       hud,
-      `This page is in Quirks Mode. Page layout may be impacted. For Standards Mode use “<!DOCTYPE html>”`,
-      ".message.warn"
+      `This page is in Quirks Mode. Page layout may be impacted. For Standards Mode use “<!DOCTYPE html>”`
     )
   );
   ok(!!noDocTypeMessage, "No doctype warning message is visible");
@@ -106,7 +103,7 @@ add_task(async function() {
   info("Wait for a bit to make sure there is no doctype messages");
   await wait(1000);
   ok(
-    !findMessage(hud, `doctype`, ".message.warn"),
+    !findWarningMessage(hud, `doctype`),
     "There is no doctype warning message"
   );
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_ctrl_click.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_ctrl_click.js
index b1f330f18ed4..50113a48e47e 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_ctrl_click.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_ctrl_click.js
@@ -20,7 +20,7 @@ add_task(async function() {
 
   const hud = await openNewTabAndConsole(TEST_URI);
 
-  const message = findMessage(hud, "Object");
+  const message = findConsoleAPIMessage(hud, "Object");
   const object = message.querySelector(".object-inspector .objectBox-object");
 
   info("Ctrl+click on an object to put it in the sidebar");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_in_sidebar_keyboard_nav.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_in_sidebar_keyboard_nav.js
index 4dd5a0a94a18..057d3df6a023 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_in_sidebar_keyboard_nav.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_in_sidebar_keyboard_nav.js
@@ -20,7 +20,7 @@ add_task(async function() {
 
   const hud = await openNewTabAndConsole(TEST_URI);
 
-  const message = await waitFor(() => findMessage(hud, "Object"));
+  const message = await waitFor(() => findConsoleAPIMessage(hud, "Object"));
   const object = message.querySelector(".object-inspector .objectBox-object");
 
   const onSideBarVisible = waitFor(() =>
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector.js
index 854657d7a191..7ea87940564f 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector.js
@@ -20,7 +20,7 @@ add_task(async function() {
     });
   });
 
-  const node = await waitFor(() => findMessage(hud, "oi-test"));
+  const node = await waitFor(() => findConsoleAPIMessage(hud, "oi-test"));
   const objectInspectors = [...node.querySelectorAll(".tree")];
   is(
     objectInspectors.length,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector__proto__.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector__proto__.js
index 866d8108afe1..c7e725d28b7e 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector__proto__.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector__proto__.js
@@ -19,7 +19,7 @@ add_task(async function() {
     content.wrappedJSObject.console.log("oi-test", obj);
   });
 
-  const node = await waitFor(() => findMessage(hud, "oi-test"));
+  const node = await waitFor(() => findConsoleAPIMessage(hud, "oi-test"));
   const objectInspector = node.querySelector(".tree");
   ok(objectInspector, "Object is printed in the console");
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_entries.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_entries.js
index 6c17a5cdbea1..a1767cd8a153 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_entries.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_entries.js
@@ -27,7 +27,9 @@ add_task(async function() {
     );
   });
 
-  const node = await waitFor(() => findMessage(hud, "oi-entries-test"));
+  const node = await waitFor(() =>
+    findConsoleAPIMessage(hud, "oi-entries-test")
+  );
   const objectInspectors = [...node.querySelectorAll(".tree")];
   is(
     objectInspectors.length,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters.js
index e43cb7f936c5..361fe9509e7f 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters.js
@@ -82,7 +82,7 @@ add_task(async function() {
     );
   });
 
-  const node = await waitFor(() => findMessage(hud, "oi-test"));
+  const node = await waitFor(() => findConsoleAPIMessage(hud, "oi-test"));
   const oi = node.querySelector(".tree");
 
   expandObjectInspectorNode(oi);
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters_prototype.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters_prototype.js
index 2268d16d6255..766425d99092 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters_prototype.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters_prototype.js
@@ -43,7 +43,7 @@ add_task(async function() {
     content.wrappedJSObject.console.log("oi-test", a, b, c, d);
   });
 
-  const node = await waitFor(() => findMessage(hud, "oi-test"));
+  const node = await waitFor(() => findConsoleAPIMessage(hud, "oi-test"));
   const [a, b, c, d] = node.querySelectorAll(".tree");
 
   await testObject(a, {
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters_shadowed.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters_shadowed.js
index d90efba4b868..946d4e8d6a4c 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters_shadowed.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters_shadowed.js
@@ -39,7 +39,7 @@ add_task(async function() {
     content.wrappedJSObject.console.log("oi-test", a, b);
   });
 
-  const node = await waitFor(() => findMessage(hud, "oi-test"));
+  const node = await waitFor(() => findConsoleAPIMessage(hud, "oi-test"));
   const [a, b] = node.querySelectorAll(".tree");
 
   await testObject(a, [null, "[B]", "[C]"]);
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_local_session_storage.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_local_session_storage.js
index 58fc1f9ea887..ccac1dbb4c5b 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_local_session_storage.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_local_session_storage.js
@@ -27,13 +27,15 @@ async function logMessages(hud) {
   await SpecialPowers.spawn(gBrowser.selectedBrowser, [], () => {
     content.console.log("localStorage", content.localStorage);
   });
-  const localStorageMsg = await waitFor(() => findMessage(hud, "localStorage"));
+  const localStorageMsg = await waitFor(() =>
+    findConsoleAPIMessage(hud, "localStorage")
+  );
 
   await SpecialPowers.spawn(gBrowser.selectedBrowser, [], () => {
     content.console.log("sessionStorage", content.sessionStorage);
   });
   const sessionStorageMsg = await waitFor(() =>
-    findMessage(hud, "sessionStorage")
+    findConsoleAPIMessage(hud, "sessionStorage")
   );
 
   return [localStorageMsg, sessionStorageMsg];
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_promise.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_promise.js
index c251c5435a43..128b8dbf661a 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_promise.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_promise.js
@@ -22,7 +22,7 @@ add_task(async function testExpandNestedPromise() {
     content.wrappedJSObject.console.log("oi-test", nestedPromise);
   });
 
-  const node = await waitFor(() => findMessage(hud, "oi-test"));
+  const node = await waitFor(() => findConsoleAPIMessage(hud, "oi-test"));
   const oi = node.querySelector(".tree");
   const [promiseNode] = getObjectInspectorNodes(oi);
 
@@ -54,7 +54,7 @@ add_task(async function testExpandCyclicPromise() {
     content.wrappedJSObject.console.log("oi-test", cyclicPromise);
   });
 
-  const node = await waitFor(() => findMessage(hud, "oi-test"));
+  const node = await waitFor(() => findConsoleAPIMessage(hud, "oi-test"));
   const oi = node.querySelector(".tree");
   const [promiseNode] = getObjectInspectorNodes(oi);
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_proxy.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_proxy.js
index 7cf1b122420f..60c70af7e4a0 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_proxy.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_proxy.js
@@ -19,7 +19,7 @@ add_task(async function() {
     content.wrappedJSObject.console.log("oi-test", proxy);
   });
 
-  const node = await waitFor(() => findMessage(hud, "oi-test"));
+  const node = await waitFor(() => findConsoleAPIMessage(hud, "oi-test"));
   const oi = node.querySelector(".tree");
   const [proxyNode] = getObjectInspectorNodes(oi);
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_private_properties.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_private_properties.js
index 83250251510f..25240b196df7 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_private_properties.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_private_properties.js
@@ -47,7 +47,9 @@ add_task(async function() {
     );
   });
 
-  const node = await waitFor(() => findMessage(hud, "private-properties-test"));
+  const node = await waitFor(() =>
+    findConsoleAPIMessage(hud, "private-properties-test")
+  );
   const objectInspectors = [...node.querySelectorAll(".tree")];
   is(
     objectInspectors.length,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_scroll.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_scroll.js
index ba56c32d6e09..125127b1c1f7 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_scroll.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_scroll.js
@@ -17,7 +17,7 @@ add_task(async function() {
     );
   });
 
-  const node = await waitFor(() => findMessage(hud, "oi-test"));
+  const node = await waitFor(() => findConsoleAPIMessage(hud, "oi-test"));
   const objectInspector = node.querySelector(".tree");
 
   let onOiMutation = waitForNodeMutation(objectInspector, {
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_symbols.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_symbols.js
index 3e8e5e5cc3f9..7df25918fad5 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_symbols.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_symbols.js
@@ -22,7 +22,9 @@ add_task(async function() {
     });
   });
 
-  const node = await waitFor(() => findMessage(hud, "oi-symbols-test"));
+  const node = await waitFor(() =>
+    findConsoleAPIMessage(hud, "oi-symbols-test")
+  );
   const objectInspectors = [...node.querySelectorAll(".tree")];
   is(
     objectInspectors.length,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_output_order.js b/devtools/client/webconsole/test/browser/browser_webconsole_output_order.js
index b0e1fbd204f2..3c9488f090ea 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_output_order.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_output_order.js
@@ -24,11 +24,11 @@ add_task(async function() {
   // Console messages are batched by the Resource watcher API and might be rendered after
   // the result message.
   const logMessages = await waitFor(() => {
-    const messages = findMessages(hud, "item-", ".log.message:not(.command)");
+    const messages = findConsoleAPIMessages(hud, "item-", ".log");
     return messages.length === 5 ? messages : null;
   });
 
-  const commandMessage = findMessage(hud, "", ".command");
+  const commandMessage = findMessageByType(hud, "", ".command");
   is(
     commandMessage.nextElementSibling,
     logMessages[0],
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_promise_rejected_object.js b/devtools/client/webconsole/test/browser/browser_webconsole_promise_rejected_object.js
index 9dd04d0820fc..3c06192e37fa 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_promise_rejected_object.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_promise_rejected_object.js
@@ -55,7 +55,7 @@ add_task(async function() {
 
   for (const expectedError of expectedErrors) {
     const message = await waitFor(
-      () => findMessage(hud, expectedError, ".error"),
+      () => findErrorMessage(hud, expectedError),
       `Couldn't find «${expectedError}» message`
     );
     ok(message, `Found «${expectedError}» message`);
@@ -93,10 +93,9 @@ add_task(async function() {
   ok(true, "All expected messages were found");
 
   info("Check that object in errors can be expanded");
-  const rejectedObjectMessage = findMessage(
+  const rejectedObjectMessage = findErrorMessage(
     hud,
-    `Uncaught (in promise) Object { fav: "eggplant" }`,
-    ".error"
+    `Uncaught (in promise) Object { fav: "eggplant" }`
   );
   const oi = rejectedObjectMessage.querySelector(".tree");
   ok(true, "The object was rendered in an ObjectInspector");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_reopen_closed_tab.js b/devtools/client/webconsole/test/browser/browser_webconsole_reopen_closed_tab.js
index fa21631050cd..7576628a5052 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_reopen_closed_tab.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_reopen_closed_tab.js
@@ -39,7 +39,7 @@ add_task(async function() {
 
 async function waitForError(hud) {
   info("Wait for error message");
-  await waitFor(() => findMessage(hud, "fooBug597756_error", ".message.error"));
+  await waitFor(() => findErrorMessage(hud, "fooBug597756_error"));
   ok(true, "error message displayed");
 }
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_requestStorageAccess_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_requestStorageAccess_errors.js
index 1f465d2906f7..d71cb12e388d 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_requestStorageAccess_errors.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_requestStorageAccess_errors.js
@@ -81,7 +81,7 @@ add_task(async function() {
 
   async function checkErrorMessage(text) {
     const message = await waitFor(
-      () => findMessage(hud, text, ".message.error"),
+      () => findErrorMessage(hud, text),
       undefined,
       100
     );
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_responsive_design_mode.js b/devtools/client/webconsole/test/browser/browser_webconsole_responsive_design_mode.js
index 7fd5efa7542b..6892494934c8 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_responsive_design_mode.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_responsive_design_mode.js
@@ -29,7 +29,7 @@ add_task(async function() {
   info("Open the console");
   const hud = await openConsole(tab);
   await waitFor(
-    () => findMessage(hud, "Cached message"),
+    () => findConsoleAPIMessage(hud, "Cached message"),
     "Cached message isn't displayed in the console output"
   );
   ok(true, "Cached message is displayed in the console");
@@ -40,7 +40,7 @@ add_task(async function() {
   });
 
   await waitFor(
-    () => findMessage(hud, "Live message"),
+    () => findConsoleAPIMessage(hud, "Live message"),
     "Live message isn't displayed in the console output"
   );
   ok(true, "Live message is displayed in the console");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_sandbox_update_after_navigation.js b/devtools/client/webconsole/test/browser/browser_webconsole_sandbox_update_after_navigation.js
index c0238466fe3f..0f247bd17082 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_sandbox_update_after_navigation.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_sandbox_update_after_navigation.js
@@ -27,7 +27,10 @@ add_task(async function() {
   // load second url
   await navigateTo(TEST_URI2);
 
-  ok(!findMessage(hud, "Permission denied"), "no permission denied errors");
+  ok(
+    !findErrorMessage(hud, "Permission denied"),
+    "no permission denied errors"
+  );
 
   info("wait for window.location.href after page navigation");
   await clearOutput(hud);
@@ -38,7 +41,10 @@ add_task(async function() {
     ".result"
   );
 
-  ok(!findMessage(hud, "Permission denied"), "no permission denied errors");
+  ok(
+    !findErrorMessage(hud, "Permission denied"),
+    "no permission denied errors"
+  );
 
   // Navigation clears messages. Wait for that clear to happen before
   // continuing the test or it might destroy messages we wait later on (Bug
@@ -61,5 +67,8 @@ add_task(async function() {
     ".result"
   );
 
-  ok(!findMessage(hud, "Permission denied"), "no permission denied errors");
+  ok(
+    !findErrorMessage(hud, "Permission denied"),
+    "no permission denied errors"
+  );
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_script_errordoc_urls.js b/devtools/client/webconsole/test/browser/browser_webconsole_script_errordoc_urls.js
index b1395f9f8e99..6f8a9972f5a0 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_script_errordoc_urls.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_script_errordoc_urls.js
@@ -18,12 +18,14 @@ const TestData = [
     jsmsg: "JSMSG_READ_ONLY",
     script:
       "'use strict'; (Object.freeze({name: 'Elsa', score: 157})).score = 0;",
+    selector: ".error",
     isException: true,
     expected: 'TypeError: "score" is read-only',
   },
   {
     jsmsg: "JSMSG_STMT_AFTER_RETURN",
     script: "function a() { return; 1 + 1; };",
+    selector: ".warn",
     isException: false,
     expected: "unreachable code after return statement",
   },
@@ -47,7 +49,9 @@ async function testScriptError(hud, testData) {
 
   const msg = "the expected error message was displayed";
   info(`waiting for ${msg} to be displayed`);
-  await waitFor(() => findMessage(hud, testData.expected));
+  await waitFor(() =>
+    findMessageByType(hud, testData.expected, testData.selector)
+  );
   ok(true, msg);
 
   // grab the most current error doc URL.
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_scroll.js b/devtools/client/webconsole/test/browser/browser_webconsole_scroll.js
index 79808063af9e..0bf4477f8487 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_scroll.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_scroll.js
@@ -23,7 +23,7 @@ add_task(async function() {
   const outputContainer = ui.outputNode.querySelector(".webconsole-output");
 
   info("Console should be scrolled to bottom on initial load from page logs");
-  await waitFor(() => findMessage(hud, "init-100"));
+  await waitFor(() => findConsoleAPIMessage(hud, "init-100"));
   ok(hasVerticalOverflow(outputContainer), "There is a vertical overflow");
   ok(
     isScrolledToBottom(outputContainer),
@@ -40,7 +40,7 @@ add_task(async function() {
   await reloadBrowser();
 
   info("Console should be scrolled to bottom after refresh from page logs");
-  await waitFor(() => findMessage(hud, "init-100"));
+  await waitFor(() => findConsoleAPIMessage(hud, "init-100"));
   ok(hasVerticalOverflow(outputContainer), "There is a vertical overflow");
   ok(
     isScrolledToBottom(outputContainer),
@@ -357,7 +357,9 @@ function isScrolledToBottom(container) {
 // LazyMessageList are disregarded.
 function allTraceMessagesAreExpanded(hud) {
   return (
-    findMessage(hud, "trace in C 100") &&
-    findMessages(hud, "trace in C").every(m => m.querySelector(".frames"))
+    findConsoleAPIMessage(hud, "trace in C 100") &&
+    findConsoleAPIMessages(hud, "trace in C").every(m =>
+      m.querySelector(".frames")
+    )
   );
 }
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_show_subresource_security_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_show_subresource_security_errors.js
index 0879bb8c19be..0106c75967c3 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_show_subresource_security_errors.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_show_subresource_security_errors.js
@@ -17,7 +17,7 @@ add_task(async function() {
   await clearOutput(hud);
   await navigateTo(TEST_DOC);
 
-  await waitFor(() => findMessage(hud, SAMPLE_MSG, ".message.warn"));
+  await waitFor(() => findWarningMessage(hud, SAMPLE_MSG));
 
   ok(true, "non-toplevel security warning message was displayed");
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_shows_reqs_in_netmonitor.js b/devtools/client/webconsole/test/browser/browser_webconsole_shows_reqs_in_netmonitor.js
index e696904e722c..8661ee3a568c 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_shows_reqs_in_netmonitor.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_shows_reqs_in_netmonitor.js
@@ -41,7 +41,7 @@ add_task(async function() {
 
   // We can't use `waitForMessages` here because the `new-messages` event
   // can be emitted before we get the `hud`.
-  await waitFor(() => findMessage(hud, TEST_PATH));
+  await waitFor(() => findMessageByType(hud, TEST_PATH, ".network"));
 
   ok(true, "The network message was found in the console");
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_sidebar_object_expand_when_message_pruned.js b/devtools/client/webconsole/test/browser/browser_webconsole_sidebar_object_expand_when_message_pruned.js
index d869233d98e4..c1038d882ac1 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_sidebar_object_expand_when_message_pruned.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_sidebar_object_expand_when_message_pruned.js
@@ -19,7 +19,7 @@ add_task(async function() {
 
   const hud = await openNewTabAndConsole(TEST_URI);
 
-  const message = await waitFor(() => findMessage(hud, "Object"));
+  const message = await waitFor(() => findConsoleAPIMessage(hud, "Object"));
   const object = message.querySelector(".object-inspector .objectBox-object");
 
   const sidebar = await showSidebarWithContextMenu(hud, object, true);
@@ -42,7 +42,7 @@ add_task(async function() {
   });
   await onMessage;
 
-  ok(!findMessage(hud, "Object"), "Message with object was pruned");
+  ok(!findConsoleAPIMessage(hud, "Object"), "Message with object was pruned");
 
   info("Expand the 'c' node in the sidebar");
   // Here's what the object in the sidebar looks like:
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_css.js b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_css.js
index b5d2b97027cd..512f436aacc8 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_css.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_css.js
@@ -32,7 +32,7 @@ add_task(async function() {
   const hud = await openNewTabAndConsole(PAGE_URL);
 
   info("Waiting for css warning");
-  const node = await waitFor(() => findMessage(hud, "octopus"));
+  const node = await waitFor(() => findWarningMessage(hud, "octopus"));
   ok(!!node, "css warning seen");
 
   info("Waiting for source map to be applied");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_error.js b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_error.js
index 62b24e4174e0..2aec594cf9c3 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_error.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_error.js
@@ -15,10 +15,12 @@ add_task(async function() {
   ]) {
     const hud = await openNewTabAndConsole(BASE + test);
 
-    const node = await waitFor(() => findMessage(hud, "here"));
+    const node = await waitFor(() => findConsoleAPIMessage(hud, "here"));
     ok(node, "logged text is displayed in web console");
 
-    const node2 = await waitFor(() => findMessage(hud, "Source map error"));
+    const node2 = await waitFor(() =>
+      findWarningMessage(hud, "Source map error")
+    );
     ok(node2, "source map error is displayed in web console");
   }
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_invalid.js b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_invalid.js
index e0286f587823..bb78f2a5235e 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_invalid.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_invalid.js
@@ -27,6 +27,6 @@ add_task(async function() {
 
   const hud = await openNewTabAndConsole(PAGE_URL);
 
-  const node = await waitFor(() => findMessage(hud, "Source map error"));
+  const node = await waitFor(() => findWarningMessage(hud, "Source map error"));
   ok(node, "source map error is displayed in web console");
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_nosource.js b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_nosource.js
index 277bed69ac15..91c6283c534e 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_nosource.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_nosource.js
@@ -30,7 +30,7 @@ add_task(async function() {
 
   info('Finding "here" message and waiting for source map to be applied');
   await waitFor(() => {
-    const node = findMessage(hud, "here");
+    const node = findConsoleAPIMessage(hud, "here");
     if (!node) {
       return false;
     }
@@ -44,7 +44,7 @@ add_task(async function() {
   info("Selecting the console again");
   await toolbox.selectTool("webconsole");
 
-  const node = await waitFor(() => findMessage(hud, "original source"));
+  const node = await waitFor(() => findWarningMessage(hud, "original source"));
   ok(node, "source map error is displayed in web console");
 
   ok(
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_stacktrace_location_debugger_link.js b/devtools/client/webconsole/test/browser/browser_webconsole_stacktrace_location_debugger_link.js
index 0fd342b95c77..b2bcb5b36f6c 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_stacktrace_location_debugger_link.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_stacktrace_location_debugger_link.js
@@ -26,7 +26,7 @@ add_task(async function() {
 
 async function testOpenInDebugger(hud, toolbox, text) {
   info(`Testing message with text "${text}"`);
-  const messageNode = await waitFor(() => findMessage(hud, text));
+  const messageNode = await waitFor(() => findConsoleAPIMessage(hud, text));
   const framesNode = await waitFor(() => messageNode.querySelector(".frames"));
 
   const frameNodes = framesNode.querySelectorAll(".frame");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_strict_mode_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_strict_mode_errors.js
index 2150062cd88a..8db59bf3fe6c 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_strict_mode_errors.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_strict_mode_errors.js
@@ -30,7 +30,7 @@ add_task(async function() {
 });
 
 async function waitForError(hud, text) {
-  await waitFor(() => findMessage(hud, text, ".message.error"));
+  await waitFor(() => findErrorMessage(hud, text));
   ok(true, "Received expected error message");
 }
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_js_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_js_errors.js
index b2c86ae7ef2a..aa38227b10c8 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_js_errors.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_js_errors.js
@@ -15,13 +15,13 @@ add_task(async function() {
   info(
     "Check that the error message is logged in telemetry with the expected key"
   );
-  await waitFor(() => findMessage(hud, "is not a function"));
+  await waitFor(() => findErrorMessage(hud, "is not a function"));
   checkErrorDisplayedTelemetry("JSMSG_NOT_FUNCTION", 1);
 
   await reloadBrowser();
 
   info("Reloading the page (and having the same error) increments the sum");
-  await waitFor(() => findMessage(hud, "is not a function"));
+  await waitFor(() => findErrorMessage(hud, "is not a function"));
   checkErrorDisplayedTelemetry("JSMSG_NOT_FUNCTION", 2);
 
   info(
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_jump_to_definition.js b/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_jump_to_definition.js
index 1ee769af513a..cefc4ab4100f 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_jump_to_definition.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_jump_to_definition.js
@@ -22,7 +22,9 @@ add_task(async function() {
 
   const hud = await openNewTabAndConsole(TEST_URI);
 
-  const message = await waitFor(() => findMessage(hud, "test message"));
+  const message = await waitFor(() =>
+    findConsoleAPIMessage(hud, "test message")
+  );
   info("Click on the 'jump to definition' button");
   const jumpIcon = message.querySelector(".jump-definition");
   jumpIcon.click();
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_object_expanded.js b/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_object_expanded.js
index 5fe16b1ecc53..8b04d0e0f0c1 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_object_expanded.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_object_expanded.js
@@ -21,7 +21,9 @@ add_task(async function() {
 
   const hud = await openNewTabAndConsole(TEST_URI);
 
-  const message = await waitFor(() => findMessage(hud, "test message"));
+  const message = await waitFor(() =>
+    findConsoleAPIMessage(hud, "test message")
+  );
 
   info("Click on the arrow icon to expand the node");
   const arrowIcon = message.querySelector(".arrow");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_time_methods.js b/devtools/client/webconsole/test/browser/browser_webconsole_time_methods.js
index 6c151919eff7..b04204847d2a 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_time_methods.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_time_methods.js
@@ -27,7 +27,9 @@ add_task(async function() {
   // printed to the console
   const hud1 = await openNewTabAndConsole(TEST_URI);
 
-  const aTimerCompleted = await waitFor(() => findMessage(hud1, "aTimer: "));
+  const aTimerCompleted = await waitFor(() =>
+    findConsoleAPIMessage(hud1, "aTimer: ")
+  );
   ok(
     aTimerCompleted.textContent.includes("- timer ended"),
     "Calling " + "console.time('a') and console.timeEnd('a')ends the 'a' timer"
@@ -40,7 +42,7 @@ add_task(async function() {
   const hud2 = await openNewTabAndConsole(TEST_URI2);
 
   const error1 = await waitFor(() =>
-    findMessage(hud2, "bTimer", ".message.timeEnd.warn")
+    findWarningMessage(hud2, "bTimer", ".timeEnd")
   );
   ok(
     error1,
@@ -58,10 +60,10 @@ add_task(async function() {
   // We use this await to 'sync' until the message appears, as the console API
   // guarantees us that the smoke signal will be printed after the message for
   // console.time("bTimer") (if there were any)
-  await waitFor(() => findMessage(hud2, "smoke signal"));
+  await waitFor(() => findConsoleAPIMessage(hud2, "smoke signal"));
 
   is(
-    findMessage(hud2, "bTimer started"),
+    findConsoleAPIMessage(hud2, "bTimer started"),
     undefined,
     "No message is printed to " + "the console when the timer starts"
   );
@@ -75,7 +77,7 @@ add_task(async function() {
   await navigateTo(TEST_URI4);
 
   const error2 = await waitFor(() =>
-    findMessage(hud2, "bTimer", ".message.timeEnd.warn")
+    findWarningMessage(hud2, "bTimer", ".timeEnd")
   );
   ok(
     error2,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_trackingprotection_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_trackingprotection_errors.js
index 1813b5b8e2e4..daa6ff7c8fb5 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_trackingprotection_errors.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_trackingprotection_errors.js
@@ -60,7 +60,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Test content blocking message");
   const message = await waitFor(() =>
-    findMessage(
+    findWarningMessage(
       hud,
       `The resource at \u201chttps://tracking.example.com/\u201d was blocked because ` +
         `content blocking is enabled`
@@ -84,7 +84,7 @@ add_task(async function testForeignCookieBlockedMessage() {
   await pushPref(COOKIE_BEHAVIOR_PREF, COOKIE_BEHAVIORS.REJECT_FOREIGN);
   const { hud, win } = await openNewWindowAndConsole(TEST_URI);
   const message = await waitFor(() =>
-    findMessage(
+    findWarningMessage(
       hud,
       `Request to access cookie or storage on ${BLOCKED_URL} was blocked because we are ` +
         `blocking all third-party storage access requests and content blocking is enabled`
@@ -112,7 +112,7 @@ add_task(async function testLimitForeignCookieBlockedMessage() {
 
   const message = await waitFor(
     () =>
-      findMessage(
+      findWarningMessage(
         hud,
         `Request to access cookie or storage on ${BLOCKED_URL} was blocked because we are ` +
           `blocking all third-party storage access requests and content blocking is enabled`
@@ -140,7 +140,7 @@ add_task(async function testAllCookieBlockedMessage() {
   const { hud, win } = await openNewWindowAndConsole(TEST_URI);
 
   const message = await waitFor(() =>
-    findMessage(
+    findWarningMessage(
       hud,
       `Request to access cookie or storage on ${BLOCKED_URL} was blocked because we are ` +
         `blocking all storage access requests`
@@ -163,7 +163,7 @@ add_task(async function testTrackerCookieBlockedMessage() {
   const { hud, win } = await openNewWindowAndConsole(TEST_URI);
 
   const message = await waitFor(() =>
-    findMessage(
+    findWarningMessage(
       hud,
       `Request to access cookie or storage on ${BLOCKED_URL} was blocked because it came ` +
         `from a tracker and content blocking is enabled`
@@ -186,7 +186,7 @@ add_task(async function testForeignCookiePartitionedMessage() {
   const { hud, win } = await openNewWindowAndConsole(TEST_URI_THIRD_PARTY_ONLY);
 
   const message = await waitFor(() =>
-    findMessage(
+    findWarningMessage(
       hud,
       `Partitioned cookie or storage access was provided to ${PARTITIONED_URL} because it is ` +
         `loaded in the third-party context and dynamic state partitioning is enabled.`
@@ -217,7 +217,7 @@ add_task(async function testCookieBlockedByPermissionMessage() {
 
   const { hud, win } = await openNewWindowAndConsole(TEST_URI);
   const message = await waitFor(() =>
-    findMessage(
+    findWarningMessage(
       hud,
       `Request to access cookies or ` +
         `storage on ${BLOCKED_URL} was blocked because of custom cookie permission`
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_uncaught_exception.js b/devtools/client/webconsole/test/browser/browser_webconsole_uncaught_exception.js
index 292505575d98..554247db4c06 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_uncaught_exception.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_uncaught_exception.js
@@ -66,7 +66,7 @@ add_task(async function() {
     [1]
   );
   info("Check that object in errors can be expanded");
-  const rejectedObjectMessage = findMessage(hud, "eggplant", ".error");
+  const rejectedObjectMessage = findErrorMessage(hud, "eggplant");
   const oi = rejectedObjectMessage.querySelector(".tree");
   ok(true, "The object was rendered in an ObjectInspector");
 
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_view_source.js b/devtools/client/webconsole/test/browser/browser_webconsole_view_source.js
index b7fd5ebf4e74..9fefac6d0122 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_view_source.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_view_source.js
@@ -18,7 +18,7 @@ add_task(async function() {
   info("console opened");
 
   const msg = await waitFor(() =>
-    findMessage(hud, "Blocked loading mixed active content")
+    findErrorMessage(hud, "Blocked loading mixed active content")
   );
   ok(msg, "error message");
   const locationNode = msg.querySelector(
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_visibility_messages.js b/devtools/client/webconsole/test/browser/browser_webconsole_visibility_messages.js
index 01a74d39f5ab..da5d6ab7a2f5 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_visibility_messages.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_visibility_messages.js
@@ -31,7 +31,7 @@ add_task(async function() {
   SpecialPowers.spawn(gBrowser.selectedBrowser, [], () => {
     content.wrappedJSObject.log("in-console log");
   });
-  await waitFor(() => findMessage(hud, "in-console log"));
+  await waitFor(() => findConsoleAPIMessage(hud, "in-console log"));
 
   info("select the inspector");
   await toolbox.selectTool("inspector");
@@ -64,7 +64,7 @@ add_task(async function() {
   info("Waiting for all messages to be logged into the store");
   await onAllMessagesInStore;
 
-  const inInspectorMessages = await findMessages(hud, "in-inspector");
+  const inInspectorMessages = await findConsoleAPIMessages(hud, "in-inspector");
   is(
     inInspectorMessages.length,
     0,
@@ -78,7 +78,7 @@ add_task(async function() {
   const waitForMessagePromises = [];
   for (let j = 1; j <= MESSAGES_COUNT; j++) {
     waitForMessagePromises.push(
-      waitFor(() => findMessage(hud, "in-inspector log " + j))
+      waitFor(() => findConsoleAPIMessage(hud, "in-inspector log " + j))
     );
   }
 
@@ -99,7 +99,7 @@ add_task(async function() {
   SpecialPowers.spawn(gBrowser.selectedBrowser, [], () => {
     content.wrappedJSObject.log("in-console log");
   });
-  await waitFor(() => findMessage(hud, "in-console log"));
+  await waitFor(() => findConsoleAPIMessage(hud, "in-console log"));
 
   info("select the inspector");
   await toolbox.selectTool("inspector");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_warn_about_replaced_api.js b/devtools/client/webconsole/test/browser/browser_webconsole_warn_about_replaced_api.js
index 021ff5fbfe20..ac4bd41763e7 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_warn_about_replaced_api.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_warn_about_replaced_api.js
@@ -30,7 +30,7 @@ add_task(async function() {
 });
 
 async function testWarningNotPresent(hud) {
-  ok(!findMessage(hud, "logging API"), "no warning displayed");
+  ok(!findWarningMessage(hud, "logging API"), "no warning displayed");
 
   // Bug 862024: make sure the warning doesn't show after page reload.
   info(
@@ -38,21 +38,22 @@ async function testWarningNotPresent(hud) {
   );
   await reloadBrowser();
   await waitFor(() => {
-    // We need to wait for 3 messages because there are two logs, plus the
-    // navigation message since messages are persisted
-    return findMessages(hud, "foo").length === 3;
+    return (
+      findConsoleAPIMessages(hud, "foo").length === 2 &&
+      findMessagesByType(hud, "foo", ".navigationMarker").length === 1
+    );
   });
 
-  ok(!findMessage(hud, "logging API"), "no warning displayed");
+  ok(!findWarningMessage(hud, "logging API"), "no warning displayed");
 }
 
 async function testWarningPresent(hud) {
   info("wait for the warning to show");
-  await waitFor(() => findMessage(hud, "logging API"));
+  await waitFor(() => findWarningMessage(hud, "logging API"));
 
   info("reload the test page and wait for the warning to show");
   await reloadBrowser();
   await waitFor(() => {
-    return findMessages(hud, "logging API").length === 2;
+    return findWarningMessages(hud, "logging API").length === 2;
   });
 }
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_content_blocking.js b/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_content_blocking.js
index e855b698d1f5..c0acc30b81d6 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_content_blocking.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_content_blocking.js
@@ -90,7 +90,9 @@ add_task(async function testContentBlockingMessage() {
 
   info("Open the group");
   node.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, "https://tracking.example.com/?1"));
+  await waitFor(() =>
+    findWarningMessage(hud, "https://tracking.example.com/?1")
+  );
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL} 2`,
@@ -215,7 +217,7 @@ async function testStorageAccessBlockedGrouping(groupLabel) {
 
   info("Open the group");
   node.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, TRACKER_IMG));
+  await waitFor(() => findWarningMessage(hud, TRACKER_IMG));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${groupLabel} 2`,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_cookies.js b/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_cookies.js
index 7d6c9c7328a7..e6941532b6f0 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_cookies.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_cookies.js
@@ -91,7 +91,7 @@ add_task(async function testSameSiteCookieMessage() {
 
     info("Open the group");
     node.querySelector(".arrow").click();
-    await waitFor(() => findMessage(hud, "SameSite"));
+    await waitFor(() => findWarningMessage(hud, "SameSite"));
 
     await checkConsoleOutputForWarningGroup(hud, [
       `▼︎⚠ ${test.groupLabel} 2`,
@@ -136,7 +136,7 @@ add_task(async function testInvalidSameSiteMessage() {
 
   info("Open the group");
   node.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, "SameSite"));
+  await waitFor(() => findWarningMessage(hud, "SameSite"));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${groupLabel} 2`,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_multiples.js b/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_multiples.js
index bfcd1dbe9b44..a57b62f5ca2a 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_multiples.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_multiples.js
@@ -147,7 +147,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Expand the second warning group");
   storageBlockedWarningGroupNode.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, STORAGE_BLOCKED_URL));
+  await waitFor(() => findWarningMessage(hud, STORAGE_BLOCKED_URL));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▶︎⚠ ${CONTENT_BLOCKED_GROUP_LABEL}`,
@@ -187,7 +187,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Expand the first warning group");
   contentBlockedWarningGroupNode.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, CONTENT_BLOCKED_URL));
+  await waitFor(() => findWarningMessage(hud, CONTENT_BLOCKED_URL));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKED_GROUP_LABEL}`,
@@ -206,7 +206,9 @@ add_task(async function testContentBlockingMessage() {
   await reloadPage();
 
   // Also wait for the navigation message to be displayed.
-  await waitFor(() => findMessage(hud, "Navigated to"));
+  await waitFor(() =>
+    findMessageByType(hud, "Navigated to", ".navigationMarker")
+  );
 
   info("Add a storage blocked message and a content blocked one");
   onStorageBlockedMessage = waitForMessage(hud, STORAGE_BLOCKED_URL, ".warn");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_storage_isolation.js b/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_storage_isolation.js
index 1c70ca1e29d2..ac8930032b41 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_storage_isolation.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_warning_group_storage_isolation.js
@@ -78,7 +78,7 @@ add_task(async function testStorageIsolationMessage() {
 
   info("Open the group");
   node.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, url1));
+  await waitFor(() => findWarningMessage(hud, url1));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${STORAGE_ISOLATION_GROUP_LABEL} 2`,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups.js b/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups.js
index e9832f1bbcfa..04cbac69f1dc 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups.js
@@ -106,7 +106,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Open the group");
   node.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, BLOCKED_URL));
+  await waitFor(() => findWarningMessage(hud, BLOCKED_URL));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
@@ -139,7 +139,9 @@ add_task(async function testContentBlockingMessage() {
   await reloadPage();
 
   // Also wait for the navigation message to be displayed.
-  await waitFor(() => findMessage(hud, "Navigated to"));
+  await waitFor(() =>
+    findMessageByType(hud, "Navigated to", ".navigationMarker")
+  );
 
   info("Log a tracking protection message to check it is not grouped");
   onContentBlockingWarningMessage = waitForMessage(hud, BLOCKED_URL, ".warn");
@@ -192,7 +194,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Check that opening this group works");
   node.querySelector(".arrow").click();
-  await waitFor(() => findMessages(hud, BLOCKED_URL).length === 6);
+  await waitFor(() => findWarningMessages(hud, BLOCKED_URL).length === 6);
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
@@ -211,7 +213,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Check that closing this group works, and let the other one open");
   node.querySelector(".arrow").click();
-  await waitFor(() => findMessages(hud, BLOCKED_URL).length === 4);
+  await waitFor(() => findWarningMessages(hud, BLOCKED_URL).length === 4);
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups_filtering.js b/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups_filtering.js
index e7fa6ac09154..a588c73d4e5c 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups_filtering.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups_filtering.js
@@ -62,7 +62,9 @@ add_task(async function testContentBlockingMessage() {
   await reloadPage();
 
   // Wait for the navigation message to be displayed.
-  await waitFor(() => findMessage(hud, "Navigated to"));
+  await waitFor(() =>
+    findMessageByType(hud, "Navigated to", ".navigationMarker")
+  );
 
   onContentBlockingWarningMessage = waitForMessage(hud, BLOCKED_URL, ".warn");
   emitContentBlockedMessage(hud);
@@ -93,7 +95,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Filter warnings");
   await setFilterState(hud, { warn: false });
-  await waitFor(() => !findMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
+  await waitFor(() => !findWarningMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `simple message A #1`,
@@ -107,7 +109,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Display warning messages again");
   await setFilterState(hud, { warn: true });
-  await waitFor(() => findMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
+  await waitFor(() => findWarningMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▶︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
@@ -122,10 +124,10 @@ add_task(async function testContentBlockingMessage() {
   ]);
 
   info("Expand the first warning group");
-  findMessages(hud, CONTENT_BLOCKING_GROUP_LABEL)[0]
+  findWarningMessages(hud, CONTENT_BLOCKING_GROUP_LABEL)[0]
     .querySelector(".arrow")
     .click();
-  await waitFor(() => findMessage(hud, BLOCKED_URL));
+  await waitFor(() => findWarningMessage(hud, BLOCKED_URL));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
@@ -145,7 +147,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Filter warnings");
   await setFilterState(hud, { warn: false });
-  await waitFor(() => !findMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
+  await waitFor(() => !findWarningMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `simple message A #1`,
@@ -159,7 +161,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Display warning messages again");
   await setFilterState(hud, { warn: true });
-  await waitFor(() => findMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
+  await waitFor(() => findWarningMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
     `| ${BLOCKED_URL}?1`,
@@ -178,7 +180,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Filter on warning group text");
   await setFilterState(hud, { text: CONTENT_BLOCKING_GROUP_LABEL });
-  await waitFor(() => !findMessage(hud, "simple message"));
+  await waitFor(() => !findConsoleAPIMessage(hud, "simple message"));
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
     `| ${BLOCKED_URL}?1`,
@@ -190,10 +192,10 @@ add_task(async function testContentBlockingMessage() {
   ]);
 
   info("Open the second warning group");
-  findMessages(hud, CONTENT_BLOCKING_GROUP_LABEL)[1]
+  findWarningMessages(hud, CONTENT_BLOCKING_GROUP_LABEL)[1]
     .querySelector(".arrow")
     .click();
-  await waitFor(() => findMessage(hud, "?6"));
+  await waitFor(() => findWarningMessage(hud, "?6"));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
@@ -210,7 +212,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Filter on warning message text from a single warning group");
   await setFilterState(hud, { text: "/\\?(2|4)/" });
-  await waitFor(() => !findMessage(hud, "?1"));
+  await waitFor(() => !findWarningMessage(hud, "?1"));
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
     `| ${BLOCKED_URL}?2`,
@@ -220,7 +222,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Filter on warning message text from two warning groups");
   await setFilterState(hud, { text: "/\\?(3|6|7)/" });
-  await waitFor(() => findMessage(hud, "?7"));
+  await waitFor(() => findWarningMessage(hud, "?7"));
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
     `| ${BLOCKED_URL}?3`,
@@ -253,7 +255,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Filter warnings with two opened warning groups");
   await setFilterState(hud, { warn: false });
-  await waitFor(() => !findMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
+  await waitFor(() => !findWarningMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
   await checkConsoleOutputForWarningGroup(hud, [
     `simple message A #1`,
     `simple message A #2`,
@@ -266,7 +268,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Display warning messages again with two opened warning groups");
   await setFilterState(hud, { warn: true });
-  await waitFor(() => findMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
+  await waitFor(() => findWarningMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
     `| ${BLOCKED_URL}?1`,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups_outside_console_group.js b/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups_outside_console_group.js
index 7136df4ae25b..5a4db484cdc1 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups_outside_console_group.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups_outside_console_group.js
@@ -67,13 +67,13 @@ add_task(async function testContentBlockingMessage() {
 
   info("Collapse the console.group");
   consoleGroupMessageNode.querySelector(".arrow").click();
-  await waitFor(() => !findMessage(hud, "log in group"));
+  await waitFor(() => !findConsoleAPIMessage(hud, "log in group"));
 
   await checkConsoleOutputForWarningGroup(hud, [`▶︎ myGroup`]);
 
   info("Expand the console.group");
   consoleGroupMessageNode.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, "log in group"));
+  await waitFor(() => findConsoleAPIMessage(hud, "log in group"));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼ myGroup`,
@@ -100,7 +100,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Open the warning group");
   warningGroupNode.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, BLOCKED_URL));
+  await waitFor(() => findWarningMessage(hud, BLOCKED_URL));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
@@ -146,7 +146,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Collapse the console.group");
   consoleGroupMessageNode.querySelector(".arrow").click();
-  await waitFor(() => !findMessage(hud, "log in group"));
+  await waitFor(() => !findConsoleAPIMessage(hud, "log in group"));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
@@ -158,7 +158,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Close the warning group");
   warningGroupNode.querySelector(".arrow").click();
-  await waitFor(() => !findMessage(hud, BLOCKED_URL));
+  await waitFor(() => !findWarningMessage(hud, BLOCKED_URL));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▶︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
@@ -167,7 +167,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Open the console group");
   consoleGroupMessageNode.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, "log in group"));
+  await waitFor(() => findConsoleAPIMessage(hud, "log in group"));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▶︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
@@ -178,7 +178,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Collapse the console.group");
   consoleGroupMessageNode.querySelector(".arrow").click();
-  await waitFor(() => !findMessage(hud, "log in group"));
+  await waitFor(() => !findConsoleAPIMessage(hud, "log in group"));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▶︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
@@ -187,7 +187,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Open the warning group");
   warningGroupNode.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, BLOCKED_URL));
+  await waitFor(() => findWarningMessage(hud, BLOCKED_URL));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups_toggle.js b/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups_toggle.js
index 0ba2e4a4b040..d55cbbc4f3d4 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups_toggle.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_warning_groups_toggle.js
@@ -76,7 +76,7 @@ add_task(async function testContentBlockingMessage() {
   info("Enable the warningGroup feature pref and check warnings were grouped");
   await toggleWarningGroupPreference(hud);
   let warningGroupMessage1 = await waitFor(() =>
-    findMessage(hud, CONTENT_BLOCKING_GROUP_LABEL)
+    findWarningMessage(hud, CONTENT_BLOCKING_GROUP_LABEL)
   );
   is(
     warningGroupMessage1.querySelector(".warning-group-badge").textContent,
@@ -97,7 +97,7 @@ add_task(async function testContentBlockingMessage() {
     "Re-enable the warningGroup feature pref and check warnings are displayed"
   );
   await toggleWarningGroupPreference(hud);
-  await waitFor(() => findMessage(hud, `${BLOCKED_URL}?4`));
+  await waitFor(() => findWarningMessage(hud, `${BLOCKED_URL}?4`));
 
   // Warning messages are displayed at the expected positions.
   await checkConsoleOutputForWarningGroup(hud, [
@@ -112,7 +112,7 @@ add_task(async function testContentBlockingMessage() {
   await toggleWarningGroupPreference(hud);
   console.log("toggle successful");
   warningGroupMessage1 = await waitFor(() =>
-    findMessage(hud, CONTENT_BLOCKING_GROUP_LABEL)
+    findWarningMessage(hud, CONTENT_BLOCKING_GROUP_LABEL)
   );
 
   await checkConsoleOutputForWarningGroup(hud, [
@@ -122,7 +122,7 @@ add_task(async function testContentBlockingMessage() {
 
   info("Expand the warning group");
   warningGroupMessage1.querySelector(".arrow").click();
-  await waitFor(() => findMessage(hud, BLOCKED_URL));
+  await waitFor(() => findWarningMessage(hud, BLOCKED_URL));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
@@ -137,13 +137,15 @@ add_task(async function testContentBlockingMessage() {
   await reloadPage();
 
   // Wait for the navigation message to be displayed.
-  await waitFor(() => findMessage(hud, "Navigated to"));
+  await waitFor(() =>
+    findMessageByType(hud, "Navigated to", ".navigationMarker")
+  );
 
   info("Disable the warningGroup feature pref again");
   await toggleWarningGroupPreference(hud);
 
   info("Add one warning message and one simple message");
-  await waitFor(() => findMessage(hud, `${BLOCKED_URL}?4`));
+  await waitFor(() => findWarningMessage(hud, `${BLOCKED_URL}?4`));
   onContentBlockingWarningMessage = waitForMessage(hud, BLOCKED_URL, ".warn");
   emitContentBlockedMessage(hud);
   await onContentBlockingWarningMessage;
@@ -165,7 +167,7 @@ add_task(async function testContentBlockingMessage() {
     "Enable the warningGroup feature pref to check that the group is still expanded"
   );
   await toggleWarningGroupPreference(hud);
-  await waitFor(() => findMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
+  await waitFor(() => findWarningMessage(hud, CONTENT_BLOCKING_GROUP_LABEL));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `▼︎⚠ ${CONTENT_BLOCKING_GROUP_LABEL}`,
@@ -208,7 +210,7 @@ add_task(async function testContentBlockingMessage() {
     "Disable the warningGroup pref and check all warning messages are visible"
   );
   await toggleWarningGroupPreference(hud);
-  await waitFor(() => findMessage(hud, `${BLOCKED_URL}?6`));
+  await waitFor(() => findWarningMessage(hud, `${BLOCKED_URL}?6`));
 
   await checkConsoleOutputForWarningGroup(hud, [
     `${BLOCKED_URL}?1`,
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_webextension_promise_rejection.js b/devtools/client/webconsole/test/browser/browser_webconsole_webextension_promise_rejection.js
index 67fe75179301..9ed932439396 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_webextension_promise_rejection.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_webextension_promise_rejection.js
@@ -31,9 +31,7 @@ add_task(async function() {
   await extension.startup();
 
   const hud = await openNewTabAndConsole(TEST_URI);
-  await waitFor(() =>
-    findMessage(hud, "uncaught exception: abc", ".message.error")
-  );
+  await waitFor(() => findErrorMessage(hud, "uncaught exception: abc"));
 
   await extension.unload();
 });
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_websocket.js b/devtools/client/webconsole/test/browser/browser_webconsole_websocket.js
index e33a5bc68a19..ec80d27e2330 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_websocket.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_websocket.js
@@ -11,12 +11,12 @@ const TEST_URI =
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
   await waitFor(
-    () => findMessage(hud, "wss://0.0.0.0:81", ".error"),
+    () => findErrorMessage(hud, "wss://0.0.0.0:81"),
     "Did not find error message for wss://0.0.0.0:81 connection",
     500
   );
   await waitFor(
-    () => findMessage(hud, "wss://0.0.0.0:82", ".error"),
+    () => findErrorMessage(hud, "wss://0.0.0.0:82"),
     "Did not find error message for wss://0.0.0.0:82 connection",
     500
   );
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_worker_promise_error.js b/devtools/client/webconsole/test/browser/browser_webconsole_worker_promise_error.js
index 5871740aabf3..82b85154369e 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_worker_promise_error.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_worker_promise_error.js
@@ -20,11 +20,11 @@ add_task(async function() {
 
   const hud = await openNewTabAndConsole(TEST_URI);
   await waitFor(() =>
-    findMessage(hud, "uncaught exception: worker-error", ".message.error")
+    findErrorMessage(hud, "uncaught exception: worker-error")
   );
 
   await waitFor(() =>
-    findMessage(hud, "uncaught exception: worklet-error", ".message.error")
+    findErrorMessage(hud, "uncaught exception: worklet-error")
   );
 
   ok(true, "received error messages");
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_worklet_error.js b/devtools/client/webconsole/test/browser/browser_webconsole_worklet_error.js
index 82b57d4da553..644b94818a25 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_worklet_error.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_worklet_error.js
@@ -21,7 +21,7 @@ add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
 
   await waitFor(() =>
-    findMessage(hud, "SyntaxError: duplicate formal argument")
+    findErrorMessage(hud, "SyntaxError: duplicate formal argument")
   );
   ok(true, "Received expected SyntaxError");
   await checkMessageStack(hud, "addModule", [18, 21]);