diff --git a/src/test/mochitest/browser.ini b/src/test/mochitest/browser.ini
index 95e9f775fe..a5a48c61f7 100644
--- a/src/test/mochitest/browser.ini
+++ b/src/test/mochitest/browser.ini
@@ -50,6 +50,7 @@ support-files =
 [browser_dbg-expressions.js]
 [browser_dbg-scopes.js]
 [browser_dbg-chrome-create.js]
+skip-if = true
 [browser_dbg-chrome-debugging.js]
 skip-if = true
 [browser_dbg-console.js]
diff --git a/src/test/mochitest/browser_dbg-chrome-create.js b/src/test/mochitest/browser_dbg-chrome-create.js
index a2d88c0648..120308638a 100644
--- a/src/test/mochitest/browser_dbg-chrome-create.js
+++ b/src/test/mochitest/browser_dbg-chrome-create.js
@@ -7,7 +7,10 @@
  * Tests that a chrome debugger can be created in a new process.
  */
 
-const { BrowserToolboxProcess } = Cu.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
+const { BrowserToolboxProcess } = Cu.import(
+  "resource://devtools/client/framework/ToolboxProcess.jsm",
+  {}
+);
 let gProcess = undefined;
 
 function initChromeDebugger() {
@@ -21,12 +24,13 @@ function initChromeDebugger() {
 }
 
 function onClose() {
-  ok(!gProcess._dbgProcess.isRunning,
-    "The remote debugger process isn't closed as it should be!");
-  is(gProcess._dbgProcess.exitValue, (Services.appinfo.OS == "WINNT" ? 0 : 256),
-    "The remote debugger process didn't die cleanly.");
+  is(
+    gProcess._dbgProcess.exitCode,
+    Services.appinfo.OS == "WINNT" ? -9 : -15,
+    "The remote debugger process didn't die cleanly."
+  );
 
-  info("process exit value: " + gProcess._dbgProcess.exitValue);
+  info("process exit value: " + gProcess._dbgProcess.exitCode);
 
   info("profile path: " + gProcess._dbgProfilePath);
 
@@ -38,35 +42,44 @@ registerCleanupFunction(function() {
   gProcess = null;
 });
 
-add_task(function* () {
+add_task(function*() {
   // Windows XP and 8.1 test slaves are terribly slow at this test.
   requestLongerTimeout(5);
   Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
 
   gProcess = yield initChromeDebugger();
 
-  ok(gProcess._dbgProcess,
-    "The remote debugger process wasn't created properly!");
-  ok(gProcess._dbgProcess.isRunning,
-    "The remote debugger process isn't running!");
-  is(typeof gProcess._dbgProcess.pid, "number",
-    "The remote debugger process doesn't have a pid (?!)");
+  ok(
+    gProcess._dbgProcess,
+    "The remote debugger process wasn't created properly!"
+  );
+  ok(
+    gProcess._dbgProcess.exitCode == null,
+    "The remote debugger process isn't running!"
+  );
+  is(
+    typeof gProcess._dbgProcess.pid,
+    "number",
+    "The remote debugger process doesn't have a pid (?!)"
+  );
 
   info("process location: " + gProcess._dbgProcess.location);
   info("process pid: " + gProcess._dbgProcess.pid);
   info("process name: " + gProcess._dbgProcess.processName);
   info("process sig: " + gProcess._dbgProcess.processSignature);
 
-  ok(gProcess._dbgProfilePath,
-    "The remote debugger profile wasn't created properly!");
+  ok(
+    gProcess._dbgProfilePath,
+    "The remote debugger profile wasn't created properly!"
+  );
 
   is(
     gProcess._dbgProfilePath,
     OS.Path.join(OS.Constants.Path.profileDir, "chrome_debugger_profile"),
-     "The remote debugger profile isn't where we expect it!"
-   );
+    "The remote debugger profile isn't where we expect it!"
+  );
 
   info("profile path: " + gProcess._dbgProfilePath);
 
-  gProcess.close();
+  yield gProcess.close();
 });
diff --git a/src/test/mochitest/head.js b/src/test/mochitest/head.js
index 7d2a09111a..5b3086a26a 100644
--- a/src/test/mochitest/head.js
+++ b/src/test/mochitest/head.js
@@ -215,7 +215,6 @@ function assertPausedLocation(dbg, source, line) {
   is(location.line, line);
 
   // Check the debug line
-  // debugger
   ok(
     getCM(dbg).lineInfo(line - 1).wrapClass.includes("debug-line"),
     "Line is highlighted as paused"