--- a/taskcluster/ci/test/raptor.yml
+++ b/taskcluster/ci/test/raptor.yml
@@ -46,16 +46,30 @@ raptor-firefox-speedometer:
         by-test-platform:
             .*-qr/.*: ['try']
             default: ['try']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --test=raptor-speedometer
 
+raptor-chrome-tp6:
+    description: "Raptor Chrome tp6"
+    try-name: raptor-chrome-tp6
+    treeherder-symbol: Rap-C(tp6)
+    run-on-projects:
+        by-test-platform:
+            .*-qr/.*: ['try']
+            default: ['try']
+    max-run-time: 1200
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6
+            - --app=chrome
+
 raptor-chrome-speedometer:
     description: "Raptor Chrome speedometer"
     try-name: raptor-chrome-speedometer
     treeherder-symbol: Rap-C(sp)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['try']
             default: ['try']

--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -47,16 +47,17 @@ linux64/opt:
         - common-tests
         - web-platform-tests
         - opt-only-tests
         - desktop-screenshot-capture
         - talos
         - awsy
         - mochitest-headless
         - linux-talos-flex
+        - raptor
 linux64-nightly/opt:
     build-platform: linux64-nightly/opt
     test-sets:
         - common-tests
         - web-platform-tests
         - opt-only-tests
         - desktop-screenshot-capture
         - awsy
@@ -71,16 +72,17 @@ linux64-devedition/opt:
 
 # TODO: use 'pgo' and 'asan' labels here, instead of -pgo/opt
 linux64-pgo/opt:
     build-platform: linux64-pgo/opt
     test-sets:
         - common-tests
         - web-platform-tests
         - talos
+        - raptor
 
 linux64-asan/opt:
     build-platform: linux64-asan/opt
     test-sets:
         - common-tests
 
 # Stylo sequential runs check memory and performance when using a single thread.
 linux64-stylo-sequential/opt:
@@ -91,16 +93,17 @@ linux64-stylo-sequential/opt:
 # QR builds just run a subset right now.
 linux64-qr/opt:
     build-platform: linux64/opt
     test-sets:
         - linux-qr-tests
         - talos
         - awsy
         - web-platform-tests
+        - raptor
 linux64-qr/debug:
     build-platform: linux64/debug
     test-sets:
         - linux-qr-tests
         - web-platform-tests
 
 linux64-ccov/debug:
     build-platform: linux64-ccov/debug
@@ -176,24 +179,26 @@ windows10-64/debug:
 windows10-64/opt:
     build-platform: win64/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-talos
         - windows-tests
         - mochitest-headless
+        - raptor
 
 windows10-64-pgo/opt:
     build-platform: win64-pgo/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-talos
         - windows-tests
+        - raptor
 
 windows10-64-nightly/opt:
     build-platform: win64-nightly/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - desktop-instrumentation
         - windows-tests
@@ -216,16 +221,17 @@ windows10-64-qr/debug:
     test-sets:
         - windows-qr-tests
 
 windows10-64-qr/opt:
     build-platform: win64/opt
     test-sets:
         - windows-qr-tests
         - windows-talos
+        - raptor
 
 
 ##
 # MacOS X platforms (matching /macosx.*/)
 
 macosx64/debug:
     build-platform: macosx64/debug
     test-sets:
@@ -233,17 +239,17 @@ macosx64/debug:
 
 macosx64/opt:
     build-platform: macosx64/opt
     test-sets:
         - macosx64-talos
         - macosx64-tests
         - desktop-screenshot-capture
         - awsy
-        - macosx64-raptor
+        - raptor
 
 macosx64-nightly/opt:
     build-platform: macosx64-nightly/opt
     test-sets:
         - macosx64-tests
         - macosx64-talos-profiling
         - awsy
 

--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -74,16 +74,22 @@ talos:
     - talos-tp6
     - talos-tp6-stylo-threads
     - talos-tps
     - talos-speedometer
     - talos-motionmark
     - talos-h1
     - talos-h2
 
+raptor:
+    - raptor-firefox-tp6
+    - raptor-firefox-speedometer
+    - raptor-chrome-tp6
+    - raptor-chrome-speedometer
+
 awsy:
     - awsy
     - awsy-base
 
 awsy-stylo-sequential:
     - awsy-stylo-sequential
 
 ##
@@ -275,21 +281,16 @@ macosx64-talos-profiling:
     - talos-svgr-profiling
     - talos-tp5o-profiling
     - talos-tp6-profiling
     # - talos-tps-profiling # Bug 1453007 times out
 
 macosx64-qr-tests:
     - reftest
 
-macosx64-raptor:
-    - raptor-firefox-tp6
-    - raptor-firefox-speedometer
-    - raptor-chrome-speedometer
-
 linux32-tests:
     - cppunit
     - crashtest
     - firefox-ui-functional-local
     - firefox-ui-functional-remote
     - gtest
     - jittest
     - jsreftest