--- a/b2g/config/emulator-ics/config.json
+++ b/b2g/config/emulator-ics/config.json
@@ -8,17 +8,17 @@
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["droid", "package-emulator", "package-tests"],
     "upload_files": [
         "{workdir}/out/target/product/generic/*.tar.bz2",
         "{workdir}/out/target/product/generic/tests/*.zip",
         "{workdir}/out/emulator.tar.gz",
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
-        "{objdir}/dist/test_packages.json",
+        "{objdir}/dist/b2g-*.test_packages.json",
         "{workdir}/sources.xml"
     ],
     "upload_platform": "emulator-ics",
     "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
             "root": "https://hg.mozilla.org/gaia-l10n"

--- a/b2g/config/emulator/config.json
+++ b/b2g/config/emulator/config.json
@@ -8,17 +8,17 @@
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["droid", "package-emulator", "package-tests"],
     "upload_files": [
         "{workdir}/out/target/product/generic/*.tar.bz2",
         "{workdir}/out/target/product/generic/tests/*.zip",
         "{workdir}/out/emulator.tar.gz",
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
-        "{objdir}/dist/test_packages.json",
+        "{objdir}/dist/b2g-*.test_packages.json",
         "{workdir}/sources.xml"
     ],
     "public_upload_files": [
         "{workdir}/out/target/product/generic/*.tar.bz2",
         "{workdir}/out/target/product/generic/tests/*.zip",
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{objdir}/dist/b2g-*.tar.gz",
         "{workdir}/sources.xml"

--- a/testing/mozharness/scripts/b2g_build.py
+++ b/testing/mozharness/scripts/b2g_build.py
@@ -958,21 +958,22 @@ class B2GBuild(LocalesMixin, PurgeMixin,
                     '%s/%s' % (download_url, 'emulator.tar.gz'),
                 ]
                 self.set_buildbot_property('packageUrl', downloadables[0], write_to_file=True)
                 matches = glob.glob(os.path.join(dirs['abs_upload_dir'], 'b2g*crashreporter-symbols.zip'))
                 if matches:
                     symbols_url = "%s/%s" % (download_url, os.path.basename(matches[0]))
                     downloadables.append(symbols_url)
                     self.set_buildbot_property('symbolsUrl', symbols_url, write_to_file=True)
-                matches = glob.glob(os.path.join(dirs['abs_upload_dir'], 'b2g*tests.zip'))
+                matches = glob.glob(os.path.join(dirs['abs_upload_dir'], 'b2g*test_packages.json'))
                 if matches:
-                    tests_url = "%s/%s" % (download_url, os.path.basename(matches[0]))
-                    downloadables.append(tests_url)
-                    self.set_buildbot_property('testsUrl', tests_url, write_to_file=True)
+                    test_packages_url = "%s/%s" % (download_url, os.path.basename(matches[0]))
+                    downloadables.append(test_packages_url)
+                    self.set_buildbot_property('testPackagesUrl', test_packages_url,
+                                               write_to_file=True)
                     self.invoke_sendchange(downloadables=downloadables)
 
         if self.query_is_nightly() and os.path.exists(dirs['abs_public_upload_dir']) and self.config['upload'].get('public'):
             self.info("Uploading public bits...")
             self._do_postupload_upload(
                 dirs['abs_public_upload_dir'],
                 self.config['upload']['public']['ssh_key'],
                 self.config['upload']['public']['ssh_user'],