1 files changed, 15 insertions, 5 deletions
diff --git a/browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js b/browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js
index 74eaa6e634..083f6be393 100644
--- a/browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js
+++ b/browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js
@@ -7,6 +7,7 @@ ChromeUtils.defineESModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
   AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
+  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
 });
 
@@ -21,14 +22,19 @@ SearchTestUtils.init(this);
 const DEFAULT_ENGINE = {
   id: "basic",
   name: "basic",
-  loadPath: "[addon]basic@search.mozilla.org",
-  submissionUrl:
-    "https://mochi.test:8888/browser/browser/components/search/test/browser/?search=&foo=1",
+  loadPath: SearchUtils.newSearchConfigEnabled
+    ? "[app]basic@search.mozilla.org"
+    : "[addon]basic@search.mozilla.org",
+  submissionUrl: SearchUtils.newSearchConfigEnabled
+    ? "https://mochi.test:8888/browser/browser/components/search/test/browser/?foo=1&search="
+    : "https://mochi.test:8888/browser/browser/components/search/test/browser/?search=&foo=1",
 };
 const ALTERNATE_ENGINE = {
   id: "simple",
   name: "Simple Engine",
-  loadPath: "[addon]simple@search.mozilla.org",
+  loadPath: SearchUtils.newSearchConfigEnabled
+    ? "[app]simple@search.mozilla.org"
+    : "[addon]simple@search.mozilla.org",
   submissionUrl: "https://example.com/?sourceId=Mozilla-search&search=",
 };
 const ALTERNATE2_ENGINE = {
@@ -97,7 +103,11 @@ add_setup(async function () {
   await SearchTestUtils.useMochitestEngines(searchExtensions);
 
   SearchTestUtils.useMockIdleService();
-  let response = await fetch(`resource://search-extensions/engines.json`);
+  let response = await fetch(
+    SearchUtils.newSearchConfigEnabled
+      ? `resource://search-extensions/search-config-v2.json`
+      : `resource://search-extensions/engines.json`
+  );
   let json = await response.json();
   await SearchTestUtils.updateRemoteSettingsConfig(json.data);