diff --git a/browser/devtools/debugger/moz.build b/browser/devtools/debugger/moz.build
index ae60acb34f6d..a1940dd0ab3e 100644
--- a/browser/devtools/debugger/moz.build
+++ b/browser/devtools/debugger/moz.build
@@ -3,10 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test']
-
 JS_MODULES_PATH = 'modules/devtools/debugger'
 
 EXTRA_JS_MODULES += [
     'debugger-panel.js'
 ]
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in
deleted file mode 100644
index 79452603b383..000000000000
--- a/browser/devtools/debugger/test/Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Bug 888811 & bug 891176:
-#   Disable browser_dbg_on-pause-raise.js due to frequent failures
-# Bug 847558:
-#   Disable browser_dbg_chrome-create.js to fix Ubuntu hangs
-ifneq (Linux,$(OS_ARCH))
-MOCHITEST_BROWSER_FILES += \
-	browser_dbg_chrome-create.js \
-	browser_dbg_on-pause-raise.js \
-	$(NULL)
-endif
-
-# Bug 895426:
-#   Disable browser_dbg_break-on-dom-event.js due to frequent failures
-ifneq (Darwin,$(OS_ARCH))
-MOCHITEST_BROWSER_FILES += \
-	browser_dbg_break-on-dom-event.js \
-	$(NULL)
-endif
diff --git a/browser/devtools/debugger/test/browser.ini b/browser/devtools/debugger/test/browser.ini
index 159671e87f6a..f6d1374ce76a 100644
--- a/browser/devtools/debugger/test/browser.ini
+++ b/browser/devtools/debugger/test/browser.ini
@@ -201,3 +201,9 @@ skip-if = true
 [browser_dbg_variables-view-webidl.js]
 [browser_dbg_watch-expressions-01.js]
 [browser_dbg_watch-expressions-02.js]
+[browser_dbg_chrome-create.js]
+skip-if = os == "linux" # Bug 847558
+[browser_dbg_on-pause-raise.js]
+skip-if = os == "linux" # Bug 888811 & bug 891176
+[browser_dbg_break-on-dom-event.js]
+skip-if = os == "mac" # Bug 895426
diff --git a/browser/devtools/debugger/test/moz.build b/browser/devtools/debugger/test/moz.build
deleted file mode 100644
index 33f04f853787..000000000000
--- a/browser/devtools/debugger/test/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-BROWSER_CHROME_MANIFESTS += ['browser.ini']
-