diff --git a/taskcluster/taskgraph/target_tasks.py b/taskcluster/taskgraph/target_tasks.py
index 7a4d327854ab..ef4a134af224 100644
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -574,12 +574,19 @@ def target_tasks_general_perf_testing(full_task_graph, parameters, graph_config)
             platform = task.task.get('extra').get('treeherder-platform')
             try_name = task.label
 
+        def _run_live_site():
+            for test in LIVE_SITES:
+                if try_name.endswith(test) or try_name.endswith(test + "-e10s"):
+                    return True
+            return False
+
         # Run chrome and chromium on all platforms available
         if '-chrome' in try_name:
             if 'android' in platform:
                 # Run only on shippable android builds
                 if 'shippable' in platform:
-                    return True
+                    if '-live' in try_name:
+                        return _run_live_site()
                 else:
                     return False
             else:
@@ -608,9 +615,7 @@ def target_tasks_general_perf_testing(full_task_graph, parameters, graph_config)
             if '-live' in try_name:
                 # We only want to select those which should run 3 times
                 # a week here, other live site tests should be removed
-                for test in LIVE_SITES:
-                    if try_name.endswith(test) or try_name.endswith(test + "-e10s"):
-                        return True
+                return _run_live_site()
             return False
 
         # Run the following tests on android geckoview