diff --git a/browser/base/content/test/performance/browser.ini b/browser/base/content/test/performance/browser.ini
index 1a6b0281df6f..57cc5be25c73 100644
--- a/browser/base/content/test/performance/browser.ini
+++ b/browser/base/content/test/performance/browser.ini
@@ -12,7 +12,8 @@ prefs =
   gfx.canvas.willReadFrequently.enable=true
   # The form autofill framescript is only used in certain locales if this
   # pref is set to 'detect', which is the default value on non-Nightly.
-  extensions.formautofill.available='on'
+  extensions.formautofill.addresses.available='on'
+  extensions.formautofill.creditCards.available='on'
   browser.urlbar.disableExtendForTests=true
   # The Screenshots extension is disabled by default in Mochitests. We re-enable
   # it here, since it's a more realistic configuration.
diff --git a/browser/components/preferences/tests/browser.ini b/browser/components/preferences/tests/browser.ini
index aad61ad2dee5..9d1e5525f500 100644
--- a/browser/components/preferences/tests/browser.ini
+++ b/browser/components/preferences/tests/browser.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
 prefs =
-  extensions.formautofill.available='on'
-  extensions.formautofill.creditCards.available=true
+  extensions.formautofill.addresses.available='on'
+  extensions.formautofill.creditCards.available='on'
   signon.management.page.os-auth.enabled=true
 support-files =
   head.js
diff --git a/testing/profiles/unittest-features/user.js b/testing/profiles/unittest-features/user.js
index 6362d118edeb..a9ad020d2000 100644
--- a/testing/profiles/unittest-features/user.js
+++ b/testing/profiles/unittest-features/user.js
@@ -27,4 +27,5 @@ user_pref("dom.forms.datetime-local", true);
 user_pref("dom.gamepad.enabled", true);
 user_pref("dom.gamepad.non_standard_events.enabled", true);
 // Enable form autofill feature testing.
-user_pref("extensions.formautofill.available", "on");
+user_pref("extensions.formautofill.addresses.available", "on");
+user_pref("extensions.formautofill.creditCards.available", "on");