--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -25,16 +25,17 @@ flags:
     # prefixes.  For example, the first example above would replace "foo-7"
     # 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.*/
+    external-media-tests: /external-media-tests.*/
     firefox-ui-functional: /firefox-ui-functional.*/
     firefox-ui-functional-e10s: /firefox-ui-functional-e10s.*/
     gaia-js-integration: /.*gaia-js-integration.*/
     gtest: /gtest.*/
     jittest: /jittest.*/
     jittests: /jittest.*/
     jsreftest: /jsreftest.*/
     jsreftest-e10s: /jsreftest-e10s.*/
@@ -96,16 +97,17 @@ flags:
     - macosx64
     - macosx64-st-an
 
   tests:
     - cppunit
     - crashtest
     - crashtest-e10s
     - crashtest-ipc
+    - external-media-tests
     - firefox-ui-functional
     - firefox-ui-functional-e10s
     - gaia-build
     - gaia-build-unit
     - gaia-js-integration
     - gaia-linter
     - gaia-unit
     - gaia-unit-oop

--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -121,16 +121,20 @@ tests:
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_crashtest.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_crashtest.yml
   crashtest-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_crashtest_e10s.yml
+  external-media-tests:
+    allowed_build_tasks:
+      tasks/builds/dbg_linux64.yml:
+        task: tasks/tests/fx_linux64_external_media_tests.yml
   firefox-ui-functional:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_firefox_ui_functional.yml
   firefox-ui-functional-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml

--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -141,16 +141,20 @@ tests:
   crashtest:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_crashtest.yml
   crashtest-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_crashtest_e10s.yml
+  external-media-tests:
+    allowed_build_tasks:
+      tasks/builds/dbg_linux64.yml:
+        task: tasks/tests/fx_linux64_external_media_tests.yml
   firefox-ui-functional:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_firefox_ui_functional.yml
   firefox-ui-functional-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_external_media_tests.yml
@@ -0,0 +1,29 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_desktop_generic.yml'
+task:
+  payload:
+    command:
+      - --no-read-buildbot-config
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --download-symbols=ondemand
+    env:
+        MOZHARNESS_SCRIPT: 'mozharness/scripts/firefox_media_tests_buildbot.py'
+        MOZHARNESS_CONFIG: >
+          mozharness/configs/mediatests/buildbot_posix_config.py
+          mozharness/configs/remove_executables.py
+    maxRunTime: 5400
+  metadata:
+    name: '[TC] Linux64 external-media-tests'
+    description: Marionette unittest run
+  extra:
+    suite:
+      name: external-media-tests
+      flavor: external-media-tests
+    treeherder:
+      groupName: VideoPuppeteer
+      groupSymbol: VP
+      symbol: m
+      tier: 2
+