--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -20,18 +20,16 @@ support-files =
   test_hsts-invalid-headers.sjs
   test-autocomplete-in-stackframe.html
   test-batching.html
   test-bug_923281_console_log_filter.html
   test-bug_923281_test1.js
   test-bug_923281_test2.js
   test-bug_939783_console_trace_duplicates.html
   test-bug-585956-console-trace.html
-  test-bug-593003-iframe-wrong-hud-iframe.html
-  test-bug-593003-iframe-wrong-hud.html
   test-bug-595934-canvas-css.html
   test-bug-595934-canvas-css.js
   test-bug-595934-css-loader.css
   test-bug-595934-css-loader.css^headers^
   test-bug-595934-css-loader.html
   test-bug-595934-css-parser.css
   test-bug-595934-css-parser.html
   test-bug-595934-empty-getelementbyid.html
@@ -122,16 +120,18 @@ support-files =
   test-file-location.js
   test-filter.html
   test-for-of.html
   test-iframe-762593-insecure-form-action.html
   test-iframe-762593-insecure-frame.html
   test-iframe1.html
   test-iframe2.html
   test-iframe3.html
+  test-iframe-wrong-hud-iframe.html
+  test-iframe-wrong-hud.html
   test-image.png
   test-inspect-cross-domain-objects-frame.html
   test-inspect-cross-domain-objects-top.html
   test-jsterm-dollar.html
   test-location-debugger-link-console-log.js
   test-location-debugger-link-errors.js
   test-location-debugger-link.html
   test-location-styleeditor-link-1.css
@@ -277,17 +277,16 @@ skip-if = true #	Bug 1404382
 [browser_webconsole_filter_scroll.js]
 [browser_webconsole_filters.js]
 [browser_webconsole_filters_persist.js]
 [browser_webconsole_highlighter_console_helper.js]
 [browser_webconsole_history_arrow_keys.js]
 [browser_webconsole_hpkp_invalid-headers.js]
 [browser_webconsole_hsts_invalid-headers.js]
 [browser_webconsole_iframe_wrong_hud.js]
-skip-if = true #	Bug 1404378
 [browser_webconsole_ineffective_iframe_sandbox_warning.js]
 skip-if = true #	Bug 1404883
 # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
 [browser_webconsole_init.js]
 [browser_webconsole_input_expansion.js]
 skip-if = true #	Bug 1404371
 [browser_webconsole_input_field_focus_on_panel_select.js]
 skip-if = true #	Bug 1405343

--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_iframe_wrong_hud.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_iframe_wrong_hud.js
@@ -1,70 +1,42 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-// See Bug 593003.
+// Ensure that iframes are not associated with the wrong hud. See Bug 593003.
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "test/test-bug-593003-iframe-wrong-hud.html";
+  "new-console-output/test/mochitest/test-iframe-wrong-hud.html";
 
-const TEST_IFRAME_URI = "http://example.com/browser/devtools/client/" +
-                        "webconsole/test/test-bug-593003-iframe-wrong-" +
-                        "hud-iframe.html";
+const TEST_IFRAME_URI = "http://example.com/browser/devtools/client/webconsole/" +
+  "new-console-output/test/mochitest/test-iframe-wrong-hud-iframe.html";
 
-const TEST_DUMMY_URI = "http://example.com/browser/devtools/client/" +
-                       "webconsole/test/test-console.html";
+const TEST_DUMMY_URI = "http://example.com/browser/devtools/client/webconsole/" +
+  "new-console-output/test/mochitest/test-console.html";
 
-add_task(function* () {
+add_task(async function () {
+  await pushPref("devtools.webconsole.filter.net", true);
+  const tab1 = await addTab(TEST_URI);
+  const hud1 = await openConsole(tab1);
 
-  let tab1 = (yield loadTab(TEST_URI)).tab;
-  yield ContentTask.spawn(gBrowser.selectedBrowser, {}, function* () {
-    content.console.log("FOO");
-  });
-  yield openConsole();
-
-  let tab2 = (yield loadTab(TEST_DUMMY_URI)).tab;
-  yield openConsole(gBrowser.selectedTab);
+  const tab2 = await addTab(TEST_DUMMY_URI);
+  await openConsole(gBrowser.selectedTab);
 
   info("Reloading tab 1");
-  yield reloadTab(tab1);
+  await reloadTab(tab1);
 
-  info("Checking for messages");
-  yield checkMessages(tab1, tab2);
+  info("Waiting for messages");
+  await waitFor(() => findMessage(hud1, TEST_IFRAME_URI, ".message.network"));
 
-  info("Cleaning up");
-  yield closeConsole(tab1);
-  yield closeConsole(tab2);
+  const hud2 = await openConsole(tab2);
+  is(findMessage(hud2, TEST_IFRAME_URI), null,
+    "iframe network request is not displayed in tab2");
 });
 
-function* reloadTab(tab) {
+function reloadTab(tab) {
   let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
   tab.linkedBrowser.reload();
-  yield loaded;
+  return loaded;
 }
-
-function* checkMessages(tab1, tab2) {
-  let hud1 = yield openConsole(tab1);
-  let outputNode1 = hud1.outputNode;
-
-  info("Waiting for messages");
-  yield waitForMessages({
-    webconsole: hud1,
-    messages: [{
-      text: TEST_IFRAME_URI,
-      category: CATEGORY_NETWORK,
-      severity: SEVERITY_LOG,
-    }]
-  });
-
-  let hud2 = yield openConsole(tab2);
-  let outputNode2 = hud2.outputNode;
-
-  isnot(outputNode1, outputNode2,
-    "the two HUD outputNodes must be different");
-
-  let msg = "Didn't find the iframe network request in tab2";
-  testLogEntry(outputNode2, TEST_IFRAME_URI, msg, true, true);
-}

rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-593003-iframe-wrong-hud-iframe.html
rename to devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud-iframe.html

rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-593003-iframe-wrong-hud.html
rename to devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud.html
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-593003-iframe-wrong-hud.html
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud.html
@@ -3,12 +3,12 @@
   <head>
     <meta charset="utf-8">
     <title>WebConsole test: iframe associated to the wrong HUD</title>
 <!-- Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/ -->
    </head>
    <body>
      <p>WebConsole test: iframe associated to the wrong HUD.</p>
-     <iframe 
-       src="http://example.com/browser/devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud-iframe.html"></iframe>
+     <iframe
+       src="http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud-iframe.html"></iframe>
    </body>
  </html>