diff --git a/taskcluster/ci/desktop-test/test-platforms.yml b/taskcluster/ci/desktop-test/test-platforms.yml
index 3501a763d78d..f46239149a2f 100644
--- a/taskcluster/ci/desktop-test/test-platforms.yml
+++ b/taskcluster/ci/desktop-test/test-platforms.yml
@@ -76,7 +76,7 @@ windows10-64-vm/opt:
 
 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
diff --git a/taskcluster/ci/desktop-test/test-sets.yml b/taskcluster/ci/desktop-test/test-sets.yml
index 96402567e275..90b672770192 100644
--- a/taskcluster/ci/desktop-test/test-sets.yml
+++ b/taskcluster/ci/desktop-test/test-sets.yml
@@ -133,7 +133,7 @@ jsdcov-code-coverage-tests:
     - mochitest-browser-chrome
     - mochitest-devtools-chrome
 
-macosx64-tests:
+macosx64-tests-debug:
     - cppunit
     - crashtest
     # - gtest
@@ -152,3 +152,14 @@ macosx64-tests:
     # - 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