diff --git a/bot/code_coverage_bot/taskcluster.py b/bot/code_coverage_bot/taskcluster.py
index d68644e71..267023ae6 100644
--- a/bot/code_coverage_bot/taskcluster.py
+++ b/bot/code_coverage_bot/taskcluster.py
@@ -17,7 +17,7 @@
 
 def get_task(branch, revision, platform):
     if platform == "linux":
-        platform_name = "linux64-ccov-debug"
+        platform_name = "linux64-ccov-opt"
         product = "firefox"
     elif platform == "windows":
         platform_name = "win64-ccov-debug"
@@ -100,13 +100,13 @@ def perform_download():
 
 
 BUILD_PLATFORMS = [
-    "build-linux64-ccov/debug",
+    "build-linux64-ccov/opt",
     "build-win64-ccov/debug",
     "build-android-test-ccov/opt",
 ]
 
 TEST_PLATFORMS = [
-    "test-linux64-ccov/debug",
+    "test-linux64-ccov/opt",
     "test-windows10-64-ccov/debug",
     "test-android-em-4.3-arm7-api-16-ccov/debug",
 ] + BUILD_PLATFORMS
diff --git a/bot/tests/fixtures/build-linux64-ccov/opt.json b/bot/tests/fixtures/build-linux64-ccov/opt.json
new file mode 100644
index 000000000..675fd968b
--- /dev/null
+++ b/bot/tests/fixtures/build-linux64-ccov/opt.json
@@ -0,0 +1,161 @@
+{
+  "provisionerId": "gecko-3",
+  "workerType": "b-linux",
+  "schedulerId": "gecko-level-3",
+  "taskGroupId": "UpVSSic1SeCw6sdDMidSLQ",
+  "dependencies": [
+    "GQWC8DtMRBmEhpgsPJdHHA",
+    "LFz17jARRPOoUz4s3CKY4g",
+    "Mmq5WgsmTLuLn4oWmhOmTA",
+    "T_bYPo8NRPuZ8cPKEhIoCw",
+    "XDSsJCY9Q1aA-6cY47adZg",
+    "XPFmlbUYTYi11JQKPw45ow",
+    "ZAI7Hy0rSmq7Nx-S112YaA",
+    "bSuO4tvARd2J454-Hg53kQ",
+    "fQRxzmt8RkChQnkmguktEg",
+    "UpVSSic1SeCw6sdDMidSLQ"
+  ],
+  "requires": "all-completed",
+  "routes": [
+    "index.gecko.v2.mozilla-central.latest.firefox.linux64-ccov-opt",
+    "index.gecko.v2.mozilla-central.pushdate.2019.11.15.20191115095319.firefox.linux64-ccov-opt",
+    "index.gecko.v2.mozilla-central.pushdate.2019.11.15.latest.firefox.linux64-ccov-opt",
+    "index.gecko.v2.mozilla-central.pushlog-id.36805.firefox.linux64-ccov-opt",
+    "index.gecko.v2.mozilla-central.revision.1e1617c67238dfb685fb3d07bf1793232c4469fa.firefox.linux64-ccov-opt",
+    "index.gecko.v2.trunk.revision.1e1617c67238dfb685fb3d07bf1793232c4469fa.firefox.linux64-ccov-opt",
+    "tc-treeherder.v2.mozilla-central.1e1617c67238dfb685fb3d07bf1793232c4469fa.36805"
+  ],
+  "priority": "medium",
+  "retries": 5,
+  "created": "2019-11-15T09:55:30.136Z",
+  "deadline": "2019-11-16T09:55:30.136Z",
+  "expires": "2020-11-14T09:55:30.136Z",
+  "scopes": [
+    "secrets:get:project/releng/gecko/build/level-3/*",
+    "secrets:get:project/taskcluster/gecko/hgfingerprint",
+    "secrets:get:project/taskcluster/gecko/hgmointernal",
+    "project:releng:services/tooltool/api/download/public",
+    "assume:project:taskcluster:gecko:level-3-sccache-buckets",
+    "auth:gcp:access-token:sccache-3/tc-l3*",
+    "docker-worker:cache:gecko-level-3-mozilla-central-build-linux64-ccov-opt-workspace-v3-e0773b586060dfe744c7",
+    "docker-worker:cache:gecko-level-3-checkouts-v3-e0773b586060dfe744c7",
+    "docker-worker:cache:gecko-level-3-tooltool-cache-v3-e0773b586060dfe744c7"
+  ],
+  "payload": {
+    "onExitStatus": {
+      "retry": [
+        4,
+        72
+      ],
+      "purgeCaches": [
+        72
+      ]
+    },
+    "maxRunTime": 7200,
+    "image": {
+      "path": "public/image.tar.zst",
+      "type": "task-image",
+      "taskId": "ZAI7Hy0rSmq7Nx-S112YaA"
+    },
+    "cache": {
+      "gecko-level-3-tooltool-cache-v3-e0773b586060dfe744c7": "/builds/worker/tooltool-cache",
+      "gecko-level-3-mozilla-central-build-linux64-ccov-opt-workspace-v3-e0773b586060dfe744c7": "/builds/worker/workspace",
+      "gecko-level-3-checkouts-v3-e0773b586060dfe744c7": "/builds/worker/checkouts"
+    },
+    "artifacts": {
+      "public/logs": {
+        "path": "/builds/worker/logs/",
+        "expires": "2020-11-14T09:55:30.136Z",
+        "type": "directory"
+      },
+      "public/build": {
+        "path": "/builds/worker/artifacts/",
+        "expires": "2020-11-14T09:55:30.136Z",
+        "type": "directory"
+      }
+    },
+    "command": [
+      "/builds/worker/bin/run-task",
+      "--gecko-checkout=/builds/worker/workspace/build/src",
+      "--fetch-hgfingerprint",
+      "--",
+      "/builds/worker/workspace/build/src/taskcluster/scripts/builder/build-linux.sh"
+    ],
+    "env": {
+      "FORCE_GCC": "1",
+      "MOZ_AUTOMATION": "1",
+      "MOZ_SOURCE_CHANGESET": "1e1617c67238dfb685fb3d07bf1793232c4469fa",
+      "ACCEPTED_MAR_CHANNEL_IDS": "firefox-mozilla-central",
+      "MOZ_FETCHES": "[{\"artifact\": \"public/build/clang.tar.xz\", \"extract\": true, \"task\": \"bSuO4tvARd2J454-Hg53kQ\"}, {\"artifact\": \"public/build/rustc.tar.xz\", \"extract\": true, \"task\": \"XPFmlbUYTYi11JQKPw45ow\"}, {\"artifact\": \"public/build/gcc.tar.xz\", \"extract\": true, \"task\": \"GQWC8DtMRBmEhpgsPJdHHA\"}, {\"artifact\": \"public/build/cbindgen.tar.xz\", \"extract\": true, \"task\": \"fQRxzmt8RkChQnkmguktEg\"}, {\"artifact\": \"public/build/sccache.tar.xz\", \"extract\": true, \"task\": \"XDSsJCY9Q1aA-6cY47adZg\"}, {\"artifact\": \"public/build/nasm.tar.bz2\", \"extract\": true, \"task\": \"Mmq5WgsmTLuLn4oWmhOmTA\"}, {\"artifact\": \"public/build/node.tar.xz\", \"extract\": true, \"task\": \"T_bYPo8NRPuZ8cPKEhIoCw\"}, {\"artifact\": \"public/build/grcov.tar.xz\", \"extract\": true, \"task\": \"LFz17jARRPOoUz4s3CKY4g\"}]",
+      "TOOLTOOL_CACHE": "/builds/worker/tooltool-cache",
+      "PYTHONUNBUFFERED": "1",
+      "MH_CUSTOM_BUILD_VARIANT_CFG": "code-coverage-opt",
+      "MOZHARNESS_SCRIPT": "mozharness/scripts/fx_desktop_build.py",
+      "MOZ_BUILD_DATE": "20191115095319",
+      "MH_BUILD_POOL": "taskcluster",
+      "HG_STORE_PATH": "/builds/worker/checkouts/hg-store",
+      "MOZ_FETCHES_DIR": "fetches",
+      "MOZHARNESS_ACTIONS": "get-secrets build",
+      "EXTRA_MOZHARNESS_CONFIG": "{\"update_channel\": \"nightly\", \"mozconfig_variant\": \"code-coverage-opt\"}",
+      "GECKO_HEAD_REPOSITORY": "https://hg.mozilla.org/mozilla-central",
+      "SCCACHE_GCS_PROJECT": "sccache-3",
+      "RUSTC_BOOTSTRAP": "1",
+      "MOZ_SOURCE_REPO": "https://hg.mozilla.org/mozilla-central",
+      "GECKO_HEAD_REV": "1e1617c67238dfb685fb3d07bf1793232c4469fa",
+      "MH_BRANCH": "mozilla-central",
+      "MOZ_SCM_LEVEL": "3",
+      "GECKO_BASE_REPOSITORY": "https://hg.mozilla.org/mozilla-unified",
+      "NEED_XVFB": "true",
+      "USE_SCCACHE": "1",
+      "MOZ_DISABLE_FULL_SYMBOLS": "1",
+      "UPLOAD_DIR": "/builds/worker/artifacts/",
+      "TASKCLUSTER_CACHES": "/builds/worker/checkouts;/builds/worker/tooltool-cache;/builds/worker/workspace",
+      "MAR_CHANNEL_ID": "firefox-mozilla-central",
+      "GECKO_PATH": "/builds/worker/workspace/build/src",
+      "SCCACHE_IDLE_TIMEOUT": "0",
+      "TASKCLUSTER_VOLUMES": "/builds/worker/checkouts;/builds/worker/tooltool-cache;/builds/worker/workspace",
+      "MOZHARNESS_CONFIG": "builds/releng_base_firefox.py builds/releng_base_linux_64_builds.py"
+    },
+    "features": {
+      "taskclusterProxy": true,
+      "chainOfTrust": true
+    }
+  },
+  "metadata": {
+    "owner": "aiakab@mozilla.com",
+    "source": "https://hg.mozilla.org/mozilla-central/file/1e1617c67238dfb685fb3d07bf1793232c4469fa/taskcluster/ci/build",
+    "description": "Linux64-CCov Opt ([Treeherder push](https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&revision=1e1617c67238dfb685fb3d07bf1793232c4469fa))",
+    "name": "build-linux64-ccov/opt"
+  },
+  "tags": {
+    "kind": "build",
+    "worker-implementation": "docker-worker",
+    "createdForUser": "aiakab@mozilla.com",
+    "retrigger": "false",
+    "label": "build-linux64-ccov/opt",
+    "os": "linux"
+  },
+  "extra": {
+    "index": {
+      "rank": 0
+    },
+    "chainOfTrust": {
+      "inputs": {
+        "docker-image": "ZAI7Hy0rSmq7Nx-S112YaA"
+      }
+    },
+    "treeherder": {
+      "machine": {
+        "platform": "linux64-ccov"
+      },
+      "tier": 2,
+      "symbol": "B",
+      "jobKind": "build",
+      "collection": {
+        "opt": true
+      }
+    },
+    "treeherder-platform": "linux64-ccov/opt",
+    "parent": "UpVSSic1SeCw6sdDMidSLQ"
+  }
+}
\ No newline at end of file
diff --git a/bot/tests/fixtures/test-linux64-ccov/opt-cppunit.json b/bot/tests/fixtures/test-linux64-ccov/opt-cppunit.json
new file mode 100644
index 000000000..c6aca151c
--- /dev/null
+++ b/bot/tests/fixtures/test-linux64-ccov/opt-cppunit.json
@@ -0,0 +1,146 @@
+{
+  "provisionerId": "gecko-t",
+  "workerType": "t-linux-xlarge",
+  "schedulerId": "gecko-level-3",
+  "taskGroupId": "UpVSSic1SeCw6sdDMidSLQ",
+  "dependencies": [
+    "EfaZjAzoQimatbNgqJd1zA",
+    "LFz17jARRPOoUz4s3CKY4g",
+    "Pq4D-RNFRHa_pSR7oP5CKg"
+  ],
+  "requires": "all-completed",
+  "routes": [
+    "tc-treeherder.v2.mozilla-central.1e1617c67238dfb685fb3d07bf1793232c4469fa.36805",
+    "coalesce.v1.mozilla-central.f95bbf4551cb34a5e074"
+  ],
+  "priority": "medium",
+  "retries": 5,
+  "created": "2019-11-15T09:55:50.425Z",
+  "deadline": "2019-11-16T09:55:50.425Z",
+  "expires": "2020-11-14T09:55:50.425Z",
+  "scopes": [
+    "secrets:get:project/taskcluster/gecko/hgfingerprint",
+    "secrets:get:project/taskcluster/gecko/hgmointernal",
+    "project:releng:services/tooltool/api/download/public",
+    "docker-worker:feature:allowPtrace",
+    "docker-worker:cache:gecko-level-3-checkouts-v3-e0773b586060dfe744c7",
+    "docker-worker:cache:gecko-level-3-tooltool-cache-v3-e0773b586060dfe744c7"
+  ],
+  "payload": {
+    "supersederUrl": "https://coalesce.mozilla-releng.net/v1/list/3600/5/mozilla-central.f95bbf4551cb34a5e074",
+    "onExitStatus": {
+      "retry": [
+        4,
+        72
+      ],
+      "purgeCaches": [
+        72
+      ]
+    },
+    "maxRunTime": 3600,
+    "image": {
+      "path": "public/image.tar.zst",
+      "type": "task-image",
+      "taskId": "Pq4D-RNFRHa_pSR7oP5CKg"
+    },
+    "cache": {
+      "gecko-level-3-tooltool-cache-v3-e0773b586060dfe744c7": "/builds/worker/tooltool-cache",
+      "gecko-level-3-checkouts-v3-e0773b586060dfe744c7": "/builds/worker/checkouts"
+    },
+    "artifacts": {
+      "public/logs/": {
+        "path": "/builds/worker/workspace/logs/",
+        "expires": "2020-11-14T09:55:50.425Z",
+        "type": "directory"
+      },
+      "public/test": {
+        "path": "/builds/worker/artifacts/",
+        "expires": "2020-11-14T09:55:50.425Z",
+        "type": "directory"
+      },
+      "public/test_info/": {
+        "path": "/builds/worker/workspace/build/blobber_upload_dir/",
+        "expires": "2020-11-14T09:55:50.425Z",
+        "type": "directory"
+      }
+    },
+    "command": [
+      "/builds/worker/bin/run-task",
+      "--fetch-hgfingerprint",
+      "--",
+      "/builds/worker/bin/test-linux.sh",
+      "--cppunittest-suite=cppunittest",
+      "--code-coverage",
+      "--disable-e10s",
+      "--allow-software-gl-layers",
+      "--download-symbols=ondemand"
+    ],
+    "env": {
+      "MOZ_AUTOMATION": "1",
+      "TOOLTOOL_CACHE": "/builds/worker/tooltool-cache",
+      "MOZ_FETCHES_DIR": "fetches",
+      "MOZHARNESS_SCRIPT": "desktop_unittest.py",
+      "MOZ_NODE_PATH": "/usr/local/bin/node",
+      "HG_STORE_PATH": "/builds/worker/checkouts/hg-store",
+      "MOZILLA_BUILD_URL": "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/target.tar.bz2",
+      "GECKO_PATH": "/builds/worker/checkouts/gecko",
+      "GECKO_HEAD_REPOSITORY": "https://hg.mozilla.org/mozilla-central",
+      "EXTRA_MOZHARNESS_CONFIG": "{\"test_packages_url\": \"https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/target.test_packages.json\", \"installer_url\": \"https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/target.tar.bz2\"}",
+      "SCCACHE_DISABLE": "1",
+      "GECKO_HEAD_REV": "1e1617c67238dfb685fb3d07bf1793232c4469fa",
+      "NEED_COMPIZ": "false",
+      "MOZ_SCM_LEVEL": "3",
+      "TASKCLUSTER_VOLUMES": "/builds/worker/.cache;/builds/worker/checkouts;/builds/worker/tooltool-cache;/builds/worker/workspace",
+      "MOZHARNESS_URL": "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/mozharness.zip",
+      "GECKO_BASE_REPOSITORY": "https://hg.mozilla.org/mozilla-unified",
+      "MOZ_FETCHES": "[{\"artifact\": \"public/build/grcov.tar.xz\", \"extract\": true, \"task\": \"LFz17jARRPOoUz4s3CKY4g\"}]",
+      "TASKCLUSTER_CACHES": "/builds/worker/checkouts;/builds/worker/tooltool-cache",
+      "WORKING_DIR": "/builds/worker",
+      "NEED_PULSEAUDIO": "true",
+      "ENABLE_E10S": "false",
+      "NEED_WINDOW_MANAGER": "true",
+      "MOZHARNESS_CONFIG": "unittests/linux_unittest.py remove_executables.py"
+    },
+    "features": {
+      "taskclusterProxy": true,
+      "allowPtrace": true
+    }
+  },
+  "metadata": {
+    "owner": "aiakab@mozilla.com",
+    "source": "https://hg.mozilla.org/mozilla-central/file/1e1617c67238dfb685fb3d07bf1793232c4469fa/taskcluster/ci/test",
+    "description": "CPP Unit Tests ([Treeherder push](https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&revision=1e1617c67238dfb685fb3d07bf1793232c4469fa))",
+    "name": "test-linux64-ccov/opt-cppunit-1proc"
+  },
+  "tags": {
+    "kind": "test",
+    "worker-implementation": "docker-worker",
+    "createdForUser": "aiakab@mozilla.com",
+    "retrigger": "true",
+    "label": "test-linux64-ccov/opt-cppunit-1proc",
+    "os": "linux"
+  },
+  "extra": {
+    "index": {
+      "rank": 0
+    },
+    "parent": "UpVSSic1SeCw6sdDMidSLQ",
+    "chunks": {
+      "current": 1,
+      "total": 1
+    },
+    "suite": "cppunittest",
+    "treeherder": {
+      "machine": {
+        "platform": "linux64-ccov"
+      },
+      "tier": 3,
+      "symbol": "cppunit",
+      "jobKind": "test",
+      "collection": {
+        "opt": true
+      }
+    },
+    "treeherder-platform": "linux64-ccov/opt"
+  }
+}
\ No newline at end of file
diff --git a/bot/tests/fixtures/test-linux64-ccov/opt-firefox-ui-functional-remote-e10s.json b/bot/tests/fixtures/test-linux64-ccov/opt-firefox-ui-functional-remote-e10s.json
new file mode 100644
index 000000000..d969f7b8a
--- /dev/null
+++ b/bot/tests/fixtures/test-linux64-ccov/opt-firefox-ui-functional-remote-e10s.json
@@ -0,0 +1,150 @@
+{
+  "provisionerId": "gecko-t",
+  "workerType": "t-linux-xlarge",
+  "schedulerId": "gecko-level-3",
+  "taskGroupId": "UpVSSic1SeCw6sdDMidSLQ",
+  "dependencies": [
+    "EfaZjAzoQimatbNgqJd1zA",
+    "LFz17jARRPOoUz4s3CKY4g",
+    "Pq4D-RNFRHa_pSR7oP5CKg"
+  ],
+  "requires": "all-completed",
+  "routes": [
+    "tc-treeherder.v2.mozilla-central.1e1617c67238dfb685fb3d07bf1793232c4469fa.36805",
+    "coalesce.v1.mozilla-central.00221929e93e8c62a450"
+  ],
+  "priority": "medium",
+  "retries": 5,
+  "created": "2019-11-15T09:55:54.882Z",
+  "deadline": "2019-11-16T09:55:54.882Z",
+  "expires": "2020-11-14T09:55:54.882Z",
+  "scopes": [
+    "secrets:get:project/taskcluster/gecko/hgfingerprint",
+    "secrets:get:project/taskcluster/gecko/hgmointernal",
+    "project:releng:services/tooltool/api/download/public",
+    "docker-worker:feature:allowPtrace",
+    "docker-worker:cache:gecko-level-3-checkouts-v3-e0773b586060dfe744c7",
+    "docker-worker:cache:gecko-level-3-tooltool-cache-v3-e0773b586060dfe744c7"
+  ],
+  "payload": {
+    "supersederUrl": "https://coalesce.mozilla-releng.net/v1/list/3600/5/mozilla-central.00221929e93e8c62a450",
+    "onExitStatus": {
+      "retry": [
+        4,
+        72
+      ],
+      "purgeCaches": [
+        72
+      ]
+    },
+    "maxRunTime": 5400,
+    "image": {
+      "path": "public/image.tar.zst",
+      "type": "task-image",
+      "taskId": "Pq4D-RNFRHa_pSR7oP5CKg"
+    },
+    "cache": {
+      "gecko-level-3-tooltool-cache-v3-e0773b586060dfe744c7": "/builds/worker/tooltool-cache",
+      "gecko-level-3-checkouts-v3-e0773b586060dfe744c7": "/builds/worker/checkouts"
+    },
+    "artifacts": {
+      "public/logs/": {
+        "path": "/builds/worker/workspace/logs/",
+        "expires": "2020-11-14T09:55:54.882Z",
+        "type": "directory"
+      },
+      "public/test": {
+        "path": "/builds/worker/artifacts/",
+        "expires": "2020-11-14T09:55:54.882Z",
+        "type": "directory"
+      },
+      "public/test_info/": {
+        "path": "/builds/worker/workspace/build/blobber_upload_dir/",
+        "expires": "2020-11-14T09:55:54.882Z",
+        "type": "directory"
+      }
+    },
+    "command": [
+      "/builds/worker/bin/run-task",
+      "--fetch-hgfingerprint",
+      "--",
+      "/builds/worker/bin/test-linux.sh",
+      "--tag",
+      "remote",
+      "--code-coverage",
+      "--setpref=media.peerconnection.mtransport_process=false",
+      "--setpref=network.process.enabled=false",
+      "--allow-software-gl-layers",
+      "--download-symbols=ondemand"
+    ],
+    "env": {
+      "MOZ_AUTOMATION": "1",
+      "TOOLTOOL_CACHE": "/builds/worker/tooltool-cache",
+      "MOZ_FETCHES_DIR": "fetches",
+      "MOZHARNESS_SCRIPT": "firefox_ui_tests/functional.py",
+      "MOZ_NODE_PATH": "/usr/local/bin/node",
+      "HG_STORE_PATH": "/builds/worker/checkouts/hg-store",
+      "MOZILLA_BUILD_URL": "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/target.tar.bz2",
+      "GECKO_PATH": "/builds/worker/checkouts/gecko",
+      "GECKO_HEAD_REPOSITORY": "https://hg.mozilla.org/mozilla-central",
+      "EXTRA_MOZHARNESS_CONFIG": "{\"test_packages_url\": \"https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/target.test_packages.json\", \"installer_url\": \"https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/target.tar.bz2\"}",
+      "SCCACHE_DISABLE": "1",
+      "GECKO_HEAD_REV": "1e1617c67238dfb685fb3d07bf1793232c4469fa",
+      "NEED_COMPIZ": "true",
+      "MOZ_SCM_LEVEL": "3",
+      "TASKCLUSTER_VOLUMES": "/builds/worker/.cache;/builds/worker/checkouts;/builds/worker/tooltool-cache;/builds/worker/workspace",
+      "MOZHARNESS_URL": "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/mozharness.zip",
+      "GECKO_BASE_REPOSITORY": "https://hg.mozilla.org/mozilla-unified",
+      "MOZ_FETCHES": "[{\"artifact\": \"public/build/grcov.tar.xz\", \"extract\": true, \"task\": \"LFz17jARRPOoUz4s3CKY4g\"}]",
+      "TASKCLUSTER_CACHES": "/builds/worker/checkouts;/builds/worker/tooltool-cache",
+      "WORKING_DIR": "/builds/worker",
+      "NEED_PULSEAUDIO": "true",
+      "ENABLE_E10S": "true",
+      "NEED_WINDOW_MANAGER": "true",
+      "MOZHARNESS_CONFIG": "firefox_ui_tests/taskcluster.py remove_executables.py"
+    },
+    "features": {
+      "taskclusterProxy": true,
+      "allowPtrace": true
+    }
+  },
+  "metadata": {
+    "owner": "aiakab@mozilla.com",
+    "source": "https://hg.mozilla.org/mozilla-central/file/1e1617c67238dfb685fb3d07bf1793232c4469fa/taskcluster/ci/test",
+    "description": "Firefox-ui-tests functional run ([Treeherder push](https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&revision=1e1617c67238dfb685fb3d07bf1793232c4469fa))",
+    "name": "test-linux64-ccov/opt-firefox-ui-functional-remote-e10s"
+  },
+  "tags": {
+    "kind": "test",
+    "worker-implementation": "docker-worker",
+    "createdForUser": "aiakab@mozilla.com",
+    "retrigger": "true",
+    "label": "test-linux64-ccov/opt-firefox-ui-functional-remote-e10s",
+    "os": "linux"
+  },
+  "extra": {
+    "index": {
+      "rank": 0
+    },
+    "parent": "UpVSSic1SeCw6sdDMidSLQ",
+    "chunks": {
+      "current": 1,
+      "total": 1
+    },
+    "suite": "firefox-ui-functional-remote",
+    "treeherder": {
+      "jobKind": "test",
+      "groupSymbol": "Fxfn-r",
+      "collection": {
+        "opt": true
+      },
+      "machine": {
+        "platform": "linux64-ccov"
+      },
+      "groupName": "Firefox functional tests (remote)",
+      "tier": 3,
+      "symbol": "en-US"
+    },
+    "treeherder-platform": "linux64-ccov/opt"
+  }
+}
\ No newline at end of file
diff --git a/bot/tests/fixtures/test-linux64-ccov/opt-mochitest-1.json b/bot/tests/fixtures/test-linux64-ccov/opt-mochitest-1.json
new file mode 100644
index 000000000..544a81bb0
--- /dev/null
+++ b/bot/tests/fixtures/test-linux64-ccov/opt-mochitest-1.json
@@ -0,0 +1,158 @@
+{
+  "provisionerId": "gecko-t",
+  "workerType": "t-linux-xlarge",
+  "schedulerId": "gecko-level-3",
+  "taskGroupId": "UpVSSic1SeCw6sdDMidSLQ",
+  "dependencies": [
+    "EfaZjAzoQimatbNgqJd1zA",
+    "LFz17jARRPOoUz4s3CKY4g",
+    "Pq4D-RNFRHa_pSR7oP5CKg"
+  ],
+  "requires": "all-completed",
+  "routes": [
+    "tc-treeherder.v2.mozilla-central.1e1617c67238dfb685fb3d07bf1793232c4469fa.36805",
+    "coalesce.v1.mozilla-central.6b77c44ef9bf547dfe11"
+  ],
+  "priority": "medium",
+  "retries": 5,
+  "created": "2019-11-15T09:55:53.069Z",
+  "deadline": "2019-11-16T09:55:53.069Z",
+  "expires": "2020-11-14T09:55:53.069Z",
+  "scopes": [
+    "secrets:get:project/taskcluster/gecko/hgfingerprint",
+    "secrets:get:project/taskcluster/gecko/hgmointernal",
+    "project:releng:services/tooltool/api/download/public",
+    "docker-worker:feature:allowPtrace",
+    "docker-worker:capability:device:loopbackVideo",
+    "docker-worker:cache:gecko-level-3-checkouts-v3-e0773b586060dfe744c7",
+    "docker-worker:cache:gecko-level-3-tooltool-cache-v3-e0773b586060dfe744c7"
+  ],
+  "payload": {
+    "supersederUrl": "https://coalesce.mozilla-releng.net/v1/list/3600/5/mozilla-central.6b77c44ef9bf547dfe11",
+    "onExitStatus": {
+      "retry": [
+        4,
+        72
+      ],
+      "purgeCaches": [
+        72
+      ]
+    },
+    "maxRunTime": 5400,
+    "image": {
+      "path": "public/image.tar.zst",
+      "type": "task-image",
+      "taskId": "Pq4D-RNFRHa_pSR7oP5CKg"
+    },
+    "cache": {
+      "gecko-level-3-tooltool-cache-v3-e0773b586060dfe744c7": "/builds/worker/tooltool-cache",
+      "gecko-level-3-checkouts-v3-e0773b586060dfe744c7": "/builds/worker/checkouts"
+    },
+    "capabilities": {
+      "devices": {
+        "loopbackVideo": true
+      }
+    },
+    "artifacts": {
+      "public/logs/": {
+        "path": "/builds/worker/workspace/logs/",
+        "expires": "2020-11-14T09:55:53.069Z",
+        "type": "directory"
+      },
+      "public/test": {
+        "path": "/builds/worker/artifacts/",
+        "expires": "2020-11-14T09:55:53.069Z",
+        "type": "directory"
+      },
+      "public/test_info/": {
+        "path": "/builds/worker/workspace/build/blobber_upload_dir/",
+        "expires": "2020-11-14T09:55:53.069Z",
+        "type": "directory"
+      }
+    },
+    "command": [
+      "/builds/worker/bin/run-task",
+      "--fetch-hgfingerprint",
+      "--",
+      "/builds/worker/bin/test-linux.sh",
+      "--mochitest-suite=mochitest-plain",
+      "--code-coverage",
+      "--setpref=media.peerconnection.mtransport_process=false",
+      "--setpref=network.process.enabled=false",
+      "--total-chunk=10",
+      "--this-chunk=1",
+      "--download-symbols=ondemand"
+    ],
+    "env": {
+      "MOZ_AUTOMATION": "1",
+      "MOCHITEST_FLAVOR": "plain",
+      "TOOLTOOL_CACHE": "/builds/worker/tooltool-cache",
+      "MOZ_FETCHES_DIR": "fetches",
+      "MOZHARNESS_SCRIPT": "desktop_unittest.py",
+      "MOZ_NODE_PATH": "/usr/local/bin/node",
+      "HG_STORE_PATH": "/builds/worker/checkouts/hg-store",
+      "MOZILLA_BUILD_URL": "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/target.tar.bz2",
+      "GECKO_PATH": "/builds/worker/checkouts/gecko",
+      "GECKO_HEAD_REPOSITORY": "https://hg.mozilla.org/mozilla-central",
+      "EXTRA_MOZHARNESS_CONFIG": "{\"test_packages_url\": \"https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/target.test_packages.json\", \"installer_url\": \"https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/target.tar.bz2\"}",
+      "SCCACHE_DISABLE": "1",
+      "GECKO_HEAD_REV": "1e1617c67238dfb685fb3d07bf1793232c4469fa",
+      "NEED_COMPIZ": "true",
+      "MOZ_SCM_LEVEL": "3",
+      "TASKCLUSTER_VOLUMES": "/builds/worker/.cache;/builds/worker/checkouts;/builds/worker/tooltool-cache;/builds/worker/workspace",
+      "MOZHARNESS_URL": "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/mozharness.zip",
+      "GECKO_BASE_REPOSITORY": "https://hg.mozilla.org/mozilla-unified",
+      "MOZ_FETCHES": "[{\"artifact\": \"public/build/grcov.tar.xz\", \"extract\": true, \"task\": \"LFz17jARRPOoUz4s3CKY4g\"}]",
+      "TASKCLUSTER_CACHES": "/builds/worker/checkouts;/builds/worker/tooltool-cache",
+      "WORKING_DIR": "/builds/worker",
+      "NEED_PULSEAUDIO": "true",
+      "ENABLE_E10S": "true",
+      "NEED_WINDOW_MANAGER": "true",
+      "MOZHARNESS_CONFIG": "unittests/linux_unittest.py remove_executables.py"
+    },
+    "features": {
+      "taskclusterProxy": true,
+      "allowPtrace": true
+    }
+  },
+  "metadata": {
+    "owner": "aiakab@mozilla.com",
+    "source": "https://hg.mozilla.org/mozilla-central/file/1e1617c67238dfb685fb3d07bf1793232c4469fa/taskcluster/ci/test",
+    "description": "Mochitest plain run ([Treeherder push](https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&revision=1e1617c67238dfb685fb3d07bf1793232c4469fa))",
+    "name": "test-linux64-ccov/opt-mochitest-e10s-1"
+  },
+  "tags": {
+    "kind": "test",
+    "os": "linux",
+    "createdForUser": "aiakab@mozilla.com",
+    "retrigger": "true",
+    "label": "test-linux64-ccov/opt-mochitest-e10s-1",
+    "test-type": "mochitest",
+    "worker-implementation": "docker-worker"
+  },
+  "extra": {
+    "index": {
+      "rank": 0
+    },
+    "parent": "UpVSSic1SeCw6sdDMidSLQ",
+    "chunks": {
+      "current": 1,
+      "total": 10
+    },
+    "suite": "mochitest-plain",
+    "treeherder": {
+      "jobKind": "test",
+      "groupSymbol": "M",
+      "collection": {
+        "opt": true
+      },
+      "machine": {
+        "platform": "linux64-ccov"
+      },
+      "groupName": "Mochitests",
+      "tier": 3,
+      "symbol": "1"
+    },
+    "treeherder-platform": "linux64-ccov/opt"
+  }
+}
\ No newline at end of file
diff --git a/bot/tests/fixtures/test-linux64-ccov/opt-mochitest-e10s-7.json b/bot/tests/fixtures/test-linux64-ccov/opt-mochitest-e10s-7.json
new file mode 100644
index 000000000..17ee4a24f
--- /dev/null
+++ b/bot/tests/fixtures/test-linux64-ccov/opt-mochitest-e10s-7.json
@@ -0,0 +1,158 @@
+{
+  "provisionerId": "gecko-t",
+  "workerType": "t-linux-xlarge",
+  "schedulerId": "gecko-level-3",
+  "taskGroupId": "UpVSSic1SeCw6sdDMidSLQ",
+  "dependencies": [
+    "EfaZjAzoQimatbNgqJd1zA",
+    "LFz17jARRPOoUz4s3CKY4g",
+    "Pq4D-RNFRHa_pSR7oP5CKg"
+  ],
+  "requires": "all-completed",
+  "routes": [
+    "tc-treeherder.v2.mozilla-central.1e1617c67238dfb685fb3d07bf1793232c4469fa.36805",
+    "coalesce.v1.mozilla-central.87b3262367a83eac76d6"
+  ],
+  "priority": "medium",
+  "retries": 5,
+  "created": "2019-11-15T09:55:52.019Z",
+  "deadline": "2019-11-16T09:55:52.019Z",
+  "expires": "2020-11-14T09:55:52.019Z",
+  "scopes": [
+    "secrets:get:project/taskcluster/gecko/hgfingerprint",
+    "secrets:get:project/taskcluster/gecko/hgmointernal",
+    "project:releng:services/tooltool/api/download/public",
+    "docker-worker:feature:allowPtrace",
+    "docker-worker:capability:device:loopbackVideo",
+    "docker-worker:cache:gecko-level-3-checkouts-v3-e0773b586060dfe744c7",
+    "docker-worker:cache:gecko-level-3-tooltool-cache-v3-e0773b586060dfe744c7"
+  ],
+  "payload": {
+    "supersederUrl": "https://coalesce.mozilla-releng.net/v1/list/3600/5/mozilla-central.87b3262367a83eac76d6",
+    "onExitStatus": {
+      "retry": [
+        4,
+        72
+      ],
+      "purgeCaches": [
+        72
+      ]
+    },
+    "maxRunTime": 5400,
+    "image": {
+      "path": "public/image.tar.zst",
+      "type": "task-image",
+      "taskId": "Pq4D-RNFRHa_pSR7oP5CKg"
+    },
+    "cache": {
+      "gecko-level-3-tooltool-cache-v3-e0773b586060dfe744c7": "/builds/worker/tooltool-cache",
+      "gecko-level-3-checkouts-v3-e0773b586060dfe744c7": "/builds/worker/checkouts"
+    },
+    "capabilities": {
+      "devices": {
+        "loopbackVideo": true
+      }
+    },
+    "artifacts": {
+      "public/logs/": {
+        "path": "/builds/worker/workspace/logs/",
+        "expires": "2020-11-14T09:55:52.019Z",
+        "type": "directory"
+      },
+      "public/test": {
+        "path": "/builds/worker/artifacts/",
+        "expires": "2020-11-14T09:55:52.019Z",
+        "type": "directory"
+      },
+      "public/test_info/": {
+        "path": "/builds/worker/workspace/build/blobber_upload_dir/",
+        "expires": "2020-11-14T09:55:52.019Z",
+        "type": "directory"
+      }
+    },
+    "command": [
+      "/builds/worker/bin/run-task",
+      "--fetch-hgfingerprint",
+      "--",
+      "/builds/worker/bin/test-linux.sh",
+      "--mochitest-suite=mochitest-plain",
+      "--code-coverage",
+      "--setpref=media.peerconnection.mtransport_process=false",
+      "--setpref=network.process.enabled=false",
+      "--total-chunk=10",
+      "--this-chunk=7",
+      "--download-symbols=ondemand"
+    ],
+    "env": {
+      "MOZ_AUTOMATION": "1",
+      "MOCHITEST_FLAVOR": "plain",
+      "TOOLTOOL_CACHE": "/builds/worker/tooltool-cache",
+      "MOZ_FETCHES_DIR": "fetches",
+      "MOZHARNESS_SCRIPT": "desktop_unittest.py",
+      "MOZ_NODE_PATH": "/usr/local/bin/node",
+      "HG_STORE_PATH": "/builds/worker/checkouts/hg-store",
+      "MOZILLA_BUILD_URL": "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/target.tar.bz2",
+      "GECKO_PATH": "/builds/worker/checkouts/gecko",
+      "GECKO_HEAD_REPOSITORY": "https://hg.mozilla.org/mozilla-central",
+      "EXTRA_MOZHARNESS_CONFIG": "{\"test_packages_url\": \"https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/target.test_packages.json\", \"installer_url\": \"https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/target.tar.bz2\"}",
+      "SCCACHE_DISABLE": "1",
+      "GECKO_HEAD_REV": "1e1617c67238dfb685fb3d07bf1793232c4469fa",
+      "NEED_COMPIZ": "true",
+      "MOZ_SCM_LEVEL": "3",
+      "TASKCLUSTER_VOLUMES": "/builds/worker/.cache;/builds/worker/checkouts;/builds/worker/tooltool-cache;/builds/worker/workspace",
+      "MOZHARNESS_URL": "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EfaZjAzoQimatbNgqJd1zA/artifacts/public/build/mozharness.zip",
+      "GECKO_BASE_REPOSITORY": "https://hg.mozilla.org/mozilla-unified",
+      "MOZ_FETCHES": "[{\"artifact\": \"public/build/grcov.tar.xz\", \"extract\": true, \"task\": \"LFz17jARRPOoUz4s3CKY4g\"}]",
+      "TASKCLUSTER_CACHES": "/builds/worker/checkouts;/builds/worker/tooltool-cache",
+      "WORKING_DIR": "/builds/worker",
+      "NEED_PULSEAUDIO": "true",
+      "ENABLE_E10S": "true",
+      "NEED_WINDOW_MANAGER": "true",
+      "MOZHARNESS_CONFIG": "unittests/linux_unittest.py remove_executables.py"
+    },
+    "features": {
+      "taskclusterProxy": true,
+      "allowPtrace": true
+    }
+  },
+  "metadata": {
+    "owner": "aiakab@mozilla.com",
+    "source": "https://hg.mozilla.org/mozilla-central/file/1e1617c67238dfb685fb3d07bf1793232c4469fa/taskcluster/ci/test",
+    "description": "Mochitest plain run ([Treeherder push](https://treeherder.mozilla.org/#/jobs?repo=mozilla-central&revision=1e1617c67238dfb685fb3d07bf1793232c4469fa))",
+    "name": "test-linux64-ccov/opt-mochitest-e10s-7"
+  },
+  "tags": {
+    "kind": "test",
+    "os": "linux",
+    "createdForUser": "aiakab@mozilla.com",
+    "retrigger": "true",
+    "label": "test-linux64-ccov/opt-mochitest-e10s-7",
+    "test-type": "mochitest",
+    "worker-implementation": "docker-worker"
+  },
+  "extra": {
+    "index": {
+      "rank": 0
+    },
+    "parent": "UpVSSic1SeCw6sdDMidSLQ",
+    "chunks": {
+      "current": 7,
+      "total": 10
+    },
+    "suite": "mochitest-plain",
+    "treeherder": {
+      "jobKind": "test",
+      "groupSymbol": "M",
+      "collection": {
+        "opt": true
+      },
+      "machine": {
+        "platform": "linux64-ccov"
+      },
+      "groupName": "Mochitests",
+      "tier": 3,
+      "symbol": "7"
+    },
+    "treeherder-platform": "linux64-ccov/opt"
+  }
+}
\ No newline at end of file
diff --git a/bot/tests/test_artifacts.py b/bot/tests/test_artifacts.py
index d2816e77e..b7a1f6cbc 100644
--- a/bot/tests/test_artifacts.py
+++ b/bot/tests/test_artifacts.py
@@ -206,9 +206,9 @@ def test_download(
 def _group_tasks():
     task_state_groups = [
         [
-            ("test-linux64-ccov/debug-mochitest-devtools-chrome-e10s-4", "exception"),
-            ("test-linux64-ccov/debug-mochitest-devtools-chrome-e10s-4", "failed"),
-            ("test-linux64-ccov/debug-mochitest-devtools-chrome-e10s-4", "completed"),
+            ("test-linux64-ccov/opt-mochitest-devtools-chrome-e10s-4", "exception"),
+            ("test-linux64-ccov/opt-mochitest-devtools-chrome-e10s-4", "failed"),
+            ("test-linux64-ccov/opt-mochitest-devtools-chrome-e10s-4", "completed"),
         ],
         [
             ("test-windows10-64-ccov/debug-xpcshell-4", "exception"),
@@ -219,8 +219,8 @@ def _group_tasks():
             ("test-windows10-64-ccov/debug-talos-dromaeojs-e10s", "completed"),
         ],
         [
-            ("test-linux64-ccov/debug-cppunit", "exception"),
-            ("test-linux64-ccov/debug-cppunit", "completed"),
+            ("test-linux64-ccov/opt-cppunit", "exception"),
+            ("test-linux64-ccov/opt-cppunit", "completed"),
         ],
         [("test-linux64-stylo-disabled/debug-crashtest-e10s", "completed")],
     ]
@@ -232,7 +232,6 @@ def build_task(task_state):
         platform, test = task_name.split("/")
         suite = test.rstrip("debug-")
         platform = platform.lstrip("test-").rstrip("-ccov")
-        print(suite, platform)
         return {
             "status": {"taskId": task_name + "-" + state, "state": state},
             "task": {
@@ -294,8 +293,8 @@ def mock_download(task):
 
         assert downloaded == set(
             [
-                "test-linux64-ccov/debug-mochitest-devtools-chrome-e10s-4-completed",
+                "test-linux64-ccov/opt-mochitest-devtools-chrome-e10s-4-completed",
                 "test-windows10-64-ccov/debug-xpcshell-4-failed",
-                "test-linux64-ccov/debug-cppunit-completed",
+                "test-linux64-ccov/opt-cppunit-completed",
             ]
         )
diff --git a/bot/tests/test_chunk_mapping.py b/bot/tests/test_chunk_mapping.py
index c6a71930d..c4c97802f 100644
--- a/bot/tests/test_chunk_mapping.py
+++ b/bot/tests/test_chunk_mapping.py
@@ -121,7 +121,7 @@ def request_callback(request):
                             data = {
                                 "result.test": ["marionette-test1"],
                                 "run.key": [
-                                    "test-linux64-ccov/debug-marionette-headless-e10s"
+                                    "test-linux64-ccov/opt-marionette-headless-e10s"
                                 ],
                             }
                         elif prefix == "test-windows10-64-ccov":
diff --git a/bot/tests/test_taskcluster.py b/bot/tests/test_taskcluster.py
index adeb212ee..03794b207 100644
--- a/bot/tests/test_taskcluster.py
+++ b/bot/tests/test_taskcluster.py
@@ -39,7 +39,7 @@ def test_get_task(
 ):
     responses.add(
         responses.GET,
-        "http://taskcluster.test/api/index/v1/task/gecko.v2.mozilla-central.revision.b2a9a4bb5c94de179ae7a3f52fde58c0e2897498.firefox.linux64-ccov-debug",
+        "http://taskcluster.test/api/index/v1/task/gecko.v2.mozilla-central.revision.b2a9a4bb5c94de179ae7a3f52fde58c0e2897498.firefox.linux64-ccov-opt",
         json=LATEST_LINUX,
         status=200,
     )  # noqa
@@ -67,7 +67,7 @@ def test_get_task(
 def test_get_task_not_found(mock_taskcluster, TASK_NOT_FOUND):
     responses.add(
         responses.GET,
-        "http://taskcluster.test/api/index/v1/task/gecko.v2.mozilla-central.revision.b2a9a4bb5c94de179ae7a3f52fde58c0e2897498.firefox.linux64-ccov-debug",
+        "http://taskcluster.test/api/index/v1/task/gecko.v2.mozilla-central.revision.b2a9a4bb5c94de179ae7a3f52fde58c0e2897498.firefox.linux64-ccov-opt",
         json=TASK_NOT_FOUND,
         status=404,
     )  # noqa
@@ -85,7 +85,7 @@ def test_get_task_failure(mock_taskcluster, TASK_NOT_FOUND):
     err["code"] = "RandomError"
     responses.add(
         responses.GET,
-        "http://taskcluster.test/api/index/v1/task/gecko.v2.mozilla-central.revision.b2a9a4bb5c94de179ae7a3f52fde58c0e2897498.firefox.linux64-ccov-debug",
+        "http://taskcluster.test/api/index/v1/task/gecko.v2.mozilla-central.revision.b2a9a4bb5c94de179ae7a3f52fde58c0e2897498.firefox.linux64-ccov-opt",
         json=err,
         status=500,
     )  # noqa
@@ -134,14 +134,19 @@ def test_get_tasks_in_group(mock_taskcluster, GROUP_TASKS_1, GROUP_TASKS_2):
 @pytest.mark.parametrize(
     "task_name, expected",
     [
-        ("test-linux64-ccov/debug-mochitest-1", True),
-        ("test-linux64-ccov/debug-mochitest-e10s-7", True),
-        ("test-linux64-ccov/debug-cppunit", True),
-        ("test-linux64-ccov/debug-firefox-ui-functional-remote-e10s", True),
+        ("test-linux64-ccov/debug-mochitest-1", False),
+        ("test-linux64-ccov/debug-mochitest-e10s-7", False),
+        ("test-linux64-ccov/debug-cppunit", False),
+        ("test-linux64-ccov/debug-firefox-ui-functional-remote-e10s", False),
+        ("test-linux64-ccov/opt-mochitest-1", True),
+        ("test-linux64-ccov/opt-mochitest-e10s-7", True),
+        ("test-linux64-ccov/opt-cppunit", True),
+        ("test-linux64-ccov/opt-firefox-ui-functional-remote-e10s", True),
         ("test-windows10-64-ccov/debug-mochitest-1", True),
         ("test-windows10-64-ccov/debug-mochitest-e10s-7", True),
         ("test-windows10-64-ccov/debug-cppunit", True),
-        ("build-linux64-ccov/debug", True),
+        ("build-linux64-ccov/debug", False),
+        ("build-linux64-ccov/opt", True),
         ("build-android-test-ccov/opt", True),
         ("build-win64-ccov/debug", True),
         ("test-linux64/debug-mochitest-1", False),
@@ -157,17 +162,17 @@ def test_is_coverage_task(task_name, expected):
 @pytest.mark.parametrize(
     "task_name, expected",
     [
-        ("test-linux64-ccov/debug-mochitest-1", "mochitest-1"),
-        ("test-linux64-ccov/debug-mochitest-e10s-7", "mochitest-7"),
-        ("test-linux64-ccov/debug-cppunit", "cppunit"),
+        ("test-linux64-ccov/opt-mochitest-1", "mochitest-1"),
+        ("test-linux64-ccov/opt-mochitest-e10s-7", "mochitest-7"),
+        ("test-linux64-ccov/opt-cppunit", "cppunit"),
         (
-            "test-linux64-ccov/debug-firefox-ui-functional-remote-e10s",
+            "test-linux64-ccov/opt-firefox-ui-functional-remote-e10s",
             "firefox-ui-functional-remote",
         ),
         ("test-windows10-64-ccov/debug-mochitest-1", "mochitest-1"),
         ("test-windows10-64-ccov/debug-mochitest-e10s-7", "mochitest-7"),
         ("test-windows10-64-ccov/debug-cppunit", "cppunit"),
-        ("build-linux64-ccov/debug", "build"),
+        ("build-linux64-ccov/opt", "build"),
         ("build-android-test-ccov/opt", "build"),
         ("build-win64-ccov/debug", "build"),
     ],
@@ -193,17 +198,17 @@ def test_chunk_to_suite(chunk, expected):
 @pytest.mark.parametrize(
     "task_name, expected",
     [
-        ("test-linux64-ccov/debug-mochitest-1", "mochitest-1"),
-        ("test-linux64-ccov/debug-mochitest-e10s-7", "mochitest-plain-chunked-7"),
-        ("test-linux64-ccov/debug-cppunit", "cppunittest-1"),
+        ("test-linux64-ccov/opt-mochitest-1", "mochitest-plain-1"),
+        ("test-linux64-ccov/opt-mochitest-e10s-7", "mochitest-plain-7"),
+        ("test-linux64-ccov/opt-cppunit", "cppunittest-1"),
         (
-            "test-linux64-ccov/debug-firefox-ui-functional-remote-e10s",
+            "test-linux64-ccov/opt-firefox-ui-functional-remote-e10s",
             "firefox-ui-functional-remote-1",
         ),
         ("test-windows10-64-ccov/debug-mochitest-1", "mochitest-1"),
         ("test-windows10-64-ccov/debug-mochitest-e10s-7", "mochitest-plain-chunked-7"),
         ("test-windows10-64-ccov/debug-cppunit", "cppunittest-1"),
-        ("build-linux64-ccov/debug", "build"),
+        ("build-linux64-ccov/opt", "build"),
         ("build-android-test-ccov/opt", "build"),
         ("build-win64-ccov/debug", "build"),
     ],
@@ -216,17 +221,17 @@ def test_get_chunk(task_name, expected):
 @pytest.mark.parametrize(
     "task_name, expected",
     [
-        ("test-linux64-ccov/debug-mochitest-1", "mochitest"),
-        ("test-linux64-ccov/debug-mochitest-e10s-7", "mochitest-plain-chunked"),
-        ("test-linux64-ccov/debug-cppunit", "cppunittest"),
+        ("test-linux64-ccov/opt-mochitest-1", "mochitest-plain"),
+        ("test-linux64-ccov/opt-mochitest-e10s-7", "mochitest-plain"),
+        ("test-linux64-ccov/opt-cppunit", "cppunittest"),
         (
-            "test-linux64-ccov/debug-firefox-ui-functional-remote-e10s",
+            "test-linux64-ccov/opt-firefox-ui-functional-remote-e10s",
             "firefox-ui-functional-remote",
         ),
         ("test-windows10-64-ccov/debug-mochitest-1", "mochitest"),
         ("test-windows10-64-ccov/debug-mochitest-e10s-7", "mochitest-plain-chunked"),
         ("test-windows10-64-ccov/debug-cppunit", "cppunittest"),
-        ("build-linux64-ccov/debug", "build"),
+        ("build-linux64-ccov/opt", "build"),
         ("build-android-test-ccov/opt", "build"),
         ("build-win64-ccov/debug", "build"),
     ],
@@ -239,14 +244,14 @@ def test_get_suite(task_name, expected):
 @pytest.mark.parametrize(
     "task_name, expected",
     [
-        ("test-linux64-ccov/debug-mochitest-1", "linux"),
-        ("test-linux64-ccov/debug-mochitest-e10s-7", "linux"),
-        ("test-linux64-ccov/debug-cppunit", "linux"),
-        ("test-linux64-ccov/debug-firefox-ui-functional-remote-e10s", "linux"),
+        ("test-linux64-ccov/opt-mochitest-1", "linux"),
+        ("test-linux64-ccov/opt-mochitest-e10s-7", "linux"),
+        ("test-linux64-ccov/opt-cppunit", "linux"),
+        ("test-linux64-ccov/opt-firefox-ui-functional-remote-e10s", "linux"),
         ("test-windows10-64-ccov/debug-mochitest-1", "windows"),
         ("test-windows10-64-ccov/debug-mochitest-e10s-7", "windows"),
         ("test-windows10-64-ccov/debug-cppunit", "windows"),
-        ("build-linux64-ccov/debug", "linux"),
+        ("build-linux64-ccov/opt", "linux"),
         ("build-android-test-ccov/opt", "android"),
         ("build-win64-ccov/debug", "windows"),
     ],
diff --git a/report/firefox_code_coverage/codecoverage.py b/report/firefox_code_coverage/codecoverage.py
index 83ae4600e..d5f5e141b 100644
--- a/report/firefox_code_coverage/codecoverage.py
+++ b/report/firefox_code_coverage/codecoverage.py
@@ -18,7 +18,7 @@
     from urllib2 import Request, urlopen
 
 
-TEST_PLATFORMS = ["test-linux64-ccov/debug", "test-windows10-64-ccov/debug"]
+TEST_PLATFORMS = ["test-linux64-ccov/opt", "test-windows10-64-ccov/debug"]
 FINISHED_STATUSES = ["completed", "failed", "exception"]
 ALL_STATUSES = FINISHED_STATUSES + ["unscheduled", "pending", "running"]
 STATUS_VALUE = {"exception": 1, "failed": 2, "completed": 3}
@@ -40,14 +40,14 @@ def is_taskcluster_loaner():
 
 def get_last_task():
     last_task = get_json(
-        "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.v2.mozilla-central.latest.firefox.linux64-ccov-debug"
+        "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.v2.mozilla-central.latest.firefox.linux64-ccov-opt"
     )
     return last_task["taskId"]
 
 
 def get_task(branch, revision):
     task = get_json(
-        "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.v2.%s.revision.%s.firefox.linux64-ccov-debug"
+        "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.v2.%s.revision.%s.firefox.linux64-ccov-opt"
         % (branch, revision)
     )
     return task["taskId"]
diff --git a/report/tests/test.py b/report/tests/test.py
index 994fc7e5e..f104dbe64 100644
--- a/report/tests/test.py
+++ b/report/tests/test.py
@@ -30,7 +30,7 @@ def test(self):
         self.assertTrue(task_id)
 
         task_data = codecoverage.get_task_details(task_id)
-        self.assertEqual(task_data["metadata"]["name"], "build-linux64-ccov/debug")
+        self.assertEqual(task_data["metadata"]["name"], "build-linux64-ccov/opt")
 
         revision = task_data["payload"]["env"]["GECKO_HEAD_REV"]
         task_id_2 = codecoverage.get_task("mozilla-central", revision)
@@ -78,15 +78,15 @@ def test(self):
 
     def test_suite_name_from_task_name(self):
         cases = [
-            ("test-linux64-ccov/debug-gtest", "gtest"),
-            ("test-linux64-ccov/debug-jsreftest-1", "jsreftest"),
+            ("test-linux64-ccov/opt-gtest", "gtest"),
+            ("test-linux64-ccov/opt-jsreftest-1", "jsreftest"),
             (
-                "test-linux64-ccov/debug-mochitest-devtools-chrome-e10s-10",
+                "test-linux64-ccov/opt-mochitest-devtools-chrome-e10s-10",
                 "mochitest-devtools-chrome",
             ),
-            ("test-linux64-ccov/debug-mochitest-clipboard", "mochitest-clipboard"),
-            ("test-linux64-ccov/debug-reftest-no-accel-e10s-5", "reftest-no-accel"),
-            ("test-linux64-ccov/debug-mochitest-5", "mochitest"),
+            ("test-linux64-ccov/opt-mochitest-clipboard", "mochitest-clipboard"),
+            ("test-linux64-ccov/opt-reftest-no-accel-e10s-5", "reftest-no-accel"),
+            ("test-linux64-ccov/opt-mochitest-5", "mochitest"),
             ("test-windows10-64-ccov/debug-mochitest-5", "mochitest"),
             ("test-windows10-64-ccov/debug-cppunit", "cppunit"),
         ]