--- a/testing/docker/tester-device/Dockerfile
+++ b/testing/docker/tester-device/Dockerfile
@@ -26,17 +26,17 @@ RUN apt-get upgrade -y && apt-get instal
 RUN curl https://bootstrap.pypa.io/get-pip.py | python
 RUN pip install virtualenv
 
 RUN git config --global user.email "mozilla@example.com" && \
     git config --global user.name "mozilla"
 
 
 # Get node packages
-RUN npm install -g taskcluster-vcs@2.3.0
+RUN npm install -g taskcluster-vcs@2.3.1
 
 WORKDIR /home/worker
 
 ADD bin /home/worker/bin
 ADD data /home/worker/data
 ADD https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step /home/worker/bin/buildbot_step
 RUN chmod u+x /home/worker/bin/*
 

--- a/testing/docker/tester-device/bin/entrypoint
+++ b/testing/docker/tester-device/bin/entrypoint
@@ -18,19 +18,19 @@ export ADB_HOST=`echo $res | jq .proxies
 export ADB_PORT=`echo $res | jq .proxies.adb.port`
 export MARIONETTE_HOST=`echo $res | jq .proxies.marionette.forwardHost`
 export MARIONETTE_PORT=`echo $res | jq .proxies.marionette.port`
 export PROXY_HOST=`echo $res | jq -r .proxyHost`
 echo "Retrieved device.  Session: $SESSION_ID"
 
 curl -o /home/worker/data/device.json -s -H "Accept: application/json" http://$CLOUD_HOST/device/properties
 
-buildbot_step 'Gaia clone' tc-vcs checkout /home/worker/gaia/source $GAIA_BASE_REPOSITORY $GAIA_HEAD_REPOSITORY $GAIA_REV $GAIA_REF
+buildbot_step 'Clone gaia' tc-vcs checkout /home/worker/gaia/source $GAIA_BASE_REPOSITORY $GAIA_HEAD_REPOSITORY $GAIA_REV $GAIA_REF
 
 cd gaia/source/tests/python/gaia-ui-tests/
 python setup.py develop
-pip install py
+pip install -Ur gaiatest/tests/requirements.txt
 cd /home/worker/
 
 buildbot_step 'Running tests' eval $@
 
 echo "Releasing device."
 curl --request POST http://$CLOUD_HOST/device/release

--- a/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml
@@ -15,9 +15,22 @@ builds:
   flame-kk-eng:
     platforms:
       - b2g
     types:
       opt:
         task: tasks/builds/b2g_flame_kk_eng.yml
 
   gaia-ui-test-sanity:
-        task: tasks/tests/flame_kk_gaia_ui_test_sanity.yml
\ No newline at end of file
+        task: tasks/tests/flame_kk_gaia_ui_test_sanity.yml
+  gaia-ui-test-functional:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/flame_kk_gaia_ui_test_functional.yml
+        chunks: 3
+  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-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/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -27,16 +27,17 @@ flags:
     - gaia-js-integration
     - gaia-linter
     - gaia-unit
     - gaia-unit-oop
     - gaia-ui-test-sanity
     - gaia-ui-test-oop
     - gaia-ui-test-accessibility
     - gaia-ui-test-functional
+    - gaia-ui-test-functional-dsds
     - gaia-ui-test-unit
     - jetpack
     - jittests
     - jsreftest
     - marionette
     - marionette-webapi
     - mochitest
     - mochitest-media

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml
@@ -0,0 +1,46 @@
+---
+$inherits:
+  from: 'tasks/phone_test.yml'
+task:
+  metadata:
+    name: '[TC] Gaia Python Functional Integration Tests'
+    description: Gaia Python Functional Integration Tests run {{chunk}}
+  workerType: testdroid-device
+
+  payload:
+    env:
+      DEVICE_CAPABILITIES: '{"type":"flame","memory":"319","sims": "1","build":"{{{img_url}}}"}'
+    features:
+      testdroidProxy: true
+    maxRunTime: 7200
+    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=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{{chunk}}'
+      productName: b2g

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml
@@ -0,0 +1,44 @@
+---
+$inherits:
+  from: 'tasks/phone_test.yml'
+task:
+  metadata:
+    name: '[TC] Gaia Python Integration Functional DSDS Tests'
+    description: Gaia Python Integration Functional DSDS Tests run
+  workerType: testdroid-device
+
+  payload:
+    env:
+      DEVICE_CAPABILITIES: '{"type":"flame","memory":"319","sims": "2","build":"{{{img_url}}}"}'
+    features:
+      testdroidProxy: true
+    maxRunTime: 7200
+    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=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
@@ -1,30 +1,45 @@
 ---
 $inherits:
   from: 'tasks/phone_test.yml'
 task:
   metadata:
-    name: '[TC] Gaia Python Sanity Integration Tests'
-    description: Gaia Python Integration Tests
+    name: '[TC] Gaia Python Integration Sanity Tests'
+    description: Gaia Python Integration Sanity Tests run
   workerType: testdroid-device
   retries: 0
 
   payload:
     env:
       DEVICE_CAPABILITIES: '{"type":"flame","memory":"319","sims": "1","build":"{{{img_url}}}"}'
     features:
       testdroidProxy: true
     maxRunTime: 7200
     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=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
+      - >
+        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=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'
+      symbol: 's'
       productName: b2g

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml
@@ -0,0 +1,44 @@
+---
+$inherits:
+  from: 'tasks/phone_test.yml'
+task:
+  metadata:
+    name: '[TC] Gaia Python Integration Unit Tests'
+    description: Gaia Python Integration Tests run
+  workerType: testdroid-device
+
+  payload:
+    env:
+      DEVICE_CAPABILITIES: '{"type":"flame","memory":"319","sims": "0","build":"{{{img_url}}}"}'
+    features:
+      testdroidProxy: true
+    maxRunTime: 7200
+    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=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