--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -227,22 +227,30 @@ tests:
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_external_media_tests_opt.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_external_media_tests_dbg.yml
       tasks/builds/opt_linux64_pgo.yml:
         task: tasks/tests/fx_linux64_external_media_tests_opt.yml
   firefox-ui-functional:
     allowed_build_tasks:
+      tasks/builds/opt_linux64.yml:
+        task: tasks/tests/fx_linux64_firefox_ui_functional_opt.yml
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_firefox_ui_functional.yml
+        task: tasks/tests/fx_linux64_firefox_ui_functional_dbg.yml
+      tasks/builds/opt_linux64_pgo.yml:
+        task: tasks/tests/fx_linux64_firefox_ui_functional_opt.yml
   firefox-ui-functional-e10s:
     allowed_build_tasks:
+      tasks/builds/opt_linux64.yml:
+        task: tasks/tests/fx_linux64_firefox_ui_functional_e10s_opt.yml
       tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml
+        task: tasks/tests/fx_linux64_firefox_ui_functional_e10s_dbg.yml
+      tasks/builds/opt_linux64_pgo.yml:
+        task: tasks/tests/fx_linux64_firefox_ui_functional_e10s_opt.yml
   gtest:
     allowed_build_tasks:
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_gtest_opt.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_gtest_dbg.yml
       tasks/builds/opt_linux64_pgo.yml:
         task: tasks/tests/fx_linux64_gtest_opt.yml

--- a/testing/taskcluster/tasks/tests/fx_linux64_firefox_ui_functional.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_firefox_ui_functional.yml
@@ -1,17 +1,16 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   payload:
     command:
       - --installer-url={{build_url}}
       - --test-packages-url={{test_packages_url}}
-      - --download-symbols=ondemand
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/firefox_ui_tests/functional.py'
         MOZHARNESS_CONFIG: >
           mozharness/configs/firefox_ui_tests/taskcluster.py
           mozharness/configs/remove_executables.py
     maxRunTime: 5400
   metadata:
     name: '[TC] Linux64 firefox-ui-tests functional'

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_firefox_ui_functional_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_firefox_ui_functional.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true

--- a/testing/taskcluster/tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml
@@ -1,17 +1,16 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_desktop_generic.yml'
 task:
   payload:
     command:
       - --installer-url={{build_url}}
       - --test-packages-url={{test_packages_url}}
-      - --download-symbols=ondemand
       - --e10s
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/firefox_ui_tests/functional.py'
         MOZHARNESS_CONFIG: >
           mozharness/configs/firefox_ui_tests/taskcluster.py
           mozharness/configs/remove_executables.py
     maxRunTime: 5400
   metadata:

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_firefox_ui_functional_e10s_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_firefox_ui_functional_e10s_opt.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=ondemand

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_firefox_ui_functional_opt.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_firefox_ui_functional.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=ondemand