diff --git a/taskcluster/ci/browsertime/kind.yml b/taskcluster/ci/browsertime/kind.yml
index 946b54e58..47edd71f0 100644
--- a/taskcluster/ci/browsertime/kind.yml
+++ b/taskcluster/ci/browsertime/kind.yml
@@ -220,11 +220,6 @@ jobs:
         treeherder:
             symbol: 'Btime(tp6m-25-c)'
 
-    tp6m-26-cold:
-        test-name: aframe
-        treeherder:
-            symbol: 'Btime(tp6m-26-c)'
-
     tp6m-27-cold:
         test-name: cnn
         treeherder:
diff --git a/taskcluster/ci/raptor/kind.yml b/taskcluster/ci/raptor/kind.yml
index 35673afe5..2adfc1fff 100644
--- a/taskcluster/ci/raptor/kind.yml
+++ b/taskcluster/ci/raptor/kind.yml
@@ -84,141 +84,6 @@ job-defaults:
             - linux64-minidump-stackwalk
 
 jobs:
-    tp6m-1-cold:
-        test-name: raptor-tp6m-1-cold
-        treeherder:
-            symbol: 'Rap(tp6m-1-c)'
-
-    tp6m-2-cold:
-        test-name: raptor-tp6m-2-cold
-        treeherder:
-            symbol: 'Rap(tp6m-2-c)'
-
-    tp6m-3-cold:
-        test-name: raptor-tp6m-3-cold
-        treeherder:
-            symbol: 'Rap(tp6m-3-c)'
-
-    tp6m-4-cold:
-        test-name: raptor-tp6m-4-cold
-        treeherder:
-            symbol: 'Rap(tp6m-4-c)'
-
-    tp6m-5-cold:
-        test-name: raptor-tp6m-5-cold
-        treeherder:
-            symbol: 'Rap(tp6m-5-c)'
-
-    tp6m-6-cold:
-        test-name: raptor-tp6m-6-cold
-        treeherder:
-            symbol: 'Rap(tp6m-6-c)'
-
-    tp6m-7-cold:
-        test-name: raptor-tp6m-7-cold
-        treeherder:
-            symbol: 'Rap(tp6m-7-c)'
-
-    tp6m-8-cold:
-        test-name: raptor-tp6m-8-cold
-        treeherder:
-            symbol: 'Rap(tp6m-8-c)'
-
-    tp6m-9-cold:
-        test-name: raptor-tp6m-9-cold
-        treeherder:
-            symbol: 'Rap(tp6m-9-c)'
-
-    tp6m-10-cold:
-        test-name: raptor-tp6m-10-cold
-        treeherder:
-            symbol: 'Rap(tp6m-10-c)'
-
-    tp6m-11-cold:
-        test-name: raptor-tp6m-11-cold
-        treeherder:
-            symbol: 'Rap(tp6m-11-c)'
-
-    tp6m-12-cold:
-        test-name: raptor-tp6m-12-cold
-        treeherder:
-            symbol: 'Rap(tp6m-12-c)'
-
-    tp6m-13-cold:
-        test-name: raptor-tp6m-13-cold
-        treeherder:
-            symbol: 'Rap(tp6m-13-c)'
-
-    tp6m-14-cold:
-        test-name: raptor-tp6m-14-cold
-        treeherder:
-            symbol: 'Rap(tp6m-14-c)'
-
-    tp6m-15-cold:
-        test-name: raptor-tp6m-15-cold
-        treeherder:
-            symbol: 'Rap(tp6m-15-c)'
-
-    tp6m-16-cold:
-        test-name: raptor-tp6m-16-cold
-        treeherder:
-            symbol: 'Rap(tp6m-16-c)'
-
-    tp6m-17-cold:
-        test-name: raptor-tp6m-17-cold
-        treeherder:
-            symbol: 'Rap(tp6m-17-c)'
-
-    tp6m-18-cold:
-        test-name: raptor-tp6m-18-cold
-        treeherder:
-            symbol: 'Rap(tp6m-18-c)'
-
-    tp6m-19-cold:
-        test-name: raptor-tp6m-19-cold
-        treeherder:
-            symbol: 'Rap(tp6m-19-c)'
-
-    tp6m-20-cold:
-        test-name: raptor-tp6m-20-cold
-        treeherder:
-            symbol: 'Rap(tp6m-20-c)'
-
-    tp6m-21-cold:
-        test-name: raptor-tp6m-21-cold
-        treeherder:
-            symbol: 'Rap(tp6m-21-c)'
-
-    tp6m-22-cold:
-        test-name: raptor-tp6m-22-cold
-        treeherder:
-            symbol: 'Rap(tp6m-22-c)'
-
-    tp6m-23-cold:
-        test-name: raptor-tp6m-23-cold
-        treeherder:
-            symbol: 'Rap(tp6m-23-c)'
-
-    tp6m-24-cold:
-        test-name: raptor-tp6m-24-cold
-        treeherder:
-            symbol: 'Rap(tp6m-24-c)'
-
-    tp6m-25-cold:
-        test-name: raptor-tp6m-25-cold
-        treeherder:
-            symbol: 'Rap(tp6m-25-c)'
-
-    tp6m-26-cold:
-        test-name: raptor-tp6m-26-cold
-        treeherder:
-            symbol: 'Rap(tp6m-26-c)'
-
-    tp6m-27-cold:
-        test-name: raptor-tp6m-27-cold
-        treeherder:
-            symbol: 'Rap(tp6m-27-c)'
-
     youtube-playback:
         test-name: raptor-youtube-playback
         treeherder:
diff --git a/taskcluster/ci/visual-metrics/kind.yml b/taskcluster/ci/visual-metrics/kind.yml
index ff412df2c..73d11ffdb 100644
--- a/taskcluster/ci/visual-metrics/kind.yml
+++ b/taskcluster/ci/visual-metrics/kind.yml
@@ -27,7 +27,7 @@ job-template:
     run-on-tasks-for: []
     worker-type: b-android
     treeherder:
-        tier: 3
+        tier: 2
         kind: other
     worker:
         docker-image: {in-tree: visual-metrics}