--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -210,16 +210,17 @@ skip-if = true #	Bug 1403188
 [browser_jsterm_autocomplete_return_key.js]
 [browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js]
 [browser_jsterm_completion.js]
 [browser_jsterm_copy_command.js]
 [browser_jsterm_dollar.js]
 [browser_jsterm_history.js]
 [browser_jsterm_history_persist.js]
 [browser_jsterm_inspect.js]
+[browser_jsterm_multiline.js]
 [browser_jsterm_no_autocompletion_on_defined_variables.js]
 [browser_jsterm_no_input_and_tab_key_pressed.js]
 [browser_jsterm_no_input_change_and_tab_key_pressed.js]
 [browser_jsterm_popup_close_on_tab_switch.js]
 [browser_jsterm_popup.js]
 [browser_jsterm_selfxss.js]
 subsuite = clipboard
 [browser_netmonitor_shows_reqs_in_webconsole.js]
@@ -340,18 +341,16 @@ skip-if = true #	Bug 1403448
 [browser_webconsole_longstring_hang.js]
 skip-if = true #	Bug 1403448
 [browser_webconsole_message_categories.js]
 skip-if = true #	Bug 1404384
 # old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_mixedcontent.js]
 tags = mcb
 skip-if = true #	Bug 1404886
-[browser_webconsole_multiline_input.js]
-skip-if = true # Bug 1408941
 [browser_webconsole_multiple_windows_and_tabs.js]
 [browser_webconsole_netlogging_reset_filter.js]
 skip-if = true #	Bug 1405636
 [browser_webconsole_network_attach.js]
 [browser_webconsole_network_exceptions.js]
 skip-if = true # Bug 1408943
 [browser_webconsole_network_messages_expand.js]
 [browser_webconsole_network_messages_openinnet.js]

rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiline_input.js
rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_multiline.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiline_input.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_multiline.js
@@ -5,17 +5,17 @@
 
 // Tests that the console waits for more input instead of evaluating
 // when valid, but incomplete, statements are present upon pressing enter
 // -or- when the user ends a line with shift + enter.
 
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "test/test-console.html";
+                 "new-console-output/test/mochitest/test-console.html";
 
 let SHOULD_ENTER_MULTILINE = [
   {input: "function foo() {" },
   {input: "var a = 1," },
   {input: "var a = 1;", shiftKey: true },
   {input: "function foo() { }", shiftKey: true },
   {input: "function" },
   {input: "(x) =>" },
@@ -36,35 +36,34 @@ let SHOULD_EXECUTE = [
   {input: "99 + 3" },
   {input: "1, 2, 3" },
   // errors
   {input: "function f(x) { let y = 1, }" },
   {input: "function f(x=,) {" },
   {input: "{2,}" },
 ];
 
-add_task(function* () {
-  let { tab, browser } = yield loadTab(TEST_URI);
-  let hud = yield openConsole();
-  let inputNode = hud.jsterm.inputNode;
+add_task(async function () {
+  let hud = await openNewTabAndConsole(TEST_URI);
+  let { inputNode } = hud.jsterm;
 
-  for (let test of SHOULD_ENTER_MULTILINE) {
-    hud.jsterm.setInputValue(test.input);
-    EventUtils.synthesizeKey("VK_RETURN", { shiftKey: test.shiftKey });
+  for (let {input, shiftKey} of SHOULD_ENTER_MULTILINE) {
+    hud.jsterm.setInputValue(input);
+    EventUtils.synthesizeKey("VK_RETURN", { shiftKey });
+
     let inputValue = hud.jsterm.getInputValue();
-    is(inputNode.selectionStart, inputNode.selectionEnd,
-       "selection is collapsed");
-    is(inputNode.selectionStart, inputValue.length,
-       "caret at end of multiline input");
-    let inputWithNewline = test.input + "\n";
+    is(inputNode.selectionStart, inputNode.selectionEnd, "selection is collapsed");
+    is(inputNode.selectionStart, inputValue.length, "caret at end of multiline input");
+
+    let inputWithNewline = input + "\n";
     is(inputValue, inputWithNewline, "Input value is correct");
   }
 
-  for (let test of SHOULD_EXECUTE) {
-    hud.jsterm.setInputValue(test.input);
-    EventUtils.synthesizeKey("VK_RETURN", { shiftKey: test.shiftKey });
+  for (let {input, shiftKey} of SHOULD_EXECUTE) {
+    hud.jsterm.setInputValue(input);
+    EventUtils.synthesizeKey("VK_RETURN", { shiftKey });
+
     let inputValue = hud.jsterm.getInputValue();
     is(inputNode.selectionStart, 0, "selection starts/ends at 0");
     is(inputNode.selectionEnd, 0, "selection starts/ends at 0");
     is(inputValue, "", "Input value is cleared");
   }
-
 });