diff --git a/taskcluster/ci/test/browsertime-mobile.yml b/taskcluster/ci/test/browsertime-mobile.yml
index cc8b1b40593e..6e5a0b2a0c52 100644
--- a/taskcluster/ci/test/browsertime-mobile.yml
+++ b/taskcluster/ci/test/browsertime-mobile.yml
@@ -180,15 +180,12 @@ browsertime-tp6m:
                             geckoview:
                                 by-test-platform: *android-warm-settings
                             default: []
-    pageload:
-        by-app:
-            fenix: both
-            geckoview: both
-            refbrow: both
-            fennec: both
-            default: cold
+    pageload: cold
     run-visual-metrics: true
     treeherder-symbol: Btime(tp6m)
+    mozharness:
+        extra-options:
+            - --chimera
 
 browsertime-youtube-playback-mobile:
     description: "Browsertime YouTube Playback on Android"
@@ -312,6 +309,7 @@ browsertime-tp6m-live:
     mozharness:
         extra-options:
             - --live-sites
+            - --chimera
 
 browsertime-tp6m-profiling:
     description: "Raptor (browsertime) tp6 page-load tests on android with Gecko profiling"
diff --git a/taskcluster/docker/visual-metrics/run-visual-metrics.py b/taskcluster/docker/visual-metrics/run-visual-metrics.py
index 14b15221f811..0c2402776932 100644
--- a/taskcluster/docker/visual-metrics/run-visual-metrics.py
+++ b/taskcluster/docker/visual-metrics/run-visual-metrics.py
@@ -107,13 +107,14 @@ def append_result(log, suites, test_name, name, result, extra_options):
         log.error("%s" % result)
         result = 0
 
+    orig_test_name = test_name
     if test_name in suites and suites[test_name]["extraOptions"] != extra_options:
         missing = set(extra_options) - set(suites[test_name]["extraOptions"])
         test_name = test_name + "-".join(list(missing))
 
     subtests = suites.setdefault(
         test_name,
-        {"name": test_name, "subtests": {}, "extraOptions": extra_options}
+        {"name": orig_test_name, "subtests": {}, "extraOptions": extra_options}
     )["subtests"]
 
     if name not in subtests: