diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 592c2c7c2d79..b95b5c3fd6fa 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1611,6 +1611,7 @@ pref("view_source.tab", true);
 pref("dom.serviceWorkers.enabled", true);
 pref("dom.serviceWorkers.interception.enabled", true);
 pref("dom.serviceWorkers.openWindow.enabled", true);
+pref("dom.webnotifications.serviceworker.enabled", true);
 
 // Enable Push API.
 pref("dom.push.enabled", true);
diff --git a/dom/workers/test/serviceworkers/test_serviceworker_interfaces.js b/dom/workers/test/serviceworkers/test_serviceworker_interfaces.js
index cfbc16efa655..bf05794b8e21 100644
--- a/dom/workers/test/serviceworkers/test_serviceworker_interfaces.js
+++ b/dom/workers/test/serviceworkers/test_serviceworker_interfaces.js
@@ -157,9 +157,11 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MessagePort",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    { name: "Notification", release: false },
+    { name: "Notification", nonReleaseB2G: true, nonReleaseAndroid: true,
+                            b2g: false, android: false },
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    { name: "NotificationEvent", release: false },
+    { name: "NotificationEvent", nonReleaseB2G: true, nonReleaseAndroid: true,
+                                 b2g: false, android: false },
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "Performance",
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -226,9 +228,11 @@ function createInterfaceMap(permissionMap, version, userAgent, isB2G) {
       } else {
         ok(!("pref" in entry), "Bogus pref annotation for " + entry.name);
         if ((entry.nightly === !isNightly) ||
+            (entry.nonReleaseB2G === !(isB2G && !isRelease) && isB2G) ||
+            (entry.nonReleaseAndroid === !(isAndroid && !isRelease) && isAndroid) ||
             (entry.desktop === !isDesktop) ||
-            (entry.android === !isAndroid) ||
-            (entry.b2g === !isB2G) ||
+            (entry.android === !isAndroid && !entry.nonReleaseAndroid) ||
+            (entry.b2g === !isB2G && !entry.nonReleaseB2G) ||
             (entry.release === !isRelease) ||
             (entry.permission && !permissionMap[entry.permission])) {
           interfaceMap[entry.name] = false;
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 7e7ac9b322d0..0f6d685c4d67 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4460,7 +4460,9 @@ pref("notification.feature.enabled", false);
 
 // Web Notification
 pref("dom.webnotifications.enabled", true);
+#if !defined(RELEASE_BUILD)
 pref("dom.webnotifications.serviceworker.enabled", true);
+#endif
 
 // Alert animation effect, name is disableSlidingEffect for backwards-compat.
 pref("alerts.disableSlidingEffect", false);