--- a/testing/taskcluster/docs/index.rst
+++ b/testing/taskcluster/docs/index.rst
@@ -94,17 +94,17 @@ builds correctly but may not effect the 
           'public/some_tests.zip': '/path/to/tests'
 
       extra:
         # Build tasks may put their artifacts anywhere but there are common
         # resources that test tasks need to do their job correctly so we
         # need to provide an easy way to lookup the correct aritfact path.
         locations:
           build: 'public/name_i_made_up.tar.gz'
-          tests: 'public/some_tests.zip' or test_packages: 'public/test_packages.json'
+          tests: 'public/some_tests.zip' or test_packages: 'public/target.test_packages.json'
 
 
 Templates properties
 --------------------
 
 ``repository``
    Target HG repository (e.g.: ``https://hg.mozilla.org/mozilla-central``)
 

--- a/testing/taskcluster/scripts/builder/build-emulator-x86.sh
+++ b/testing/taskcluster/scripts/builder/build-emulator-x86.sh
@@ -55,14 +55,14 @@ mkdir -p $HOME/artifacts
 ls -lah $WORKSPACE/B2G/out
 ls -lah $gecko_objdir/dist/
 
 mv $WORKSPACE/B2G/sources.xml $HOME/artifacts/sources.xml
 mv $WORKSPACE/B2G/out/target/product/generic_x86/tests/gaia-tests.zip $HOME/artifacts/gaia-tests.zip
 for name in common cppunittest reftest mochitest xpcshell web-platform; do
     mv $gecko_objdir/dist/*.$name.tests.zip $HOME/artifacts/target.$name.tests.zip ;
 done
-mv $gecko_objdir/dist/test_packages_tc.json $HOME/artifacts/test_packages.json
+mv $gecko_objdir/dist/b2g-*.test_packages.json $HOME/artifacts/target.test_packages.json
 mv $WORKSPACE/B2G/out/emulator.tar.gz $HOME/artifacts/emulator.tar.gz
 mv $gecko_objdir/dist/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
 mv $gecko_objdir/dist/mozharness.zip $HOME/artifacts/mozharness.zip
 
 ccache -s

--- a/testing/taskcluster/scripts/builder/build-emulator.sh
+++ b/testing/taskcluster/scripts/builder/build-emulator.sh
@@ -57,14 +57,14 @@ mkdir -p $HOME/artifacts
 ls -lah $WORKSPACE/B2G/out
 ls -lah $gecko_objdir/dist/
 
 mv $WORKSPACE/B2G/sources.xml $HOME/artifacts/sources.xml
 mv $WORKSPACE/B2G/out/target/product/generic/tests/gaia-tests.zip $HOME/artifacts/gaia-tests.zip
 for name in common cppunittest reftest mochitest xpcshell web-platform; do
     mv $gecko_objdir/dist/*.$name.tests.zip  $HOME/artifacts/target.$name.tests.zip ;
 done
-mv $gecko_objdir/dist/test_packages_tc.json $HOME/artifacts/test_packages.json
+mv $gecko_objdir/dist/b2g-*.test_packages.json $HOME/artifacts/target.test_packages.json
 mv $WORKSPACE/B2G/out/emulator.tar.gz $HOME/artifacts/emulator.tar.gz
 mv $gecko_objdir/dist/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
 mv $gecko_objdir/dist/mozharness.zip $HOME/artifacts/mozharness.zip
 
 ccache -s

--- a/testing/taskcluster/scripts/builder/build-mulet-linux.sh
+++ b/testing/taskcluster/scripts/builder/build-mulet-linux.sh
@@ -28,16 +28,16 @@ mkdir -p $HOME/artifacts/
 
 # Discard version numbers from packaged files, they just make it hard to write
 # the right filename in the task payload where artifacts are declared
 mv *.linux-x86_64.tar.bz2       $HOME/artifacts/target.linux-x86_64.tar.bz2
 mv *.linux-x86_64.json          $HOME/artifacts/target.linux-x86_64.json
 for name in common cppunittest reftest mochitest xpcshell web-platform; do
     mv *.$name.tests.zip          $HOME/artifacts/target.$name.tests.zip ;
 done
-mv test_packages_tc.json        $HOME/artifacts/test_packages.json
+mv *.test_packages.json         $HOME/artifacts/target.test_packages.json
 mv *.crashreporter-symbols.zip  $HOME/artifacts/target.crashreporter-symbols.zip
 mv jsshell-linux-x86_64.zip     $HOME/artifacts/jsshell-linux-x86_64.zip
 mv mozharness.zip               $HOME/artifacts/mozharness.zip
 
 ccache -s
 
 ################################### build.sh ###################################

--- a/testing/taskcluster/tasks/builds/b2g_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_base.yml
@@ -5,10 +5,10 @@
 task:
   payload:
     image:
       type: 'task-image'
       path: 'public/image.tar'
       taskId: '{{#task_id_for_image}}builder{{/task_id_for_image}}'
   extra:
     locations:
-      test_packages: 'public/build/test_packages.json'
+      test_packages: 'public/build/target.test_packages.json'
       mozharness: 'public/build/mozharness.zip'

--- a/testing/taskcluster/tasks/builds/firefox_base.yml
+++ b/testing/taskcluster/tasks/builds/firefox_base.yml
@@ -1,14 +1,14 @@
 $inherits:
   from: 'tasks/build.yml'
   variables:
     build_product: 'firefox'
 task:
   extra:
     locations:
       mozharness: 'public/build/mozharness.zip'
-      test_packages: 'public/build/test_packages.json'
+      test_packages: 'public/build/target.test_packages.json'
   payload:
     image:
       type: 'task-image'
       path: 'public/image.tar'
       taskId: '{{#task_id_for_image}}desktop-build{{/task_id_for_image}}'

--- a/testing/taskcluster/tasks/builds/mulet_linux.yml
+++ b/testing/taskcluster/tasks/builds/mulet_linux.yml
@@ -50,9 +50,9 @@ task:
       groupSymbol: "?"
       machine:
         platform: mulet-linux64
     # Rather then enforcing particular conventions we require that all build
     # tasks provide the "build" extra field to specify where the build and tests
     # files are located.
     locations:
       build: 'public/build/target.linux-x86_64.tar.bz2'
-      test_packages: 'public/build/test_packages.json'
+      test_packages: 'public/build/target.test_packages.json'