--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -149,16 +149,18 @@ builds:
       - Linux64 Static Analysis
     types:
       opt:
         task: tasks/builds/opt_linux64_st-an.yml
   macosx64:
     platforms:
       - MacOSX64
     types:
+      opt:
+        task: tasks/builds/opt_macosx64.yml
       debug:
         task: tasks/builds/dbg_macosx64.yml
   macosx64-st-an:
     platforms:
       - MacOSX64 Static Analysis
     types:
       opt:
         task: tasks/builds/opt_macosx64_st-an.yml

--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -74,16 +74,18 @@ builds:
       - Linux64 Static Analysis
     types:
       opt:
         task: tasks/builds/opt_linux64_st-an_clobber.yml
   macosx64:
     platforms:
       - MacOSX64
     types:
+      opt:
+        task: tasks/builds/opt_macosx64_clobber.yml
       debug:
         task: tasks/builds/dbg_macosx64_clobber.yml
   macosx64-st-an:
     platforms:
       - MacOSX64 Static Analysis
     types:
       opt:
         task: tasks/builds/opt_macosx64_st-an_clobber.yml