diff --git a/testing/taskcluster/tasks/phone_test.yml b/testing/taskcluster/tasks/phone_test.yml
index 2d7bf278d8fd..21c76886bc49 100644
--- a/testing/taskcluster/tasks/phone_test.yml
+++ b/testing/taskcluster/tasks/phone_test.yml
@@ -1,3 +1,4 @@
+# This task is the base for most tests in gecko.
 task:
   created: '{{now}}'
   deadline: '{{#from_now}}24 hours{{/from_now}}'
@@ -28,9 +29,6 @@ task:
       GAIA_REF: '{{{gaia_ref}}}'
       GAIA_REV: '{{{gaia_rev}}}'
       TESTS_TIMEOUT_IN_MS: 30000
-      MANIFEST_PATH: gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini
-      MANIFEST_INCLUDE_EXCLUDE: b2g-dsds
-      LOGCAT_FILE_MAX_SIZE_IN_KB: 102400
 
     log: 'private/b2g/logs/live.log'
 
@@ -57,35 +55,6 @@ task:
           sims: '0'
           build: '{{{img_url}}}'
 
-    command:
-      - >
-        adb logcat
-        -H $PROXY_HOST
-        -P $ADB_PORT
-        -v threadtime
-        -r LOGCAT_FILE_MAX_SIZE_IN_KB
-        &> /home/worker/upload/logs/logcat.log
-        &
-
-      - >
-        gaiatest
-        --total-chunks={{total_chunks}}
-        --this-chunk={{chunk}}
-        --testvars=/home/worker/data/gaia_testvars.json
-        --testvars=/home/worker/data/device.json
-        --adb-host=$PROXY_HOST
-        --adb-port=$ADB_PORT
-        --address=$PROXY_HOST:$MARIONETTE_PORT
-        --device $SERIAL_ID
-        --xml-output=/home/worker/upload/logs/xml_output.xml
-        --log-html=/home/worker/upload/logs/index.html
-        --log-mach=-
-        --log-raw=/home/worker/upload/logs/raw.log
-        --restart
-        --timeout=$TESTS_TIMEOUT_IN_MS
-        --type=$MANIFEST_INCLUDE_EXCLUDE
-        $MANIFEST_PATH
-
   extra:
     treeherder:
       groupSymbol: tc
diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml
index 506fbf7ac0c0..d5e65d42307c 100644
--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml
@@ -13,6 +13,26 @@ task:
         phone:
           sims: '1'
 
+    command:
+      - >
+        gaiatest
+        --total-chunks={{total_chunks}}
+        --this-chunk={{chunk}}
+        --testvars=/home/worker/data/gaia_testvars.json
+        --testvars=/home/worker/data/device.json
+        --adb-host=$PROXY_HOST
+        --adb-port=$ADB_PORT
+        --address=$PROXY_HOST:$MARIONETTE_PORT
+        --device $SERIAL_ID
+        --xml-output=/home/worker/upload/logs/xml_output.xml
+        --timeout=$TESTS_TIMEOUT_IN_MS
+        --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
+
   extra:
     chunks:
       total: 6
diff --git 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
index 897176177bf9..d29fee5ca271 100644
--- 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
@@ -8,14 +8,29 @@ task:
   workerType: flame-kk-2-sim
 
   payload:
-    env:
-      MANIFEST_INCLUDE_EXCLUDE: b2g+dsds
-
     capabilities:
       devices:
         phone:
           sims: '2'
 
+    command:
+      - >
+        gaiatest
+        --testvars=/home/worker/data/gaia_testvars.json
+        --testvars=/home/worker/data/device.json
+        --adb-host=$PROXY_HOST
+        --adb-port=$ADB_PORT
+        --address=$PROXY_HOST:$MARIONETTE_PORT
+        --device $SERIAL_ID
+        --xml-output=/home/worker/upload/logs/xml_output.xml
+        --timeout=$TESTS_TIMEOUT_IN_MS
+        --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
+
   extra:
     treeherder:
       groupName: Gaia Python Integration Tests
diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
index b268772a6039..782a7d8ad303 100644
--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
@@ -9,14 +9,29 @@ task:
   retries: 0
 
   payload:
-    env:
-      MANIFEST_INCLUDE_EXCLUDE: b2g+sanity
-
     capabilities:
       devices:
         phone:
           sims: '1'
 
+    command:
+      - >
+        gaiatest
+        --testvars=/home/worker/data/gaia_testvars.json
+        --testvars=/home/worker/data/device.json
+        --adb-host=$PROXY_HOST
+        --adb-port=$ADB_PORT
+        --address=$PROXY_HOST:$MARIONETTE_PORT
+        --device $SERIAL_ID
+        --xml-output=/home/worker/upload/logs/xml_output.xml
+        --timeout=$TESTS_TIMEOUT_IN_MS
+        --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
+
   extra:
     treeherder:
       groupName: Gaia Python Integration Tests
diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml
index 5b191125678c..0c3db556b217 100644
--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml
@@ -8,8 +8,23 @@ task:
   workerType: flame-kk-0-sim
 
   payload:
-    env:
-      MANIFEST_PATH: gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/unit/manifest.ini
+    command:
+      - >
+        gaiatest
+        --testvars=/home/worker/data/gaia_testvars.json
+        --testvars=/home/worker/data/device.json
+        --adb-host=$PROXY_HOST
+        --adb-port=$ADB_PORT
+        --address=$PROXY_HOST:$MARIONETTE_PORT
+        --device $SERIAL_ID
+        --xml-output=/home/worker/upload/logs/xml_output.xml
+        --timeout=$TESTS_TIMEOUT_IN_MS
+        --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
 
   extra:
     treeherder: