--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -405,20 +405,25 @@ def set_tier(config, tests):
     """Set the tier based on policy for all test descriptions that do not
     specify a tier otherwise."""
     for test in tests:
         if 'tier' in test:
             resolve_keyed_by(test, 'tier', item_name=test['test-name'])
 
         # only override if not set for the test
         if 'tier' not in test or test['tier'] == 'default':
-            if test['test-platform'] in ['linux64/debug',
+            if test['test-platform'] in ['linux32/opt',
+                                         'linux32/debug',
+                                         'linux64/opt',
+                                         'linux64/debug',
+                                         'linux64-pgo/opt',
                                          'linux64-asan/opt',
+                                         'android-4.3-arm7-api-15/opt',
                                          'android-4.3-arm7-api-15/debug',
-                                         'android-x86/opt']:
+                                         'android-4.2-x86/opt']:
                 test['tier'] = 1
             elif test['test-platform'].startswith('windows'):
                 test['tier'] = 3
             else:
                 test['tier'] = 2
         yield test