diff --git a/browser/extensions/formautofill/test/browser/browser.ini b/browser/extensions/formautofill/test/browser/browser.ini
index 71f0ddd97463..a9835ec88478 100644
--- a/browser/extensions/formautofill/test/browser/browser.ini
+++ b/browser/extensions/formautofill/test/browser/browser.ini
@@ -2,3 +2,4 @@
 
 [browser_check_installed.js]
 [browser_privacyPreferences.js]
+[browser_manageProfilesDialog.js]
diff --git a/browser/extensions/formautofill/test/browser/browser_manageProfilesDialog.js b/browser/extensions/formautofill/test/browser/browser_manageProfilesDialog.js
new file mode 100644
index 000000000000..6ff575a9faad
--- /dev/null
+++ b/browser/extensions/formautofill/test/browser/browser_manageProfilesDialog.js
@@ -0,0 +1,125 @@
+"use strict";
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+const MANAGE_PROFILES_DIALOG_URL = "chrome://formautofill/content/manageProfiles.xhtml";
+const TEST_SELECTORS = {
+  selProfiles: "#profiles",
+  btnRemove: "#remove",
+  btnAdd: "#add",
+  btnEdit: "#edit",
+};
+
+const TEST_PROFILE_1 = {
+  organization: "World Wide Web Consortium",
+  "street-address": "32 Vassar Street\nMIT Room 32-G524",
+  "address-level2": "Cambridge",
+  "address-level1": "MA",
+  "postal-code": "02139",
+  country: "US",
+  tel: "+1 617 253 5702",
+  email: "timbl@w3.org",
+};
+
+const TEST_PROFILE_2 = {
+  "street-address": "Some Address",
+  country: "US",
+};
+
+const TEST_PROFILE_3 = {
+  "street-address": "Other Address",
+  "postal-code": "12345",
+};
+
+function saveProfile(profile) {
+  Services.cpmm.sendAsyncMessage("FormAutofill:SaveProfile", {profile});
+  return TestUtils.topicObserved("formautofill-storage-changed");
+}
+
+function removeProfiles(guids) {
+  Services.cpmm.sendAsyncMessage("FormAutofill:RemoveProfiles", {guids});
+  return TestUtils.topicObserved("formautofill-storage-changed");
+}
+
+function waitForProfiles() {
+  return new Promise(resolve => {
+    Services.cpmm.addMessageListener("FormAutofill:Profiles", function getResult(result) {
+      Services.cpmm.removeMessageListener("FormAutofill:Profiles", getResult);
+      // Wait for the next tick for elements to get rendered.
+      SimpleTest.executeSoon(resolve.bind(null, result.data));
+    });
+  });
+}
+
+registerCleanupFunction(function* () {
+  Services.cpmm.sendAsyncMessage("FormAutofill:GetProfiles", {});
+  let profiles = yield waitForProfiles();
+  if (profiles.length) {
+    yield removeProfiles(profiles.map(profile => profile.guid));
+  }
+});
+
+add_task(function* test_manageProfilesInitialState() {
+  yield BrowserTestUtils.withNewTab({gBrowser, url: MANAGE_PROFILES_DIALOG_URL}, function* (browser) {
+    yield ContentTask.spawn(browser, TEST_SELECTORS, (args) => {
+      let selProfiles = content.document.querySelector(args.selProfiles);
+      let btnRemove = content.document.querySelector(args.btnRemove);
+      let btnEdit = content.document.querySelector(args.btnEdit);
+      let btnAdd = content.document.querySelector(args.btnAdd);
+
+      is(selProfiles.length, 0, "No profile");
+      is(btnAdd.disabled, false, "Add button enabled");
+      is(btnRemove.disabled, true, "Remove button disabled");
+      is(btnEdit.disabled, true, "Edit button disabled");
+    });
+  });
+});
+
+add_task(function* test_removingSingleAndMultipleProfiles() {
+  yield saveProfile(TEST_PROFILE_1);
+  yield saveProfile(TEST_PROFILE_2);
+  yield saveProfile(TEST_PROFILE_3);
+
+  let win = window.openDialog(MANAGE_PROFILES_DIALOG_URL);
+  yield waitForProfiles();
+
+  let selProfiles = win.document.querySelector(TEST_SELECTORS.selProfiles);
+  let btnRemove = win.document.querySelector(TEST_SELECTORS.btnRemove);
+  let btnEdit = win.document.querySelector(TEST_SELECTORS.btnEdit);
+
+  is(selProfiles.length, 3, "Three profiles");
+
+  EventUtils.synthesizeMouseAtCenter(selProfiles.children[0], {}, win);
+  is(btnRemove.disabled, false, "Remove button enabled");
+  is(btnEdit.disabled, false, "Edit button enabled");
+  EventUtils.synthesizeMouseAtCenter(btnRemove, {}, win);
+  yield waitForProfiles();
+  is(selProfiles.length, 2, "Two profiles left");
+
+  EventUtils.synthesizeMouseAtCenter(selProfiles.children[0], {}, win);
+  EventUtils.synthesizeMouseAtCenter(selProfiles.children[1],
+                                     {shiftKey: true}, win);
+  is(btnEdit.disabled, true, "Edit button disabled when multi-select");
+
+  EventUtils.synthesizeMouseAtCenter(btnRemove, {}, win);
+  yield waitForProfiles();
+  is(selProfiles.length, 0, "All profiles are removed");
+
+  win.close();
+});
+
+add_task(function* test_profilesDialogWatchesStorageChanges() {
+  let win = window.openDialog(MANAGE_PROFILES_DIALOG_URL);
+  yield waitForProfiles();
+
+  let selProfiles = win.document.querySelector(TEST_SELECTORS.selProfiles);
+
+  yield saveProfile(TEST_PROFILE_1);
+  let profiles = yield waitForProfiles();
+  is(selProfiles.length, 1, "One profile is shown");
+
+  yield removeProfiles([profiles[0].guid]);
+  yield waitForProfiles();
+  is(selProfiles.length, 0, "Profile is removed");
+  win.close();
+});