--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -70,21 +70,16 @@ flags:
     web-platform-test: /web-platform-tests.*/
     web-platform-tests: /web-platform-tests.*/
     web-platform-tests-e10s: /web-platform-tests-e10s.*/
     web-platform-tests-reftests: /web-platform-tests-reftests.*/
     web-platform-tests-reftests-e10s: /web-platform-tests-reftests-e10s.*/
     xpcshell: /xpcshell.*/
 
   builds:
-    - emulator
-    - emulator-jb
-    - emulator-kk
-    - emulator-x86-kk
-    - emulator-l
     - linux32_gecko  # b2g desktop linux 32 bit
     - linux64_gecko  # b2g desktop linux 64 bit
     - linux64-mulet  # Firefox desktop - b2g gecko linux 64 bit
     - linux64-haz    # Firefox desktop browser, rooting hazard analysis
     - linux64-shell-haz  # JS shell, rooting hazard analysis
     - linux64-mulet-haz  # Firefox desktop - b2g gecko linux 64 bit, rooting hazard analysis
     - macosx64_gecko # b2g desktop osx 64 bit
     - win32_gecko    # b2g desktop win 32 bit

--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -7,40 +7,16 @@
 
 builds:
   linux64-mulet:
     platforms:
       - Mulet Linux
     types:
       opt:
         task: tasks/builds/mulet_linux.yml
-  emulator-kk:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_emulator_kk_opt.yml
-      debug:
-        task: tasks/builds/b2g_emulator_kk_debug.yml
-  emulator-x86-kk:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_emulator_x86_kk_opt.yml
-      debug:
-        task: tasks/builds/b2g_emulator_x86_kk_debug.yml
-  emulator-l:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_emulator_l_opt.yml
-      debug:
-        task: tasks/builds/b2g_emulator_l_debug.yml
   linux:
     platforms:
       - Linux
     types:
       opt:
         task: tasks/builds/opt_linux32.yml
       debug:
         task: tasks/builds/dbg_linux32.yml
