diff --git a/taskcluster/ci/test/browsertime-desktop.yml b/taskcluster/ci/test/browsertime-desktop.yml
new file mode 100644
index 000000000000..0683b99e2bce
--- /dev/null
+++ b/taskcluster/ci/test/browsertime-desktop.yml
@@ -0,0 +1,99 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+job-defaults:
+    max-run-time:
+        by-test-platform:
+            .*-qr/.*: 2400
+            .*-ref-hw-2017/.*: 3600
+            default: 1800
+    suite: raptor
+    workdir: /home/cltbld
+    run-on-projects:
+        by-test-platform:
+            .*shippable[^-qr].*: ['mozilla-central', 'try']
+            default: []
+    tier: 3
+    fission-tier: 3
+    virtualization:
+        by-test-platform:
+            windows10-64-ccov/.*: virtual
+            default: hardware
+    mozharness:
+        script: raptor_script.py
+        config:
+            by-test-platform:
+                macosx.*:
+                    - raptor/mac_config.py
+                windows.*:
+                    - raptor/windows_config.py
+                windows10-64-ccov/.*:
+                    - raptor/windows_vm_config.py
+                linux64-ccov/.*:
+                    - raptor/linux64_config_taskcluster.py
+                default:
+                    - raptor/linux_config.py
+        extra-options:
+            - --browsertime
+    fission-run-on-projects: []
+
+browsertime-tp6:
+    description: "Raptor (browsertime) tp6 page-load tests"
+    raptor-test: tp6
+    raptor-subtests: ['amazon']
+    apps: ['firefox', 'chrome']
+    variants:
+        by-app:
+            firefox: []
+            default: []
+    pageload:
+        by-app:
+            firefox: 'both'
+            chrome: 'cold'
+            default: 'warm'
+    limit-platforms:
+        by-app:
+            chrome:
+                - .*shippable[^-qr].*
+            default: []
+    treeherder-symbol: Btime(tp6)
+    max-run-time: 4000
+    run-visual-metrics:
+        by-app:
+            chrome: false
+            default: true
+
+browsertime-speedometer:
+    description: "Raptor (browsertime) Speedometer on Firefox"
+    raptor-test: raptor-speedometer
+    run-on-projects:
+        by-test-platform:
+            .*-ref-hw-2017/.*: []
+            default: ['integration', 'try']
+    variants: ["fission"]
+    apps: ["firefox"]
+    treeherder-symbol: Btime(sp)
+
+browsertime-ares6:
+    description: "Raptor (browsertime) ares6 on Firefox"
+    raptor-test: raptor-ares6
+    run-on-projects:
+        by-test-platform:
+            .*-ref-hw-2017/.*: []
+            default: ['integration', 'try']
+    variants: ["fission"]
+    apps: ["firefox"]
+    treeherder-symbol: Btime(ares6)
+
+browsertime-tp6-profiling:
+    description: "Raptor (browsertime) tp6 page-load tests with Gecko Profiling"
+    raptor-test: tp6
+    raptor-subtests: ['amazon']
+    apps: ['firefox']
+    pageload: 'both'
+    treeherder-symbol: Btime-Prof(tp6)
+    max-run-time: 4000
+    mozharness:
+        extra-options:
+            - --gecko-profile
diff --git a/taskcluster/ci/test/kind.yml b/taskcluster/ci/test/kind.yml
index d1bba54817bb..2d0de04cb7df 100644
--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@@ -26,6 +26,7 @@ transforms:
 
 jobs-from:
     - awsy.yml
+    - browsertime-desktop.yml
     - browsertime-mobile.yml
     - compiled.yml
     - firefox-ui.yml
diff --git a/taskcluster/ci/test/raptor.yml b/taskcluster/ci/test/raptor.yml
index d920ecec2704..24082f8e255e 100644
--- a/taskcluster/ci/test/raptor.yml
+++ b/taskcluster/ci/test/raptor.yml
@@ -992,86 +992,3 @@ raptor-jetstream2-firefox-profiling:
     fetches:
         fetch:
             - jetstream2
-
-browsertime-tp6:
-    description: "Raptor (browsertime) tp6 page-load tests"
-    raptor-test: tp6
-    raptor-subtests: ['amazon']
-    run-on-projects:
-        by-test-platform:
-            .*shippable[^-qr].*: ['mozilla-central', 'try']
-            default: []
-    apps: ['firefox', 'chrome']
-    variants:
-        by-app:
-            firefox: []
-            default: []
-    pageload:
-        by-app:
-            firefox: 'both'
-            chrome: 'cold'
-            default: 'warm'
-    limit-platforms:
-        by-app:
-            chrome:
-                - .*shippable[^-qr].*
-            default: []
-    treeherder-symbol: Btime(tp6)
-    max-run-time: 4000
-    tier: 3
-    run-visual-metrics:
-        by-app:
-            chrome: false
-            default: true
-    mozharness:
-        extra-options:
-            - --browsertime
-
-browsertime-speedometer:
-    description: "Raptor (browsertime) Speedometer on Firefox"
-    raptor-test: raptor-speedometer
-    run-on-projects:
-        by-test-platform:
-            .*-ref-hw-2017/.*: []
-            default: ['integration', 'try']
-    variants: ["fission"]
-    apps: ["firefox"]
-    treeherder-symbol: Btime(sp)
-    tier: 3
-    mozharness:
-        extra-options:
-            - --browsertime
-
-browsertime-ares6:
-    description: "Raptor (browsertime) ares6 on Firefox"
-    raptor-test: raptor-ares6
-    run-on-projects:
-        by-test-platform:
-            .*-ref-hw-2017/.*: []
-            default: ['integration', 'try']
-    variants: ["fission"]
-    apps: ["firefox"]
-    treeherder-symbol: Btime(ares6)
-    tier: 3
-    mozharness:
-        extra-options:
-            - --browsertime
-
-
-browsertime-tp6-profiling:
-    description: "Raptor (browsertime) tp6 page-load tests with Gecko Profiling"
-    raptor-test: tp6
-    raptor-subtests: ['amazon']
-    run-on-projects:
-        by-test-platform:
-            .*shippable[^-qr].*: ['mozilla-central', 'try']
-            default: []
-    apps: ['firefox']
-    pageload: 'both'
-    treeherder-symbol: Btime-Prof(tp6)
-    max-run-time: 4000
-    tier: 3
-    mozharness:
-        extra-options:
-            - --browsertime
-            - --gecko-profile