diff --git a/build/automation.py.in b/build/automation.py.in
index 0549e238117..cb947527410 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -610,6 +610,22 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
         'description': 'https://example.com Privileged App with manifest policy',
         'appStatus': _APP_STATUS_PRIVILEGED
       }, 
+      {
+        'name': 'https_a_domain_certified',
+        'csp' : "",
+        'origin': 'https://acertified.com',
+        'manifestURL': 'https://acertified.com/manifest.webapp',
+        'description': 'https://acertified.com Certified App',
+        'appStatus': _APP_STATUS_CERTIFIED
+      }, 
+      {
+        'name': 'https_a_domain_privileged',
+        'csp': "",
+        'origin': 'https://aprivileged.com',
+        'manifestURL': 'https://aprivileged.com/manifest.webapp',
+        'description': 'https://aprivileged.com Privileged App ',
+        'appStatus': _APP_STATUS_PRIVILEGED
+      }, 
     ];
     self.setupTestApps(profileDir, apps)
 
diff --git a/dom/permission/tests/test_permission_basics.html b/dom/permission/tests/test_permission_basics.html
index 66135105be9..43de203fd07 100644
--- a/dom/permission/tests/test_permission_basics.html
+++ b/dom/permission/tests/test_permission_basics.html
@@ -21,6 +21,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={770731}
 
 "use strict";
 
+var testPrivApp = {
+  'manifestURL' : 'https://aprivileged.com/manifest.webapp'
+};
+
+var testCertApp = {
+  'manifestURL' : 'https://acertified.com/manifest.webapp'
+};
+
 SpecialPowers.addPermission("permissions", true, document);
 var comp = SpecialPowers.wrap(Components);
 SpecialPowers.pushPrefEnv({ "set": [["dom.mozPermissionSettings.enabled", true]] }, 
@@ -32,24 +40,54 @@ comp.utils.import("resource://gre/modules/PermissionSettings.jsm");
 var mozPermissions = window.navigator.mozPermissionSettings;
 
 function permissionTest() {
+  // Any permission explicit for privileged and implicit for certified serves
+  var testPerm = "geolocation";
+
+  // Simulate than the app request the permissions
+  SpecialPowers.addPermission(testPerm, true, testPrivApp);
+  SpecialPowers.addPermission(testPerm, true, testCertApp);
+
   if (gPermissionssEnabled) {
-    mozPermissions.set("a", "unknown", "http://examplemanifestURI.com", "http://origin.com", true);
-    var result = mozPermissions.get("a", "http://examplemanifestURI.com", "http://origin.com", true);
-    is(result, "unknown", "same result");
-    mozPermissions.set("a", "allow", "http://examplemanifestURI.com", "http://origin.com", true);
-    result = mozPermissions.get("a", "http://examplemanifestURI.com", "http://origin.com", true);
+    var certAppManifest = testCertApp.manifestURL;
+    var privAppManifest = testPrivApp.manifestURL;
+    var originPriv = "https://aprivileged.com";
+    var originCert = "https://acertified.com";
+
+    // Trying to make any change to implicit permissions should fail
+    try {
+      mozPermissions.set(testPerm, "allow", certAppManifest, originCert, false);
+      ok(false, "Change implicit permission");
+    } catch (e) {
+      ok(true, "Change implicit permission");
+    }
+
+    var result=mozPermissions.get(testPerm, certAppManifest, originCert, false);
     is(result, "allow", "same result");
-    mozPermissions.set("a", "deny", "http://examplemanifestURI.com", "http://origin.com", true);
-    result = mozPermissions.get("a", "http://examplemanifestURI.com", "http://origin.com", true);
-    is(result, "deny", "same result");
-    mozPermissions.set("a", "prompt", "http://examplemanifestURI.com", "http://origin.com", true);
-    result = mozPermissions.get("a", "http://examplemanifestURI.com", "http://origin.com", true);
-    is(result, "prompt", "same result");
+
+    // Erasing a permission, even an explicit one, is not allowed
+    try {
+      mozPermissions.set(testPerm, "unknown", privAppManifest, originPriv, false);
+      ok(false, "Erase explicit permission");
+    } catch (e) {
+      ok(true, "Erase explicit permission");
+    }
+
+    mozPermissions.set(testPerm, "allow", privAppManifest, originPriv, false);
+    result = mozPermissions.get(testPerm, privAppManifest, originPriv, false);
+    is(result, "allow", "Set to allow");
+    mozPermissions.set(testPerm, "deny", privAppManifest, originPriv, false);
+    result = mozPermissions.get(testPerm, privAppManifest, originPriv, false);
+    is(result, "deny", "Set to deny");
+    mozPermissions.set(testPerm, "prompt", privAppManifest, originPriv, false);
+    result = mozPermissions.get(testPerm, privAppManifest, originPriv, false);
+    is(result, "prompt", "Set to prompt");
     SimpleTest.finish();
   } else {
     is(mozPermissions, null, "mozPermissionSettings is null when not enabled.");
     SimpleTest.finish();
   }
+  SpecialPowers.removePermission(testPerm, testPrivApp);
+  SpecialPowers.removePermission(testPerm, testCertApp);
 }
 
 var gPermissionssEnabled = SpecialPowers.getBoolPref("dom.mozPermissionSettings.enabled");
diff --git a/dom/permission/tests/unit/test_bug808734.js b/dom/permission/tests/unit/test_bug808734.js
index 13f9c6631f1..168e9b03c69 100644
--- a/dom/permission/tests/unit/test_bug808734.js
+++ b/dom/permission/tests/unit/test_bug808734.js
@@ -51,7 +51,7 @@ function do_check_set_eq(a1, a2) {
 
 function run_test() {
   var scope = {};
-  Cu.import("resource://gre/modules/PermissionsInstaller.jsm", scope);
+  Cu.import("resource://gre/modules/PermissionsTable.jsm", scope);
 
   for (var i = 0; i < gData.length; i++) {
     var perms = scope.expandPermissions(gData[i].permission,