--- a/dom/notification/moz.build
+++ b/dom/notification/moz.build
@@ -32,11 +32,12 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/ipc',
     '/dom/workers',
 ]
 
 BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini']
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']

rename from dom/tests/mochitest/notification/MockServices.js
rename to dom/notification/test/mochitest/MockServices.js

rename from dom/tests/mochitest/notification/NotificationTest.js
rename to dom/notification/test/mochitest/NotificationTest.js

rename from dom/tests/mochitest/notification/mochitest.ini
rename to dom/notification/test/mochitest/mochitest.ini

rename from dom/tests/mochitest/notification/test_bug931307.html
rename to dom/notification/test/mochitest/test_bug931307.html

rename from dom/tests/mochitest/notification/test_notification_basics.html
rename to dom/notification/test/mochitest/test_notification_basics.html

rename from dom/tests/mochitest/notification/test_notification_storage.html
rename to dom/notification/test/mochitest/test_notification_storage.html

--- a/dom/tests/moz.build
+++ b/dom/tests/moz.build
@@ -80,19 +80,16 @@ with Files("mochitest/general/**"):
     BUG_COMPONENT = ("Core", "DOM")
 
 with Files("mochitest/geolocation/**"):
     BUG_COMPONENT = ("Core", "Geolocation")
 
 with Files("mochitest/localstorage/**"):
     BUG_COMPONENT = ("Core", "DOM")
 
-with Files("mochitest/notification/**"):
-    BUG_COMPONENT = ("Core", "DOM")
-
 with Files("mochitest/orientation/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("mochitest/orientation/*507902*"):
     BUG_COMPONENT = ("Core", "Layout: Images")
 
 with Files("mochitest/pointerlock/**"):
     BUG_COMPONENT = ("Core", "DOM")
@@ -164,17 +161,16 @@ MOCHITEST_MANIFESTS += [
     'mochitest/dom-level1-core/mochitest.ini',
     'mochitest/dom-level2-core/mochitest.ini',
     'mochitest/dom-level2-html/mochitest.ini',
     'mochitest/fetch/mochitest.ini',
     'mochitest/gamepad/mochitest.ini',
     'mochitest/general/mochitest.ini',
     'mochitest/geolocation/mochitest.ini',
     'mochitest/localstorage/mochitest.ini',
-    'mochitest/notification/mochitest.ini',
     'mochitest/orientation/mochitest.ini',
     'mochitest/pointerlock/mochitest.ini',
     'mochitest/script/mochitest.ini',
     'mochitest/sessionstorage/mochitest.ini',
     'mochitest/storageevent/mochitest.ini',
     'mochitest/webcomponents/mochitest.ini',
     'mochitest/whatwg/mochitest.ini',
 ]