--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -144,16 +144,18 @@ windows-gpu-tests:
 #    - mochitest-chrome
 #    - mochitest-clipboard
 
 macosx64-tests-debug:
     - cppunit
     - crashtest
     - external-media-tests-base
     - external-media-tests-youtube
+    - firefox-ui-functional-local
+    - firefox-ui-functional-remote
     - gtest
     - jittest
     - jsreftest
     - marionette
     - mochitest
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome

--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -205,17 +205,19 @@ firefox-ui-functional-local:
     tier: 1
     docker-image: {"in-tree": "desktop1604-test"}
     mozharness:
         script: firefox_ui_tests/functional.py
         config:
             by-test-platform:
                 windows.*:
                     - firefox_ui_tests/taskcluster_windows.py
-                default:
+                macosx.*:
+                    - firefox_ui_tests/taskcluster.py
+                linux.*:
                     - firefox_ui_tests/taskcluster.py
                     - remove_executables.py
         extra-options:
             - "--tag"
             - "local"
 
 firefox-ui-functional-remote:
     description: "Firefox-ui-tests functional run"
@@ -225,17 +227,19 @@ firefox-ui-functional-remote:
     tier: 2
     docker-image: {"in-tree": "desktop1604-test"}
     mozharness:
         script: firefox_ui_tests/functional.py
         config:
             by-test-platform:
                 windows.*:
                     - firefox_ui_tests/taskcluster_windows.py
-                default:
+                macosx.*:
+                    - firefox_ui_tests/taskcluster.py
+                linux.*:
                     - firefox_ui_tests/taskcluster.py
                     - remove_executables.py
         extra-options:
             - "--tag"
             - "remote"
 
 geckoview:
     description: "Geckoview run"

--- a/testing/mozharness/configs/firefox_ui_tests/taskcluster.py
+++ b/testing/mozharness/configs/firefox_ui_tests/taskcluster.py
@@ -1,8 +1,20 @@
 # Config file for firefox ui tests run via TaskCluster.
 
+
 config = {
+    "vcs_share_base": "/builds/hg-shared",
+
+    "exes": {
+        'python': '/tools/buildbot/bin/python',
+        'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
+        'tooltool.py': "/tools/tooltool.py",
+    },
+
     "find_links": [
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "pip_index": False,
+
+    "download_minidump_stackwalk": True,
+    "tooltool_cache": "/home/worker/tooltool-cache",
 }