diff --git a/dom/permission/tests/test_cellbroadcast.html b/dom/permission/tests/test_cellbroadcast.html
index 62f32b1f5e7..d9b883aae6a 100644
--- a/dom/permission/tests/test_cellbroadcast.html
+++ b/dom/permission/tests/test_cellbroadcast.html
@@ -22,6 +22,8 @@ var gData = [
     needParentPerm: true,
     obj: "mozCellBroadcast",
     webidl: "MozCellBroadcast",
+    settings: [["dom.cellbroadcast.enabled", true],
+               ["dom.ignore_webidl_scope_checks", true]],
   },
 ]
 </script>
diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html
index 60edd2effdc..b6c7173bee4 100644
--- a/dom/tests/mochitest/general/test_interfaces.html
+++ b/dom/tests/mochitest/general/test_interfaces.html
@@ -705,14 +705,6 @@ var interfaceNamesInGlobalScope =
     "MouseScrollEvent",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MozActivity", b2g: true},
-// IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MozCellBroadcast", b2g: true, pref: "dom.cellbroadcast.enabled"},
-// IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MozCellBroadcastEvent", b2g: true, pref: "dom.cellbroadcast.enabled"},
-// IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MozCellBroadcastEtwsInfo", b2g: true, pref: "dom.cellbroadcast.enabled"},
-// IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MozCellBroadcastMessage", b2g: true, pref: "dom.cellbroadcast.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MozClirModeEvent", b2g: true, pref: "dom.mobileconnection.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
diff --git a/dom/webidl/MozCellBroadcast.webidl b/dom/webidl/MozCellBroadcast.webidl
index 11f0f5bdba8..3a0c0c063b7 100644
--- a/dom/webidl/MozCellBroadcast.webidl
+++ b/dom/webidl/MozCellBroadcast.webidl
@@ -8,7 +8,9 @@
  * unacknowledged general CBS messages to be broadcast to all receivers within
  * a particular region.
  */
-[Pref="dom.cellbroadcast.enabled"]
+[Pref="dom.cellbroadcast.enabled",
+ CheckPermissions="cellbroadcast",
+ AvailableIn="CertifiedApps"]
 interface MozCellBroadcast : EventTarget
 {
   /**
diff --git a/dom/webidl/MozCellBroadcastEvent.webidl b/dom/webidl/MozCellBroadcastEvent.webidl
index e86c3cfea04..50fd4906918 100644
--- a/dom/webidl/MozCellBroadcastEvent.webidl
+++ b/dom/webidl/MozCellBroadcastEvent.webidl
@@ -4,7 +4,10 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-[Constructor(DOMString type, optional MozCellBroadcastEventInit eventInitDict), Pref="dom.cellbroadcast.enabled"]
+[Constructor(DOMString type, optional MozCellBroadcastEventInit eventInitDict),
+ Pref="dom.cellbroadcast.enabled",
+ CheckPermissions="cellbroadcast",
+ AvailableIn="CertifiedApps"]
 interface MozCellBroadcastEvent : Event
 {
   readonly attribute MozCellBroadcastMessage? message;
diff --git a/dom/webidl/MozCellBroadcastMessage.webidl b/dom/webidl/MozCellBroadcastMessage.webidl
index 3a0cf771688..58ce5c061c8 100644
--- a/dom/webidl/MozCellBroadcastMessage.webidl
+++ b/dom/webidl/MozCellBroadcastMessage.webidl
@@ -11,7 +11,9 @@ enum CellBroadcastMessageClass {"class-0", "class-1", "class-2",
 enum CellBroadcastEtwsWarningType {"earthquake", "tsunami",
                                    "earthquake-tsunami", "test", "other"};
 
-[Pref="dom.cellbroadcast.enabled"]
+[Pref="dom.cellbroadcast.enabled",
+ CheckPermissions="cellbroadcast",
+ AvailableIn="CertifiedApps"]
 interface MozCellBroadcastMessage
 {
   /**
@@ -72,7 +74,9 @@ interface MozCellBroadcastMessage
   readonly attribute unsigned short? cdmaServiceCategory;
 };
 
-[Pref="dom.cellbroadcast.enabled"]
+[Pref="dom.cellbroadcast.enabled",
+ CheckPermissions="cellbroadcast",
+ AvailableIn="CertifiedApps"]
 interface MozCellBroadcastEtwsInfo
 {
   /**
diff --git a/dom/webidl/Navigator.webidl b/dom/webidl/Navigator.webidl
index 64288fd5ff5..7152414d0bf 100644
--- a/dom/webidl/Navigator.webidl
+++ b/dom/webidl/Navigator.webidl
@@ -300,7 +300,8 @@ partial interface Navigator {
 };
 
 partial interface Navigator {
-  [Throws, Pref="dom.cellbroadcast.enabled", CheckPermissions="cellbroadcast", UnsafeInPrerendering]
+  [Throws, Pref="dom.cellbroadcast.enabled", CheckPermissions="cellbroadcast",
+   AvailableIn="CertifiedApps", UnsafeInPrerendering]
   readonly attribute MozCellBroadcast mozCellBroadcast;
 };