deleted file mode 100644
--- a/testing/taskcluster/tasks/b2g_e2e_tests_base_definition.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-task:
-  created: '{{now}}'
-  deadline: '{{#from_now}}24 hours{{/from_now}}'
-  metadata:
-    source: '{{source}}'
-    owner: mozilla-taskcluster-maintenance@mozilla.com
-  tags:
-    createdForUser: {{owner}}
-  workerType: b2gtest
-  provisionerId: aws-provisioner-v1
-  schedulerId: task-graph-scheduler
-
-  scopes:
-    - 'docker-worker:image:{{#docker_image}}tester-device{{/docker_image}}'
-    - 'queue:create-task:aws-provisioner-v1/testdroid-device'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
-    - 'docker-worker:capability:device:phone'
-
-  payload:
-    image: '{{#docker_image}}tester-device{{/docker_image}}'
-    maxRunTime: 7200
-    cache:
-      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
-    env:
-      MOZ_BUILD_DATE: '{{pushdate}}'
-      GAIA_HEAD_REPOSITORY: '{{{gaia_head_repository}}}'
-      GAIA_BASE_REPOSITORY: '{{{gaia_base_repository}}}'
-      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
-
-    log: 'private/b2g/logs/live.log'
-
-    # All builds share a common artifact directory for ease of uploading.
-    artifacts:
-      '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}}'
-
-      'private/b2g/videos':
-        type: directory
-        path: '/home/worker/upload/videos/'
-        expires: '{{#from_now}}3 months{{/from_now}}'
-
-    features:
-      testdroidProxy: true
-
-    capabilities:
-      devices:
-        phone:
-          type: 'flame'
-          memory: '512'
-          sims: '0'
-          build: '{{{img_url}}}'
-
-    command:
-      - >
-        adb
-        -H $PROXY_HOST
-        -P $ADB_PORT
-        -s $SERIAL_ID
-        logcat
-        -v threadtime
-        &> /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
-        --capture=whenfail
-        --capturefolder=/home/worker/upload/videos/
-        --restart
-        --timeout=$TESTS_TIMEOUT_IN_MS
-        --type=$MANIFEST_INCLUDE_EXCLUDE
-        $MANIFEST_PATH
-
-  extra:
-    treeherder:
-      groupName: B2G end-to-end tests (Python)
-      groupSymbol: e2e-py
-      productName: b2g
-    chunks:
-      total: 1
-      current: {{chunk}}

--- a/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml
@@ -1,20 +1,6 @@
 ---
 # 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/b2g_e2e_tests.yml
-  gaia-ui-test-functional-dsds:
-    allowed_build_tasks:
-      tasks/builds/b2g_flame_kk_eng.yml:
-        task: tasks/tests/b2g_e2e_dsds_tests.yml
-  gaia-ui-test-unit:
-    allowed_build_tasks:
-      tasks/builds/b2g_flame_kk_eng.yml:
-        task: tasks/tests/b2g_e2e_api_tests.yml

--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -26,17 +26,16 @@ flags:
     # with "foobar-7".  Note that a few aliases allowed chunks to be specified
     # without a leading `-`, for example 'mochitest-dt1'. That's no longer
     # supported.
     cppunit: /cppunit.*/
     crashtest: /crashtest.*/
     crashtest-e10s: /crashtest-e10s.*/
     e10s: /.*e10s.*/
     gaia-js-integration: /.*gaia-js-integration.*/
-    gaia-ui-test: /.*gaia-ui-test.*/
     gtest: /gtest.*/
     jittest: /jittest.*/
     jittests: /jittest.*/
     jsreftest: /jsreftest.*/
     jsreftest-e10s: /jsreftest-e10s.*/
     luciddream: /luciddream.*/
     marionette: /marionette.*/
     mochitest: /mochitest.*/
@@ -114,20 +113,16 @@ flags:
     - crashtest-e10s
     - crashtest-ipc
     - gaia-build
     - gaia-build-unit
     - gaia-js-integration
     - gaia-linter
     - gaia-unit
     - gaia-unit-oop
-    - gaia-ui-test-sanity
-    - gaia-ui-test-functional
-    - gaia-ui-test-functional-dsds
-    - gaia-ui-test-unit
     - gtest
     - jetpack
     - jittests
     - jsreftest
     - jsreftest-e10s
     - luciddream
     - marionette
     - marionette-webapi
@@ -150,9 +145,8 @@ flags:
     - reftest-ipc
     - reftest-no-accel
     - reftest-sanity-oop
     - web-platform-tests
     - web-platform-tests-e10s
     - web-platform-tests-reftests
     - web-platform-tests-reftests-e10s
     - xpcshell
-

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_e2e_api_tests.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-$inherits:
-  from: tasks/b2g_e2e_tests_base_definition.yml
-task:
-  metadata:
-    name: B2G gecko APIs tests (on device)
-    description: Tests which verifies the APIs needed for setting up the e2e tests
-  workerType: flame-kk-0-sim
-
-  payload:
-    env:
-      MANIFEST_PATH: gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/unit/manifest.ini
-
-  extra:
-    treeherder:
-      symbol: 'a'

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_e2e_dsds_tests.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-$inherits:
-  from: tasks/b2g_e2e_tests_base_definition.yml
-task:
-  metadata:
-    name: B2G end-to-end DSDS tests
-    description: Tests which require 2 SIM cards
-  workerType: flame-kk-2-sim
-
-  payload:
-    env:
-      MANIFEST_INCLUDE_EXCLUDE: b2g+dsds
-
-    capabilities:
-      devices:
-        phone:
-          sims: '2'
-
-  extra:
-    treeherder:
-      symbol: 'dsds'

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_e2e_tests.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-$inherits:
-  from: tasks/b2g_e2e_tests_base_definition.yml
-task:
-  metadata:
-    name: B2G end-to-end tests
-    description: Regular end-to-end tests
-  workerType: flame-kk-1-sim
-
-  payload:
-    capabilities:
-      devices:
-        phone:
-          sims: '1'
-
-  extra:
-    chunks:
-      total: 6
-
-    treeherder:
-      symbol: '{{chunk}}'