diff --git a/dom/quota/test/unit/upgrades/test_originAttributesUpgrade.js b/dom/quota/test/unit/upgrades/test_upgradeStorageFrom0_0.js
similarity index 92%
rename from dom/quota/test/unit/upgrades/test_originAttributesUpgrade.js
rename to dom/quota/test/unit/upgrades/test_upgradeStorageFrom0_0.js
index 6a603a3403a9..292b00c327a5 100644
--- a/dom/quota/test/unit/upgrades/test_originAttributesUpgrade.js
+++ b/dom/quota/test/unit/upgrades/test_upgradeStorageFrom0_0.js
@@ -3,6 +3,10 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
+/**
+ * This test is mainly to verify UpgradeStorageFrom0_0To1_0 method.
+ */
+
 var testGenerator = testSteps();
 
 function* testSteps() {
@@ -29,14 +33,14 @@ function* testSteps() {
   const metadataFileName = ".metadata";
   const metadata2FileName = ".metadata-v2";
 
-  // Test upgrade from FF 48 (no storage.sqlite and no .metadata-v2 files).
-
   info("Clearing");
 
   clear(continueToNextStepSync);
   yield undefined;
 
-  installPackage("originAttributesUpgrade_profile");
+  // Storage used by FF 36-48 (storage/default/ directory, but no
+  // storage.sqlite and no .metadata-v2 files).
+  installPackage("version0_0_profile");
 
   info("Checking storage file");
 
diff --git a/dom/quota/test/unit/upgrades/originAttributesUpgrade_profile.zip b/dom/quota/test/unit/upgrades/version0_0_profile.zip
similarity index 100%
rename from dom/quota/test/unit/upgrades/originAttributesUpgrade_profile.zip
rename to dom/quota/test/unit/upgrades/version0_0_profile.zip
diff --git a/dom/quota/test/unit/upgrades/xpcshell.ini b/dom/quota/test/unit/upgrades/xpcshell.ini
index 94b55e29ce32..2eaa91f5c87c 100644
--- a/dom/quota/test/unit/upgrades/xpcshell.ini
+++ b/dom/quota/test/unit/upgrades/xpcshell.ini
@@ -13,11 +13,11 @@ support-files =
   localStorageArchiveDowngrade_profile.zip
   morgueCleanup_profile.zip
   obsoleteOriginAttributes_profile.zip
-  originAttributesUpgrade_profile.zip
   persistentAndDefaultStorageDirectory_profile.zip
   persistentStorageDirectory_flatOriginDirectories_profile.zip
   persistentStorageDirectory_originDirectories_profile.zip
   persistentStorageDirectory_profile.zip
+  version0_0_profile.zip
   version2_1upgrade_profile.zip
   version2_2upgrade_profile.zip
 
@@ -27,11 +27,11 @@ support-files =
 [test_morgueCleanup.js]
 [test_obsoleteOriginAttributesUpgrade.js]
 [test_obsoleteOrigins.js]
-[test_originAttributesUpgrade.js]
 [test_upgradeFromIndexedDBDirectory.js]
 [test_upgradeFromIndexedDBDirectory_removeOldDirectory.js]
 [test_upgradeFromFlatOriginDirectories.js]
 [test_upgradeFromPersistentStorageDirectory.js]
 [test_upgradeFromPersistentStorageDirectory_removeOldDirectory.js]
 [test_upgradeFromPersistentStorageDirectory_upgradeOriginDirectories.js]
+[test_upgradeStorageFrom0_0.js]
 [test_version2_1upgrade.js]