--- a/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_contextmenu.js
+++ b/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_contextmenu.js
@@ -7,17 +7,17 @@ add_task(function* test() {
     Services.logins.removeAllLogins();
 
     // Add some initial logins
     let urls = [
         "http://example.com/",
         "http://mozilla.org/",
         "http://spreadfirefox.com/",
         "https://support.mozilla.org/",
-        "http://hg.mozilla.org/"
+        "https://hg.mozilla.org/"
     ];
     let nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
                                                  Ci.nsILoginInfo, "init");
     let logins = [
         new nsLoginInfo(urls[0], urls[0], null, "", "o hai", "u1", "p1"),
         new nsLoginInfo(urls[1], urls[1], null, "ehsan", "coded", "u2", "p2"),
         new nsLoginInfo(urls[2], urls[2], null, "this", "awesome", "u3", "p3"),
         new nsLoginInfo(urls[3], urls[3], null, "array of", "logins", "u4", "p4"),
@@ -54,17 +54,17 @@ add_task(function* test() {
             info("Clear the selection");
             selection.clearSelection();
             assertMenuitemEnabled("copyusername", false);
             assertMenuitemEnabled("editusername", false);
             assertMenuitemEnabled("copypassword", false);
             assertMenuitemEnabled("editpassword", false);
 
             info("Select the third row and making the password column visible");
-            selection.select(2);
+            selection.select(1);
             doc.getElementById("passwordCol").hidden = false;
             assertMenuitemEnabled("copyusername", true);
             assertMenuitemEnabled("editusername", true);
             assertMenuitemEnabled("copypassword", true);
             assertMenuitemEnabled("editpassword", true, "password column visible");
             menuitem.doCommand();
         }
 

--- a/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_sort.js
+++ b/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_sort.js
@@ -13,17 +13,17 @@ add_task(function* test() {
     let urls = [
         "http://example.com/",
         "http://example.org/",
         "http://mozilla.com/",
         "http://mozilla.org/",
         "http://spreadfirefox.com/",
         "http://planet.mozilla.org/",
         "https://developer.mozilla.org/",
-        "http://hg.mozilla.org/",
+        "https://hg.mozilla.org/",
         "http://dxr.mozilla.org/",
         "http://feeds.mozilla.org/",
     ];
     let users = [
         "user",
         "username",
         "ehsan",
         "ehsan",

--- a/toolkit/components/passwordmgr/test/browser/browser_passwordmgrdlg.js
+++ b/toolkit/components/passwordmgr/test/browser/browser_passwordmgrdlg.js
@@ -13,17 +13,17 @@ add_task(function* test() {
     let urls = [
         "http://example.com/",
         "http://example.org/",
         "http://mozilla.com/",
         "http://mozilla.org/",
         "http://spreadfirefox.com/",
         "http://planet.mozilla.org/",
         "https://developer.mozilla.org/",
-        "http://hg.mozilla.org/",
+        "https://hg.mozilla.org/",
         "http://dxr.mozilla.org/",
         "http://feeds.mozilla.org/",
     ];
     let nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
                                                  Ci.nsILoginInfo, "init");
     let logins = [
         new nsLoginInfo(urls[0], urls[0], null, "user", "password", "u1", "p1"),
         new nsLoginInfo(urls[1], urls[1], null, "username", "password", "u2", "p2"),
@@ -68,17 +68,17 @@ add_task(function* test() {
             {filter: "mozil", count: 7},
             {filter: "mozill", count: 7},
             {filter: "mozilla", count: 7},
             {filter: "mozilla.com", count: 1, count2: 2},
             {filter: "user", count: 4},
             {filter: "user ", count: 1},
             {filter: " user", count: 2},
             {filter: "http", count: 10},
-            {filter: "https", count: 1},
+            {filter: "https", count: 2},
             {filter: "secret", count: 0, count2: 2},
             {filter: "secret!", count: 0},
         ];
 
         let toggleCalls = 0;
         function toggleShowPasswords(func) {
             let toggleButton = doc.getElementById("togglePasswords");
             let showMode = (toggleCalls++ % 2) == 0;