--- a/taskcluster/ci/desktop-test/test-platforms.yml
+++ b/taskcluster/ci/desktop-test/test-platforms.yml
@@ -71,12 +71,12 @@ windows10-64-vm/opt:
 #    build-platform: win64/debug
 #    test-set: windows-gpu-tests
 #windows10-64/opt:
 #    build-platform: win64/opt
 #    test-set: windows-gpu-tests
 
 macosx64/debug:
     build-platform: macosx64/debug
-    test-set: macosx64-tests
-# macosx64/opt:
-#    build-platform: macosx64/opt
-#    test-set: macosx64-tests
+    test-set: macosx64-tests-debug
+macosx64/opt:
+    build-platform: macosx64/opt
+    test-set: macosx64-tests-talos

--- a/taskcluster/ci/desktop-test/test-sets.yml
+++ b/taskcluster/ci/desktop-test/test-sets.yml
@@ -128,17 +128,17 @@ ccov-code-coverage-tests:
     - mochitest-browser-chrome
     - mochitest-devtools-chrome
     - xpcshell
 
 jsdcov-code-coverage-tests:
     - mochitest-browser-chrome
     - mochitest-devtools-chrome
 
-macosx64-tests:
+macosx64-tests-debug:
     - cppunit
     - crashtest
     # - gtest
     - jsreftest
     # - marionette
     # - mochitest
     # - mochitest-browser-chrome
     # - mochitest-clipboard
@@ -147,8 +147,19 @@ macosx64-tests:
     # - mochitest-jetpack
     # - mochitest-media
     # - mochitest-other
     - mochitest-webgl
     # - reftest
     # - web-platform-tests
     # - web-platform-tests-reftests
     # - xpcshell
+
+macosx64-tests-talos:
+    - talos-chrome
+    - talos-dromaeojs
+    - talos-g1
+    - talos-g2
+    - talos-g3
+    - talos-g4
+    - talos-other
+    - talos-svgr
+    - talos-tp5o