@@ -183,28 +159,22 @@ builds:
     when:
       file_patterns:
        - js/public/**
        - js/src/**
 
 tests:
   cppunit:
     allowed_build_tasks:
-      tasks/builds/b2g_emulator_x86_kk_opt.yml:
-        task: tasks/tests/b2g_emulator_cpp_unit.yml
-      tasks/builds/b2g_emulator_x86_kk_debug.yml:
-        task: tasks/tests/b2g_emulator_cpp_unit.yml
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_cppunit_opt.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_cppunit_dbg.yml
   crashtest:
     allowed_build_tasks:
-      tasks/builds/b2g_emulator_x86_kk_opt.yml:
-        task: tasks/tests/b2g_emulator_crashtest.yml
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_crashtest_opt.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_crashtest_dbg.yml
   crashtest-e10s:
     allowed_build_tasks:
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_crashtest_e10s_opt.yml
@@ -253,26 +223,20 @@ tests:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_marionette_dbg.yml
   marionette-e10s:
     allowed_build_tasks:
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_marionette_e10s_opt.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_marionette_e10s_dbg.yml
-  marionette-webapi:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_x86_kk_opt.yml:
-        task: tasks/tests/b2g_emulator_marionette_webapi.yml
   mochitest:
     allowed_build_tasks:
       tasks/builds/mulet_linux.yml:
         task: tasks/tests/mulet_mochitests.yml
-      tasks/builds/b2g_emulator_x86_kk_opt.yml:
-        task: tasks/tests/b2g_emulator_mochitest.yml
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_mochitest_plain_opt.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_mochitest_plain_dbg.yml
   mochitest-e10s:
     allowed_build_tasks:
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_mochitest_plain_e10s_opt.yml
@@ -341,20 +305,16 @@ tests:
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_mochitest_gl_e10s_opt.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_mochitest_gl_e10s_dbg.yml
   reftest:
     allowed_build_tasks:
       tasks/builds/mulet_linux.yml:
         task: tasks/tests/mulet_reftests.yml
-      tasks/builds/b2g_emulator_kk_opt.yml:
-        task: tasks/tests/b2g_emulator_reftest.yml
-      tasks/builds/b2g_emulator_x86_kk_opt.yml:
-        task: tasks/tests/b2g_emulator_reftest.yml
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_reftest_opt.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_reftest_dbg.yml
   reftest-e10s:
     allowed_build_tasks:
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_reftest_e10s_opt.yml
@@ -385,18 +345,16 @@ tests:
   web-platform-tests-reftests-e10s:
     allowed_build_tasks:
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_web_platform_tests_reftests_e10s_opt.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_web_platform_tests_reftests_e10s_dbg.yml
   xpcshell:
     allowed_build_tasks:
-      tasks/builds/b2g_emulator_x86_kk_opt.yml:
-        task: tasks/tests/b2g_emulator_xpcshell_chunked.yml
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_xpcshell_opt.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_xpcshell_dbg.yml
 
 # Miscellaneous tasks.
 tasks:
   eslint-gecko:

--- a/testing/taskcluster/tasks/branches/cedar/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/cedar/job_flags.yml
@@ -7,102 +7,20 @@
 
 builds:
   linux64-mulet:
     platforms:
       - Mulet Linux
     types:
       opt:
         task: tasks/builds/mulet_linux.yml
-  emulator-kk:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_emulator_kk_opt.yml
-      debug:
-        task: tasks/builds/b2g_emulator_kk_debug.yml
-  emulator-jb:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_emulator_jb_opt.yml
-      debug:
-        task: tasks/builds/b2g_emulator_jb_debug.yml
-  emulator:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_emulator_ics_opt.yml
-      debug:
-        task: tasks/builds/b2g_emulator_ics_debug.yml
 
 tests:
-  cppunit:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_cpp_unit.yml
-      tasks/builds/b2g_emulator_ics_debug.yml:
-        task: tasks/tests/b2g_emulator_cpp_unit.yml
-  crashtest:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_crashtest.yml
-        chunks: 3
-      tasks/builds/b2g_emulator_ics_debug.yml:
-        task: tasks/tests/b2g_emulator_crashtest.yml
-        chunks: 3
-  jsreftest:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_js_reftest.yml
-        chunks: 3
-  marionette:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_marionette.yml
-      tasks/builds/b2g_emulator_ics_debug.yml:
-        task: tasks/tests/b2g_emulator_marionette.yml
-  marionette-webapi:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_marionette_webapi.yml
-      tasks/builds/b2g_emulator_ics_debug.yml:
-        task: tasks/tests/b2g_emulator_marionette_webapi.yml
   mochitest:
     allowed_build_tasks:
       tasks/builds/mulet_linux.yml:
         task: tasks/tests/mulet_mochitests.yml
         chunks: 5
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_mochitest.yml
-        chunks: 9
-      tasks/builds/b2g_emulator_ics_debug.yml:
-        task: tasks/tests/b2g_emulator_mochitest.yml
-        chunks: 20
-      tasks/builds/b2g_emulator_jb_opt.yml:
-        task: tasks/tests/b2g_emulator_mochitest.yml
-        chunks: 1
-  mochitest-media:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_mochitest_media.yml
   reftest:
     allowed_build_tasks:
       tasks/builds/mulet_linux.yml:
         task: tasks/tests/mulet_reftests.yml
         chunks: 6
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_reftest.yml
-        chunks: 20
-      tasks/builds/b2g_emulator_ics_debug.yml:
-        task: tasks/tests/b2g_emulator_reftest.yml
-        chunks: 10
-  xpcshell:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_xpcshell_chunked.yml
-        chunks: 1
-      tasks/builds/b2g_emulator_ics_debug.yml:
-        task: tasks/tests/b2g_emulator_xpcshell_chunked.yml
-        chunks: 2

--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -6,22 +6,16 @@
   from: tasks/branches/base_jobs.yml
 
 # Flags specific to this branch
 flags:
   post-build:
     - upload-symbols
 
 builds:
-  emulator-x86-l:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_emulator_x86_l_opt.yml
   android-api-15:
     platforms:
       - Android
     types:
       opt:
         task: tasks/builds/android_api_15.yml
   android-partner-sample1:
     platforms:
@@ -76,21 +70,8 @@ post-build:
   upload-symbols:
     allowed_build_tasks:
       - tasks/builds/opt_linux64.yml
       - tasks/builds/opt_linux64_st-an.yml
       - tasks/builds/dbg_linux64.yml
       - tasks/builds/android_api_15.yml
     task: tasks/post-builds/upload_symbols.yml
 
-tests:
-  marionette:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_x86_kk_opt.yml:
-        task: tasks/tests/b2g_emulator_marionette.yml
-  mochitest:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_x86_l_opt.yml:
-        task: tasks/tests/b2g_emulator_mochitest.yml
-  reftest:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_x86_l_opt.yml:
-        task: tasks/tests/b2g_emulator_reftest.yml

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_base.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_base.yml'
-task:
-  scopes:
-    - 'docker-worker:cache:tooltool-cache'
-
-  metadata:
-    description: |
-      Android emulators + b2g environment used in full stack testing.
-  payload:
-    cache:
-      tooltool-cache: '/home/worker/tooltool-cache'
-
-    env:
-      TARGET: 'emulator'
-      B2G_DEBUG: 0
-      REPO_TRACE: 1
-
-    # Emulators can take a very long time to build!
-    maxRunTime: 14400
-
-    command:
-      - /bin/bash
-      - -c
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
-        buildbot_step 'Build' ./build-emulator.sh $HOME/workspace
-
-  extra:
-    # Rather then enforcing particular conventions we require that all build
-    # tasks provide the "build" extra field to specify where the build and tests
-    # files are located.
-    locations:
-      build: 'public/build/emulator.tar.gz'
-      symbols: 'public/build/b2g-crashreporter-symbols.zip'
-      sources: 'public/build/sources.xml'
-    url:
-      busybox: 'https://api.pub.build.mozilla.org/tooltool/sha512/0748e900821820f1a42e2f1f3fa4d9002ef257c351b9e6b78e7de0ddd0202eace351f440372fbb1ae0b7e69e8361b036f6bd3362df99e67fc585082a311fc0df'

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_emulator_base.yml'
-  variables:
-    build_name: 'emulator-ics'
-    build_type: 'debug'
-task:
-  workerType: emulator-ics-debug
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-ics-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-ics-debug-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Emulator ICS (Debug)'
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      # Disable "TC" prefix...
-      groupSymbol: "?"
-      collection:
-        debug: true
-      machine:
-        platform: b2g-emu-ics
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-emulator-ics-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-ics-debug-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'emulator'
-      B2G_DEBUG: 1
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-ics/releng-emulator-ics.manifest'

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_emulator_base.yml'
-  variables:
-    build_type: 'opt'
-    build_name: 'emulator-ics'
-task:
-  workerType: emulator-ics
-  routes:
-    - 'index.buildbot.branches.{{project}}.emulator-ics'
-    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.emulator-ics'
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-ics-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-ics-opt-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Emulator ICS (Opt)'
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      # Disable "TC" prefix...
-      groupSymbol: "?"
-      machine:
-        platform: b2g-emu-ics
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-emulator-ics-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-ics-opt-objdir-gecko: /home/worker/objdir-gecko
-
-    env:
-      TARGET: 'emulator'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-ics/releng-emulator-ics.manifest'

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_emulator_base.yml'
-  variables:
-    build_name: 'emulator-jb'
-    build_type: 'debug'
-task:
-  workerType: emulator-jb-debug
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-jb-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-jb-debug-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Emulator JB (Debug)'
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      # Disable "TC" prefix...
-      groupSymbol: "?"
-      collection:
-        debug: true
-      machine:
-        platform: b2g-emu-jb
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-emulator-jb-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-jb-debug-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'emulator-jb'
-      B2G_DEBUG: 1
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-jb/releng-emulator-jb.manifest'
-      # This setting is to offset the number of arugments passsed into docker run
-      # for https://github.com/docker/docker/issues/14203
-      DOCKER_OVERRIDE: 1

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_emulator_base.yml'
-  variables:
-    build_name: 'emulator-jb'
-    build_type: 'opt'
-task:
-  workerType: emulator-jb
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-jb-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-jb-opt-objdir-gecko'
-  metadata:
-    name: '[TC] B2G JB Emulator: (Opt)'
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    # Disable "TC" prefix...
-    treeherder:
-      groupSymbol: "?"
-      machine:
-        platform: b2g-emu-jb
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-emulator-jb-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-jb-opt-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'emulator-jb'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-jb/releng-emulator-jb.manifest'

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_emulator_base.yml'
-  variables:
-    build_name: 'emulator-kk'
-    build_type: 'debug'
-task:
-  workerType: emulator-kk-debug
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-debug-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Emulator KK (Debug)'
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      # Disable "TC" prefix...
-      groupSymbol: "?"
-      collection:
-        debug: true
-      machine:
-        platform: b2g-emu-kk
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-emulator-kk-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-kk-debug-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'emulator-kk'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-kk/releng-emulator-kk.manifest'
-      B2G_DEBUG: 1
-      # This setting is to offset the number of arugments passsed into docker run
-      # for https://github.com/docker/docker/issues/14203
-      DOCKER_OVERRIDE: 1

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_emulator_base.yml'
-  variables:
-    build_name: 'emulator-kk'
-    build_type: 'opt'
-task:
-  workerType: emulator-kk
-  routes:
-    - 'index.buildbot.branches.{{project}}.emulator-kk'
-    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.emulator-kk'
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-opt-objdir-gecko'
-  metadata:
-    name: '[TC] B2G KK Emulator (Opt)'
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      # Disable "TC" prefix...
-      groupSymbol: "?"
-      machine:
-        platform: b2g-emu-kk
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-emulator-kk-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-kk-opt-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'emulator-kk'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-kk/releng-emulator-kk.manifest'

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_emulator_base.yml'
-  variables:
-    build_name: 'emulator-l'
-    build_type: 'debug'
-task:
-  workerType: emulator-l-debug
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-l-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-l-debug-objdir-gecko'
-  metadata:
-    name: '[TC] B2G Emulator L (Debug)'
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      # Disable "TC" prefix...
-      groupSymbol: "?"
-      collection:
-        debug: true
-      machine:
-        platform: b2g-emu-l
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-emulator-l-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-l-debug-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'emulator-l'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-l/releng-emulator-l.manifest'
-      B2G_DEBUG: 1

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_emulator_base.yml'
-  variables:
-    build_name: 'emulator-l'
-    build_type: 'opt'
-task:
-  workerType: emulator-l
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-l-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-l-opt-objdir-gecko'
-  metadata:
-    name: '[TC] B2G L Emulator (Opt)'
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      # Disable "TC" prefix...
-      groupSymbol: "?"
-      machine:
-        platform: b2g-emu-l
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-emulator-l-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-l-opt-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'emulator-l'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-l/releng-emulator-l.manifest'

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_base.yml'
-task:
-  metadata:
-    description: |
-      Android emulators + b2g environment used in full stack testing.
-  payload:
-    env:
-      TARGET: 'emulator'
-      B2G_DEBUG: 0
-
-    # Emulators can take a very long time to build!
-    maxRunTime: 14400
-
-    command:
-      - /bin/bash
-      - -c
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
-        buildbot_step 'Build' ./build-emulator-x86.sh $HOME/workspace
-
-  extra:
-    # Rather then enforcing particular conventions we require that all build
-    # tasks provide the "build" extra field to specify where the build and tests
-    # files are located.
-    locations:
-      build: 'public/build/emulator.tar.gz'
-      tests: 'public/build/b2g-tests.zip'
-      symbols: 'public/build/b2g-crashreporter-symbols.zip'
-      sources: 'public/build/sources.xml'
-    url:
-      busybox: 'https://api.pub.build.mozilla.org/tooltool/sha512/227d3189be1eb1e5348255ca100168bae8b3c4d3664384ea3c832fc044d168fd594f0b15991d190eceb1fb9f5b3463912104bcd7d4d0dbdd88d3f4b7187ea73d'

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_debug.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_emulator_x86_base.yml'
-  variables:
-    build_name: 'emulator-x86-kk'
-    build_type: 'debug'
-task:
-  workerType: emulator-x86-kk
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-x86-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-x86-debug-objdir-gecko'
-  metadata:
-    name: '[TC] B2G KK X86 Emulator (Debug)'
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      # Disable "TC" prefix...
-      groupSymbol: "?"
-      collection:
-        debug: true
-      machine:
-        platform: b2g-emu-x86-kk
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-emulator-kk-x86-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-kk-x86-debug-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'emulator-x86-kk'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-kk/releng-emulator-kk.manifest'
-      B2G_DEBUG: 1

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_emulator_x86_base.yml'
-  variables:
-    build_name: 'emulator-x86-kk'
-    build_type: 'opt'
-task:
-  workerType: emulator-x86-kk
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-x86-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-kk-x86-opt-objdir-gecko'
-  metadata:
-    name: '[TC] B2G KK X86 Emulator (Opt)'
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      # Disable "TC" prefix...
-      groupSymbol: "?"
-      machine:
-        platform: b2g-emu-x86-kk
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-emulator-kk-x86-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-kk-x86-opt-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'emulator-x86-kk'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-kk/releng-emulator-kk.manifest'

deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_l_opt.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_emulator_base.yml'
-  variables:
-    build_name: 'emulator-x86-l'
-    build_type: 'opt'
-task:
-  workerType: emulator-l
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-l-x86-opt'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-emulator-l-x86-opt-objdir-gecko'
-  metadata:
-    name: '[TC] B2G X86 L Emulator (Opt)'
-
-  extra:
-    treeherderEnv:
-      - staging
-    treeherder:
-      # Disable "TC" prefix...
-      groupSymbol: "X86"
-      machine:
-        platform: b2g-emu-l
-
-  payload:
-    command:
-      - /bin/bash
-      - -c
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
-        buildbot_step 'Build' ./build-emulator-x86.sh $HOME/workspace
-
-    cache:
-      level-{{level}}-{{project}}-emulator-l-x86-opt: /home/worker/workspace
-      level-{{level}}-{{project}}-emulator-l-x86-opt-objdir-gecko: /home/worker/objdir-gecko
-    env:
-      TARGET: 'emulator-x86-l'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-l/releng-emulator-l.manifest'

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] CPP Unit Tests'
-    description: CPP Unit Tests test run
-
-  workerType: b2gtest-emulator
-  payload:
-    env:
-      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
-      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
-    command:
-      - bash
-      - /home/worker/bin/test.sh
-      - --test-suite=cppunittest
-      - --installer-url={{build_url}}
-      - --test-packages-url={{test_packages_url}}
-      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-      - --symbols-url={{symbols_url}}
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      groupName: CPP Unit Tests
-      symbol: 'Cpp'
-      productName: b2g

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] Crashtest'
-    description: Crashtest test run {{chunk}}
-
-  workerType: b2gtest-emulator
-  payload:
-    env:
-      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
-      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
-    maxRunTime: 3600
-    command:
-      - bash
-      - /home/worker/bin/test.sh
-      - --test-suite=crashtest
-      - --installer-url={{build_url}}
-      - --test-packages-url={{test_packages_url}}
-      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-      - --symbols-url={{symbols_url}}
-      - --this-chunk={{chunk}}
-      - --total-chunk={{total_chunks}}
-
-  extra:
-    chunks:
-      total: 5
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      groupName: Reftest
-      groupSymbol: tc-R
-      symbol: 'C{{chunk}}'
-      productName: b2g
-      tier: 2

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] JSReftest'
-    description: JSReftest test run {{chunk}}
-
-  workerType: b2gtest-emulator
-  payload:
-    env:
-      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
-      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
-    command:
-      - bash
-      - /home/worker/bin/test.sh
-      - --test-suite=jsreftest
-      - --installer-url={{build_url}}
-      - --test-packages-url={{test_packages_url}}
-      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-      - --this-chunk={{chunk}}
-      - --total-chunk={{total_chunks}}
-
-  extra:
-    treeherder:
-      groupName: Reftest
-      groupSymbol: tc-R
-      symbol: 'J{{chunk}}'
-      productName: b2g

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] Marionette Framework Unit Tests'
-    description: Marionette Framework Unit Tests test run
-
-  workerType: b2gtest-emulator
-  payload:
-    env:
-      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
-      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
-    command:
-      - bash
-      - /home/worker/bin/test.sh
-      - --test-suite=marionette
-      - --test-manifest=unit-tests.ini
-      - --installer-url={{build_url}}
-      - --test-packages-url={{test_packages_url}}
-      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-
-  extra:
-    treeherder:
-      groupName: Marionette Framework Unit Tests
-      symbol: Mn
-      productName: b2g

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_emulator_marionette_webapi.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] Marionette WebAPI Tests'
-    description: Marionette WebAPI test run
-
-  workerType: b2gtest-emulator
-  payload:
-    env:
-      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
-      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
-    command:
-      - bash
-      - /home/worker/bin/test.sh
-      - --test-suite=marionette
-      - --test-manifest=webapi-tests.ini
-      - --installer-url={{build_url}}
-      - --test-packages-url={{test_packages_url}}
-      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      groupName: Marionette WebAPI Tests
-      symbol: Mnw
-      productName: b2g

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] Mochitest'
-    description: Mochitest test run {{chunk}}
-
-  workerType: b2gtest-emulator
-  payload:
-    env:
-      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
-      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
-    maxRunTime: 7200
-    command:
-      - bash
-      - /home/worker/bin/test.sh
-      - --test-suite=mochitest
-      - --installer-url={{build_url}}
-      - --test-packages-url={{test_packages_url}}
-      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-      - --symbols-url={{symbols_url}}
-      - --this-chunk={{chunk}}
-      - --total-chunk={{total_chunks}}
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    chunks:
-      total: 50
-    treeherder:
-      groupName: Mochitest
-      groupSymbol: tc-M
-      symbol: '{{chunk}}'
-      productName: b2g
-      tier: 2

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] Mochitest'
-    description: Mochitest Media test run
-
-  workerType: b2gtest-emulator
-  payload:
-    env:
-      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
-      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
-    command:
-      - bash
-      - /home/worker/bin/test.sh
-      - --test-suite=mochitest
-      - --installer-url={{build_url}}
-      - --test-packages-url={{test_packages_url}}
-      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-      - dom/media/tests
-
-  extra:
-    treeherder:
-      groupName: Mochitest
-      groupSymbol: tc-M
-      symbol: M
-      productName: b2g

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] Reftest'
-    description: Reftest test run {{chunk}}
-
-  workerType: b2gtest-emulator
-  payload:
-    maxRunTime: 7200
-    env:
-      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
-      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
-      GALLIUM_DRIVER: 'softpipe'
-    command:
-      - bash
-      - /home/worker/bin/test.sh
-      - --test-suite=reftest
-      - --installer-url={{build_url}}
-      - --test-packages-url={{test_packages_url}}
-      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-      - --symbols-url={{symbols_url}}
-      - --this-chunk={{chunk}}
-      - --total-chunk={{total_chunks}}
-
-  extra:
-    chunks:
-      total: 40
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      groupName: Reftest
-      groupSymbol: tc-R
-      symbol: 'R{{chunk}}'
-      productName: b2g

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] XPCShell'
-    description: XPCShell test run {{chunk}}
-
-  workerType: b2gtest-emulator
-  payload:
-    env:
-      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
-      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
-    maxRunTime: 6000
-    command:
-      - bash
-      - /home/worker/bin/test.sh
-      - --test-suite=xpcshell
-      - --installer-url={{build_url}}
-      - --test-packages-url={{test_packages_url}}
-      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-      - --busybox-url={{busybox_url}}
-      - --symbols-url={{symbols_url}}
-      - --this-chunk={{chunk}}
-      - --total-chunk={{total_chunks}}
-
-  extra:
-    chunks:
-      total: 20
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      groupName: XPCShell
-      symbol: X{{chunk}}
-      productName: b2g
-      tier: 2