--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -102,16 +102,17 @@ flags:
     - aries-noril
     - android-api-15
     - android-api-15-frontend
     - android-partner-sample1
     - android-b2gdroid
     - linux
     - linux64
     - linux64-st-an
+    - linux64-asan
     - macosx64
     - macosx64-st-an
 
   tests:
     - cppunit
     - crashtest
     - crashtest-e10s
     - crashtest-ipc

--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -133,16 +133,24 @@ builds:
       debug:
         task: tasks/builds/dbg_linux64.yml
   linux64-st-an:
     platforms:
       - Linux64 Static Analysis
     types:
       opt:
         task: tasks/builds/opt_linux64_st-an.yml
+  linux64-asan:
+    platforms:
+      - Linux64 ASan
+    types:
+      opt:
+        task: tasks/builds/opt_linux64-asan.yml
+      debug:
+        task: tasks/builds/dbg_linux64-asan.yml
   macosx64:
     platforms:
       - MacOSX64
     types:
       opt:
         task: tasks/builds/opt_macosx64.yml
       debug:
         task: tasks/builds/dbg_macosx64.yml

--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -64,16 +64,24 @@ builds:
   linux64:
     platforms:
       - Linux64
     types:
       opt:
         task: tasks/builds/opt_linux64_clobber.yml
       debug:
         task: tasks/builds/dbg_linux64_clobber.yml
+  linux64-asan:
+    platforms:
+      - Linux64 ASan
+    types:
+      opt:
+        task: tasks/builds/opt_linux64-asan_clobber.yml
+      debug:
+        task: tasks/builds/dbg_linux64-asan_clobber.yml
   linux64-st-an:
     platforms:
       - Linux64 Static Analysis
     types:
       opt:
         task: tasks/builds/opt_linux64_st-an_clobber.yml
   macosx64:
     platforms:

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/dbg_linux64-asan.yml
@@ -0,0 +1,10 @@
+$inherits:
+  from: 'tasks/builds/dbg_linux64-asan_clobber.yml'
+task:
+  # same as clobber, but with a cached workspace
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-asan-workspace'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-linux64-asan-workspace: '/home/worker/workspace'

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/dbg_linux64-asan_clobber.yml
@@ -0,0 +1,28 @@
+$inherits:
+  from: 'tasks/builds/linux64_clobber.yml'
+  variables:
+    build_name: 'linux64-asan'
+    build_type: 'dbg'
+task:
+  metadata:
+      name: '[TC] Linux64 ASan Dbg'
+      description: 'Linux64 ASan Dbg'
+
+  routes:
+    - 'index.buildbot.branches.{{project}}.linux64-asan'
+    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64-asan'
+
+  workerType: dbg-linux64
+
+  payload:
+    env:
+      MH_CUSTOM_BUILD_VARIANT_CFG: 'asan-and-debug'
+
+  extra:
+    treeherder:
+      groupSymbol: tc
+      groupName: Submitted by taskcluster
+      symbol: B
+      collection:
+        debug: true
+

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/opt_linux64-asan.yml
@@ -0,0 +1,10 @@
+$inherits:
+  from: 'tasks/builds/opt_linux64-asan_clobber.yml'
+task:
+  # same as clobber, but with a cached workspace
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-asan-workspace'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-linux64-asan-workspace: '/home/worker/workspace'

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/opt_linux64-asan_clobber.yml
@@ -0,0 +1,25 @@
+$inherits:
+  from: 'tasks/builds/linux64_clobber.yml'
+  variables:
+    build_name: 'linux64-asan'
+    build_type: 'opt'
+task:
+  metadata:
+      name: '[TC] Linux64 ASan Opt'
+      description: 'Linux64 ASan Opt'
+
+  routes:
+    - 'index.buildbot.branches.{{project}}.linux64-asan'
+    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64-asan'
+
+  workerType: opt-linux64
+
+  payload:
+    env:
+      MH_CUSTOM_BUILD_VARIANT_CFG: 'asan'
+
+  extra:
+    treeherder:
+      groupSymbol: tc
+      groupName: Submitted by taskcluster
+      symbol: B