diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index 6f8d41e3cb8..1b0b3475a32 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -708,7 +708,12 @@ def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes,
                 total_chunks,
                 width=len(str(total_chunks)),
             ))
-            .with_treeherder(platform, "%sWPT-%s" % (job_id_prefix, this_chunk))
+            .with_treeherder(
+                platform,
+                "WPT-%s" % this_chunk,
+                group_symbol=job_id_prefix + "WPT",
+                group_name=name_prefix + "web-platform-tests"
+            )
             .with_curl_artifact_script(build_task, "target.tar.gz")
             .with_script("tar -xzf target.tar.gz")
             .with_index_and_artifacts_expire_in(log_artifacts_expire_in)
diff --git a/etc/taskcluster/decisionlib.py b/etc/taskcluster/decisionlib.py
index 2dca9e882ac..c1c9aaadf60 100644
--- a/etc/taskcluster/decisionlib.py
+++ b/etc/taskcluster/decisionlib.py
@@ -172,7 +172,7 @@ class Task:
         self.treeherder_required = True
         return self
 
-    def with_treeherder(self, category, symbol):
+    def with_treeherder(self, category, symbol, group_name=None, group_symbol=None):
         assert len(symbol) <= 25, symbol
         self.name = "%s: %s" % (category, self.name)
 
@@ -185,12 +185,16 @@ class Task:
         platform = parts[0]
         labels = parts[1:] or ["_"]
 
-        # https://docs.taskcluster.net/docs/reference/integrations/taskcluster-treeherder/docs/task-treeherder-config
-        self.with_extra(treeherder={
-            "machine": {"platform": platform},
-            "labels": labels,
-            "symbol": symbol,
-        })
+        # https://github.com/mozilla/treeherder/blob/master/schemas/task-treeherder-config.yml
+        self.with_extra(treeherder=dict_update_if_truthy(
+            {
+                "machine": {"platform": platform},
+                "labels": labels,
+                "symbol": symbol,
+            },
+            groupName=group_name,
+            groupSymbol=group_symbol,
+        ))
 
         if CONFIG.treeherder_repository_name:
             assert CONFIG.git_sha