deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug397778/install.rdf
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>bug397778@tests.mozilla.org</em:id>
-    <em:version>1.0</em:version>
-    
-    <em:targetApplication>
-      <Description>
-        <em:id>xpcshell@tests.mozilla.org</em:id>
-        <em:minVersion>1</em:minVersion>
-        <em:maxVersion>1</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-    
-    <em:localized>
-      <Description em:locale="fr">
-        <em:name>fr Name</em:name>
-        <em:description>fr Description</em:description>
-      </Description>
-    </em:localized>
-    
-    <em:localized>
-      <Description em:locale="de-DE">
-        <em:name>de-DE Name</em:name>
-      </Description>
-    </em:localized>
-    
-    <em:localized>
-      <Description em:locale="es-ES">
-        <em:name>es-ES Name</em:name>
-        <em:description>es-ES Description</em:description>
-      </Description>
-    </em:localized>
-    
-    <em:localized>
-      <Description em:locale="zh-TW">
-        <em:name>zh-TW Name</em:name>
-        <em:description>zh-TW Description</em:description>
-      </Description>
-    </em:localized>
-    
-    <em:localized>
-      <Description em:locale="zh-CN">
-        <em:name>zh-CN Name</em:name>
-        <em:description>zh-CN Description</em:description>
-      </Description>
-    </em:localized>
-    
-    <em:localized>
-      <Description em:locale="en-GB">
-        <em:name>en-GB Name</em:name>
-        <em:description>en-GB Description</em:description>
-      </Description>
-    </em:localized>
-    
-    <em:localized>
-      <Description em:locale="en">
-        <em:name>en Name</em:name>
-        <em:description>en Description</em:description>
-      </Description>
-    </em:localized>
-    
-    <em:localized>
-      <Description em:locale="en-CA">
-        <em:name>en-CA Name</em:name>
-        <em:description>en-CA Description</em:description>
-      </Description>
-    </em:localized>
-    
-    <!-- Front End MetaData -->
-    <em:name>Fallback Name</em:name>
-    <em:description>Fallback Description</em:description>
-
-  </Description>      
-</RDF>

--- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
@@ -66,17 +66,16 @@ ChromeUtils.defineModuleGetter(this, "Mo
 
 XPCOMUtils.defineLazyServiceGetter(this, "aomStartup",
                                    "@mozilla.org/addons/addon-manager-startup;1",
                                    "amIAddonManagerStartup");
 
 // Whitelist existing tests that still use non-restartless extensions.
 const LEGACY_NON_RESTARTLESS_TESTS = new Set([
   "test_blocklistchange.js",
-  "test_bug397778.js",
   "test_bug425657.js",
   "test_bug455906.js",
 ]);
 
 if (LEGACY_NON_RESTARTLESS_TESTS.has(_TEST_FILE[0].replace(/.*\//, ""))) {
   Services.prefs.setBoolPref("extensions.legacy.non-restartless.enabled", true);
 }
 

--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug397778.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug397778.js
@@ -1,25 +1,81 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-const ADDON = "test_bug397778";
 const ID = "bug397778@tests.mozilla.org";
 
+const ADDON = {
+  id: "bug397778@tests.mozilla.org",
+  version: "1.0",
+  name: "Fallback Name",
+  description: "Fallback Description",
+  bootstrap: true,
+
+  targetApplications: [{
+    id: "xpcshell@tests.mozilla.org",
+    minVersion: "1",
+    maxVersion: "1"}],
+
+  localized: [
+    {
+      locale: ["fr"],
+      name: "fr Name",
+      description: "fr Description",
+    },
+    {
+      locale: ["de-DE"],
+      name: "de-DE Name",
+    },
+    {
+      locale: ["es-ES"],
+      name: "es-ES Name",
+      description: "es-ES Description",
+    },
+    {
+      locale: ["zh-TW"],
+      name: "zh-TW Name",
+      description: "zh-TW Description",
+    },
+    {
+      locale: ["zh-CN"],
+      name: "zh-CN Name",
+      description: "zh-CN Description",
+    },
+    {
+      locale: ["en-GB"],
+      name: "en-GB Name",
+      description: "en-GB Description",
+    },
+    {
+      locale: ["en"],
+      name: "en Name",
+      description: "en Description",
+    },
+    {
+      locale: ["en-CA"],
+      name: "en-CA Name",
+      description: "en-CA Description",
+    },
+  ],
+};
+
+const XPI = createTempXPIFile(ADDON);
+
 function run_test() {
   // Setup for test
   do_test_pending();
   createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1");
   Services.locale.setRequestedLocales(["fr-FR"]);
 
   // Install test add-on
   startupManager();
-  installAllFiles([do_get_addon(ADDON)], function() {
+  installAllFiles([XPI], function() {
     restartManager();
 
     run_test_1();
   });
 }
 
 function run_test_1() {
   AddonManager.getAddonByID(ID, callback_soon(function(addon) {