--- a/toolkit/components/passwordmgr/test/unit/test_isOriginMatching.js
+++ b/toolkit/components/passwordmgr/test/unit/test_isOriginMatching.js
@@ -26,15 +26,44 @@ add_task(function test_isOriginMatching(
     [true, "http://example.com", "https://example.com", { schemeUpgrades: true }],
     [true, "https://example.com", "https://example.com", { schemeUpgrades: true }],
     [true, "http://example.com:8080", "http://example.com:8080", { schemeUpgrades: true }],
     [true, "https://example.com:8443", "https://example.com:8443", { schemeUpgrades: true }],
     [false, "https://example.com", "http://example.com", { schemeUpgrades: true }], // downgrade
     [false, "http://example.com:8080", "https://example.com", { schemeUpgrades: true }], // port mismatch
     [false, "http://example.com", "https://example.com:8443", { schemeUpgrades: true }], // port mismatch
     [false, "http://sub.example.com", "http://example.com", { schemeUpgrades: true }],
+    [true, "http://sub.example.com", "http://example.com", { includeETLDPlusOne: true }],
+    [false, "http://sub.example.com", "https://example.com", { includeETLDPlusOne: true }],
+    [false, "https://sub.example.com", "http://example.com", { includeETLDPlusOne: true }],
+    [false, "http://sub.example.com:8080", "https://example.com", { includeETLDPlusOne: true }], // port mismatch
+    [false, "http://example.com", "https://example.com:8443", { includeETLDPlusOne: true }], // port mismatch
+    [true, "http://sub.example.com", "https://example.com", {
+      includeETLDPlusOne: true,
+      schemeUpgrades: true
+    }],
+    [false, "http://example.com", "https://example.com:8443", {
+      includeETLDPlusOne: true,
+      schemeUpgrades: true
+    }],
+    [false, "http://sub.example.com:8080", "https://example.com", {
+      includeETLDPlusOne: true,
+      schemeUpgrades: true
+    }],
+    [false, "https://sub.example.com", "http://example.com", {
+      includeETLDPlusOne: true,
+      schemeUpgrades: true
+    }],
+    [true, "http://sub.example.com", "https://example.com", {
+      includeETLDPlusOne: true,
+      schemeUpgrades: true
+    }],
+    [true, "http://sub.example.com", "http://example.com", {
+      includeETLDPlusOne: true,
+      schemeUpgrades: true
+    }],
   ];
   for (let tc of testcases) {
     let expected = tc.shift();
     Assert.strictEqual(LoginHelper.isOriginMatching(...tc), expected,
                        "Check " + JSON.stringify(tc));
   }
 });