--- a/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml
@@ -1,6 +1,24 @@
 ---
 # For complete sample of all build and test jobs,
 # see <gecko>/testing/taskcluster/tasks/branches/base_job_flags.yml
 
 $inherits:
   from: tasks/branches/base_jobs.yml
+
+tests:
+  gaia-ui-test-functional:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/flame_kk_gaia_ui_test_functional.yml
+  gaia-ui-test-functional-dsds:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml
+  gaia-ui-test-sanity:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/flame_kk_gaia_ui_test_sanity.yml
+  gaia-ui-test-unit:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/flame_kk_gaia_ui_test_unit.yml

--- a/testing/taskcluster/tasks/phone_test.yml
+++ b/testing/taskcluster/tasks/phone_test.yml
@@ -23,19 +23,26 @@ task:
     cache:
       tc-vcs: '/home/worker/.tc-vcs'
     env:
       GAIA_HEAD_REPOSITORY: '{{{gaia_head_repository}}}'
       GAIA_BASE_REPOSITORY: '{{{gaia_base_repository}}}'
       GAIA_REF: '{{{gaia_ref}}}'
       GAIA_REV: '{{{gaia_rev}}}'
 
+    log: 'private/b2g/logs/live.log'
+
     # All builds share a common artifact directory for ease of uploading.
     artifacts:
-      'private/logs':
+      'private/b2g/device.json':
+        type: file
+        path: '/home/worker/data/device.json'
+        expires: '{{#from_now}}1 year{{/from_now}}'
+
+      'private/b2g/logs':
         type: directory
         path: '/home/worker/upload/logs/'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     treeherder:
       groupSymbol: tc
       groupName: Submitted by taskcluster

--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml
@@ -32,21 +32,16 @@ task:
         --xml-output=/home/worker/upload/logs/xml_output.xml
         --timeout=10000
         --log-html=/home/worker/upload/logs/index.html
         --restart
         --type=b2g-dsds
         --log-mach=-
         --log-raw=/home/worker/upload/logs/raw.log
         gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini
-    artifacts:
-      'private/device.json':
-        type: file
-        path: '/home/worker/data/device.json'
-        expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     chunks:
       total: 6
 
     treeherder:
       groupName: Gaia Python Integration Tests
       groupSymbol: tc-Gip

--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml
@@ -30,20 +30,15 @@ task:
         --xml-output=/home/worker/upload/logs/xml_output.xml
         --timeout=10000
         --log-html=/home/worker/upload/logs/index.html
         --restart
         --type=b2g+dsds
         --log-mach=-
         --log-raw=/home/worker/upload/logs/raw.log
         gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini
-    artifacts:
-      'private/device.json':
-        type: file
-        path: '/home/worker/data/device.json'
-        expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     treeherder:
       groupName: Gaia Python Integration Tests
       groupSymbol: tc-Gip
       symbol: 'f-dsds'
       productName: b2g

--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
@@ -31,20 +31,15 @@ task:
         --xml-output=/home/worker/upload/logs/xml_output.xml
         --timeout=10000
         --log-html=/home/worker/upload/logs/index.html
         --restart
         --type=b2g+sanity-dsds
         --log-mach=-
         --log-raw=/home/worker/upload/logs/raw.log
         gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini
-    artifacts:
-      'private/device.json':
-        type: file
-        path: '/home/worker/data/device.json'
-        expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     treeherder:
       groupName: Gaia Python Integration Tests
       groupSymbol: tc-Gip
       symbol: 's'
       productName: b2g

--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml
@@ -30,20 +30,15 @@ task:
         --xml-output=/home/worker/upload/logs/xml_output.xml
         --timeout=10000
         --log-html=/home/worker/upload/logs/index.html
         --restart
         --type=b2g
         --log-mach=-
         --log-raw=/home/worker/upload/logs/raw.log
         gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/unit/manifest.ini
-    artifacts:
-      'private/device.json':
-        type: file
-        path: '/home/worker/data/device.json'
-        expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     treeherder:
       groupName: Gaia Python Integration Tests
       groupSymbol: tc-Gip
       symbol: 'u'
       productName: b2g