diff --git a/testing/taskcluster/job_flags.yml b/testing/taskcluster/job_flags.yml
index d73a9c7eb135..64c5a87fc071 100644
--- a/testing/taskcluster/job_flags.yml
+++ b/testing/taskcluster/job_flags.yml
@@ -141,10 +141,31 @@ tests:
     allowed_build_tasks:
       tasks/builds/b2g_desktop.yml:
         task: tasks/tests/b2g_build_unit.yml
+  gaia-js-integration:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop.yml:
+        task: tasks/tests/b2g_gaia_js_integration_tests.yml
+        chunks: 4
+      tasks/builds/b2g_desktop_debug.yml:
+        task: tasks/tests/b2g_gaia_js_integration_tests.yml
+        chunks: 4
   gaia-linter:
     allowed_build_tasks:
       tasks/builds/b2g_desktop.yml:
         task: tasks/tests/b2g_linter.yml
+  gaia-ui-test-accessibility:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop.yml:
+        task: tasks/tests/b2g_gaia_ui_test_accessibility.yml
+  gaia-ui-test-functional:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop.yml:
+        task: tasks/tests/b2g_gaia_ui_test_functional.yml
+        chunks: 3
+  gaia-ui-test-unit:
+    allowed_build_tasks:
+      tasks/builds/b2g_desktop.yml:
+        task: tasks/tests/b2g_gaia_ui_test_unit.yml
   jsreftest:
     allowed_build_tasks:
       tasks/builds/b2g_emulator.yml:
@@ -181,14 +202,6 @@ tests:
       tasks/builds/b2g_desktop.yml:
         task: tasks/tests/b2g_mochitest_oop.yml
         chunks: 1
-  gaia-js-integration:
-    allowed_build_tasks:
-      tasks/builds/b2g_desktop.yml:
-        task: tasks/tests/b2g_gaia_js_integration_tests.yml
-        chunks: 4
-      tasks/builds/b2g_desktop_debug.yml:
-        task: tasks/tests/b2g_gaia_js_integration_tests.yml
-        chunks: 4
   reftest:
     allowed_build_tasks:
       tasks/builds/mulet_linux.yml:
diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml
new file mode 100644
index 000000000000..3e78be3c2a7b
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_accessibility.yml
@@ -0,0 +1,50 @@
+---
+task:
+  created: '{{now}}'
+  deadline: '{{#from_now}}24 hours{{/from_now}}'
+  metadata:
+    source: http://todo.com/soon
+    owner: {{owner}}
+    name: Gaia Python Accessibility Integration Tests
+    description: Gaia Python Accessibility Integration Tests run {{chunk}}
+
+  workerType: b2gtest
+  provisionerId: aws-provisioner
+
+  scopes:
+    - 'docker-worker:cache:sources-gaia'
+
+  payload:
+    cache:
+      sources-gaia: '/home/worker/gaia'
+
+    image: '{{#docker_image}}tester{{/docker_image}}'
+    maxRunTime: 3600
+
+    command:
+      - entrypoint # entrypoint ensures we are running in xvfb
+      - ./bin/pull_gaia.sh &&
+      - >
+        python ./mozharness/scripts/marionette.py
+        --no-read-buildbot-config
+        --config-file marionette/gaia_ui_test_prod_config.py
+        --config-file ./mozharness_configs/gaia_integration_override.py
+        --installer-url {{build_url}}
+        --test-url {{tests_url}}
+        --download-symbols ondemand
+        --gip-suite accessibility
+        --gaia-repo https://hg.mozilla.org/integration/gaia-central
+        --gaia-dir /home/worker
+        --xre-url https://s3-us-west-2.amazonaws.com/test-caching/packages/xre.linux-x86_64.zip
+    artifacts:
+      'public/build':
+        type: directory
+        path: '/home/worker/artifacts/'
+        expires: '{{#from_now}}1 year{{/from_now}}'
+
+  extra:
+    treeherder:
+      groupName: Gaia Python Integration Tests
+      groupSymbol: Gip
+      symbol: 'a'
+      productName: b2g
diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml
new file mode 100644
index 000000000000..75da946a4a53
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_functional.yml
@@ -0,0 +1,52 @@
+---
+task:
+  created: '{{now}}'
+  deadline: '{{#from_now}}24 hours{{/from_now}}'
+  metadata:
+    source: http://todo.com/soon
+    owner: {{owner}}
+    name: Gaia Python Functional Integration Tests
+    description: Gaia Python Functional Integration Tests run {{chunk}}
+
+  workerType: b2gtest
+  provisionerId: aws-provisioner
+
+  scopes:
+    - 'docker-worker:cache:sources-gaia'
+
+  payload:
+    cache:
+      sources-gaia: '/home/worker/gaia'
+
+    image: '{{#docker_image}}tester{{/docker_image}}'
+    maxRunTime: 3600
+
+    command:
+      - entrypoint # entrypoint ensures we are running in xvfb
+      - ./bin/pull_gaia.sh &&
+      - >
+        python ./mozharness/scripts/marionette.py
+        --no-read-buildbot-config
+        --config-file marionette/gaia_ui_test_prod_config.py
+        --config-file ./mozharness_configs/gaia_integration_override.py
+        --installer-url {{build_url}}
+        --test-url {{tests_url}}
+        --download-symbols ondemand
+        --gip-suite functional
+        --total-chunk {{total_chunks}}
+        --this-chunk {{chunk}}
+        --gaia-repo https://hg.mozilla.org/integration/gaia-central
+        --gaia-dir /home/worker
+        --xre-url https://s3-us-west-2.amazonaws.com/test-caching/packages/xre.linux-x86_64.zip
+    artifacts:
+      'public/build':
+        type: directory
+        path: '/home/worker/artifacts/'
+        expires: '{{#from_now}}1 year{{/from_now}}'
+
+  extra:
+    treeherder:
+      groupName: Gaia Python Integration Tests
+      groupSymbol: Gip
+      symbol: 'f{{chunk}}'
+      productName: b2g
diff --git a/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml
new file mode 100644
index 000000000000..0be10e053e7d
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/b2g_gaia_ui_test_unit.yml
@@ -0,0 +1,50 @@
+---
+task:
+  created: '{{now}}'
+  deadline: '{{#from_now}}24 hours{{/from_now}}'
+  metadata:
+    source: http://todo.com/soon
+    owner: {{owner}}
+    name: Gaia Python Integration Unit Tests
+    description: Gaia Python Integration Unit Tests run {{chunk}}
+
+  workerType: b2gtest
+  provisionerId: aws-provisioner
+
+  scopes:
+    - 'docker-worker:cache:sources-gaia'
+
+  payload:
+    cache:
+      sources-gaia: '/home/worker/gaia'
+
+    image: '{{#docker_image}}tester{{/docker_image}}'
+    maxRunTime: 3600
+
+    command:
+      - entrypoint # entrypoint ensures we are running in xvfb
+      - ./bin/pull_gaia.sh &&
+      - >
+        python ./mozharness/scripts/marionette.py
+        --no-read-buildbot-config
+        --config-file marionette/gaia_ui_test_prod_config.py
+        --config-file ./mozharness_configs/gaia_integration_override.py
+        --installer-url {{build_url}}
+        --test-url {{tests_url}}
+        --download-symbols ondemand
+        --gip-suite unit
+        --gaia-repo https://hg.mozilla.org/integration/gaia-central
+        --gaia-dir /home/worker
+        --xre-url https://s3-us-west-2.amazonaws.com/test-caching/packages/xre.linux-x86_64.zip
+    artifacts:
+      'public/build':
+        type: directory
+        path: '/home/worker/artifacts/'
+        expires: '{{#from_now}}1 year{{/from_now}}'
+
+  extra:
+    treeherder:
+      groupName: Gaia Python Integration Tests
+      groupSymbol: Gip
+      symbol: 'u'
+      productName: b2g