diff --git a/toolkit/components/passwordmgr/test/unit/data/signons-v5v6.sqlite b/toolkit/components/passwordmgr/test/unit/data/signons-v5v6.sqlite
deleted file mode 100644
index eb4ee6d01e0d..000000000000
Binary files a/toolkit/components/passwordmgr/test/unit/data/signons-v5v6.sqlite and /dev/null differ
diff --git a/toolkit/components/passwordmgr/test/unit/test_storage_mozStorage.js b/toolkit/components/passwordmgr/test/unit/test_storage_mozStorage.js
index d88e596d25a7..a7fafb57957a 100644
--- a/toolkit/components/passwordmgr/test/unit/test_storage_mozStorage.js
+++ b/toolkit/components/passwordmgr/test/unit/test_storage_mozStorage.js
@@ -6,11 +6,10 @@
 
 const ENCTYPE_BASE64 = 0;
 const ENCTYPE_SDR = 1;
-const PERMISSION_SAVE_LOGINS = "login-saving";
 
 // Current schema version used by storage-mozStorage.js. This will need to be
 // kept in sync with the version there (or else the tests fail).
-const CURRENT_SCHEMA = 6;
+const CURRENT_SCHEMA = 5;
 
 function* copyFile(aLeafName)
 {
@@ -62,34 +61,10 @@ function reloadStorage(aInputPathName, aInputFileName)
 function checkStorageData(storage, ref_disabledHosts, ref_logins)
 {
   LoginTestUtils.assertLoginListsEqual(storage.getAllLogins(), ref_logins);
-  LoginTestUtils.assertDisabledHostsEqual(getAllDisabledHostsFromPermissionManager(),
+  LoginTestUtils.assertDisabledHostsEqual(storage.getAllDisabledHosts(),
                                           ref_disabledHosts);
 }
 
-function getAllDisabledHostsFromPermissionManager() {
-  let disabledHosts = [];
-  let enumerator = Services.perms.enumerator;
-
-  while (enumerator.hasMoreElements()) {
-    let perm = enumerator.getNext();
-    if (perm.type == PERMISSION_SAVE_LOGINS && perm.capability == Services.perms.DENY_ACTION) {
-      disabledHosts.push(perm.principal.URI.prePath);
-    }
-  }
-
-  return disabledHosts;
-}
-
-function setLoginSavingEnabled(origin, enabled) {
-  let uri = Services.io.newURI(origin, null, null);
-
-  if (enabled) {
-    Services.perms.remove(uri, PERMISSION_SAVE_LOGINS);
-  } else {
-    Services.perms.add(uri, PERMISSION_SAVE_LOGINS, Services.perms.DENY_ACTION);
-  }
-}
-
 add_task(function* test_execute()
 {
 
@@ -114,17 +89,6 @@ function getEncTypeForID(conn, id) {
     return encType;
 }
 
-function getAllDisabledHostsFromMozStorage(conn) {
-    let disabledHosts = [];
-    let stmt = conn.createStatement("SELECT hostname from moz_disabledHosts");
-
-    while (stmt.executeStep()) {
-      disabledHosts.push(stmt.row.hostname);
-    }
-
-    return disabledHosts;
-}
-
 var storage;
 var dbConnection;
 var testnum = 0;
@@ -165,7 +129,6 @@ do_check_eq(999, dbConnection.schemaVersion);
 dbConnection.close();
 
 storage = reloadStorage(OUTDIR, "signons-v999.sqlite");
-setLoginSavingEnabled("https://disabled.net", false);
 checkStorageData(storage, ["https://disabled.net"], [testuser1]);
 
 // Check to make sure we downgraded the schema version.
@@ -327,9 +290,6 @@ do_check_eq(3, dbConnection.schemaVersion);
 storage = reloadStorage(OUTDIR, "signons-v3.sqlite");
 do_check_eq(CURRENT_SCHEMA, dbConnection.schemaVersion);
 
-// Remove old entry from permission manager.
-setLoginSavingEnabled("https://disabled.net", true);
-
 // Check that timestamps and counts were initialized correctly
 checkStorageData(storage, [], [testuser1, testuser2]);
 
@@ -411,46 +371,9 @@ storage = reloadStorage(OUTDIR, "signons-v4v5.sqlite");
 do_check_eq(CURRENT_SCHEMA, dbConnection.schemaVersion);
 do_check_true(dbConnection.tableExists("moz_deleted_logins"));
 
+
 /* ========== 11 ========== */
 testnum++;
-testdesc = "Test upgrade from v5->v6 storage";
-
-yield* copyFile("signons-v5v6.sqlite");
-
-// Sanity check the test file.
-dbConnection = openDB("signons-v5v6.sqlite");
-do_check_eq(5, dbConnection.schemaVersion);
-do_check_true(dbConnection.tableExists("moz_disabledHosts"));
-
-// Initial disabled hosts inside signons-v5v6.sqlite
-var disabledHosts = [
-  "http://disabled1.example.com",
-  "http://大.net",
-  "http://xn--19g.com"
-];
-
-LoginTestUtils.assertDisabledHostsEqual(disabledHosts, getAllDisabledHostsFromMozStorage(dbConnection));
-
-// Reload storage
-storage = reloadStorage(OUTDIR, "signons-v5v6.sqlite");
-do_check_eq(CURRENT_SCHEMA, dbConnection.schemaVersion);
-
-// moz_disabledHosts should now be empty after migration.
-LoginTestUtils.assertDisabledHostsEqual([], getAllDisabledHostsFromMozStorage(dbConnection));
-
-// Get all the other hosts currently saved in the permission manager.
-let hostsInPermissionManager = getAllDisabledHostsFromPermissionManager();
-
-// All disabledHosts should have migrated to the permission manager
-LoginTestUtils.assertDisabledHostsEqual(disabledHosts, hostsInPermissionManager);
-
-// Remove all disabled hosts from the permission manager before test ends
-for (let host of disabledHosts) {
-  setLoginSavingEnabled(host, true);
-}
-
-/* ========== 12 ========== */
-testnum++;
 testdesc = "Create nsILoginInfo instances for testing with"
 
 testuser1 = new nsLoginInfo;
@@ -464,7 +387,7 @@ testuser1.init("http://dummyhost.mozilla.org", "", null,
  * file, then upon next use create a new database file.
  */
 
-/* ========== 13 ========== */
+/* ========== 12 ========== */
 testnum++;
 testdesc = "Corrupt database and backup"