diff --git a/tools/wltests/agendas/sched-evaluation-full-traced.yaml b/tools/wltests/agendas/sched-evaluation-full-traced.yaml
index 592a540656a4773c5a5c99f2db2fb6b93fd7c6f9..079e07a34ac3e117e5e64905e5fe5e1137cb2475 100644
--- a/tools/wltests/agendas/sched-evaluation-full-traced.yaml
+++ b/tools/wltests/agendas/sched-evaluation-full-traced.yaml
@@ -40,6 +40,7 @@ workloads:
 # Homescreen
 # Sit on the homescreen for 15 seconds
   - name: homescreen
+    id: homescreen
     classifiers:
        tag: sit_15s
     workload_parameters:
@@ -52,6 +53,7 @@ workloads:
 # YouTube app, so it's hoped that this is a decent proxy for Youtube
 # performance on devices where running the real app is impractical.
   - name: exoplayer
+    id: exoplayer-mov720_30s
     classifiers:
        tag: mov_720p_30s
     workload_parameters:
@@ -60,6 +62,7 @@ workloads:
 
 # Play 30 seconds of a OGG Vorbis audio with Exoplayer
   - name: exoplayer
+    id: exoplayer-ogg_128kbps_30s
     classifiers:
        tag: ogg_128kbps_30s
     workload_parameters:
@@ -70,6 +73,7 @@ workloads:
 # PCMark
 
   - name: pcmark
+    id: pcmark
     classifiers:
        tag: single
     iterations: 10
@@ -78,6 +82,7 @@ workloads:
 # Geekbench
 
   - name: geekbench
+    id: geekbench
     classifiers:
        tag: iter_30
     runtime_parameters:
@@ -88,6 +93,7 @@ workloads:
 # Jankbench
 
   - name: jankbench
+    id: jankbench-list_view
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -95,6 +101,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
+    id: jankbench-image_list_view
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -102,6 +109,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
+    id: jankbench-shadow_grid
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -109,6 +117,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
+      test: jankbench-low_hitrate_text
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -116,6 +125,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
+    id: jankbench-edit_text
     classifiers:
       tag: iter_30
     workload_parameters:
diff --git a/tools/wltests/agendas/sched-evaluation-full.yaml b/tools/wltests/agendas/sched-evaluation-full.yaml
index c1dfb7e6ed33e93f451be2fe82e86795d3c67144..ab0b9e0a42f6bea24bec4dca27d2991d740ce0c5 100644
--- a/tools/wltests/agendas/sched-evaluation-full.yaml
+++ b/tools/wltests/agendas/sched-evaluation-full.yaml
@@ -40,6 +40,7 @@ workloads:
 # Homescreen
 # Sit on the homescreen for 15 seconds
   - name: homescreen
+    id: homescreen
     classifiers:
        tag: sit_15s
     workload_parameters:
@@ -52,6 +53,7 @@ workloads:
 # YouTube app, so it's hoped that this is a decent proxy for Youtube
 # performance on devices where running the real app is impractical.
   - name: exoplayer
+    id: exoplayer-mov720_30s
     classifiers:
        tag: mov_720p_30s
     workload_parameters:
@@ -60,6 +62,7 @@ workloads:
 
 # Play 30 seconds of a OGG Vorbis audio with Exoplayer
   - name: exoplayer
+    id: exoplayer-ogg_128kbps_30s
     classifiers:
        tag: ogg_128kbps_30s
     workload_parameters:
@@ -70,6 +73,7 @@ workloads:
 # PCMark
 
   - name: pcmark
+    id: pcmark
     classifiers:
        tag: single
     iterations: 10
@@ -78,6 +82,7 @@ workloads:
 # Geekbench
 
   - name: geekbench
+    id: geekbench
     classifiers:
        tag: iter_30
     runtime_parameters:
@@ -88,6 +93,7 @@ workloads:
 # Jankbench
 
   - name: jankbench
+    id: jankbench-list_view
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -95,6 +101,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
+    id: jankbench-image_list_view
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -102,6 +109,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
+    id: jankbench-shadow_grid
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -109,6 +117,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
+    id: jankbench-low_hitrate_text
     classifiers:
       tag: iter_30
     workload_parameters:
@@ -116,6 +125,7 @@ workloads:
     iterations: 30
 
   - name: jankbench
+    id: jankbench-edit_text
     classifiers:
       tag: iter_30
     workload_parameters:
diff --git a/tools/wltests/agendas/sched-evaluation-small.yaml b/tools/wltests/agendas/sched-evaluation-small.yaml
index a226d9dc2917f9ac51c82cb6c70d462649ca6fef..9861eba0cf9852b317f74264eb468a56a218e8bc 100644
--- a/tools/wltests/agendas/sched-evaluation-small.yaml
+++ b/tools/wltests/agendas/sched-evaluation-small.yaml
@@ -40,6 +40,7 @@ workloads:
 # Homescreen
 # Sit on the homescreen for 15 seconds
   - name: homescreen
+    id: homescreen
     classifiers:
        tag: sit_3s
     workload_parameters:
@@ -52,6 +53,7 @@ workloads:
 # YouTube app, so it's hoped that this is a decent proxy for Youtube
 # performance on devices where running the real app is impractical.
   - name: exoplayer
+    id: exoplayer-mov720_30s
     classifiers:
        tag: mov_720p_3s
     workload_parameters:
@@ -60,6 +62,7 @@ workloads:
 
 # Play 30 seconds of a OGG Vorbis audio with Exoplayer
   - name: exoplayer
+    id: exoplayer-ogg_128kbps_30s
     classifiers:
        tag: ogg_128kbps_3s
     workload_parameters:
@@ -70,6 +73,7 @@ workloads:
 # PCMark
 
   - name: pcmark
+    id: pcmark
     classifiers:
        tag: iter_5
     iterations: 5
@@ -78,6 +82,7 @@ workloads:
 # Geekbench
 
   - name: geekbench
+    id: geekbench
     classifiers:
        tag: iter_3
     runtime_parameters:
@@ -88,6 +93,7 @@ workloads:
 # Jankbench
 
   - name: jankbench
+    id: jankbench-list_view
     classifiers:
       tag: iter_3
     workload_parameters:
@@ -95,6 +101,7 @@ workloads:
     iterations: 3
 
   - name: jankbench
+    id: jankbench-image_list_view
     classifiers:
       tag: iter_3
     workload_parameters:
@@ -102,6 +109,7 @@ workloads:
     iterations: 3
 
   - name: jankbench
+    id: jankbench-shadow_grid
     classifiers:
       tag: iter_3
     workload_parameters:
@@ -109,6 +117,7 @@ workloads:
     iterations: 3
 
   - name: jankbench
+    id: jankbench-low_hitrate_text
     classifiers:
       tag: iter_3
     workload_parameters:
@@ -116,6 +125,7 @@ workloads:
     iterations: 3
 
   - name: jankbench
+    id: jankbench-edit_text
     classifiers:
       tag: iter_3
     workload_parameters: