--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -47,17 +47,19 @@ linux64/opt:
         - common-tests
         - web-platform-tests
         - opt-only-tests
         - desktop-screenshot-capture
         - talos
         - awsy
         - mochitest-headless
         - linux-talos-flex
-        - raptor
+        - raptor-firefox
+        - raptor-chrome
+
 linux64-nightly/opt:
     build-platform: linux64-nightly/opt
     test-sets:
         - common-tests
         - web-platform-tests
         - opt-only-tests
         - desktop-screenshot-capture
         - awsy
@@ -72,17 +74,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
+        - raptor-firefox
 
 linux64-asan/opt:
     build-platform: linux64-asan/opt
     test-sets:
         - common-tests
         - web-platform-tests
 
 # Stylo sequential runs check memory and performance when using a single thread.
@@ -94,17 +96,18 @@ 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
+        - raptor-firefox
+
 linux64-qr/debug:
     build-platform: linux64/debug
     test-sets:
         - linux-qr-tests
         - web-platform-tests
 
 linux64-ccov/debug:
     build-platform: linux64-ccov/debug
@@ -137,27 +140,28 @@ windows7-32-msvc/debug:
 windows7-32/opt:
     build-platform: win32/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-reftest-gpu
         - windows-talos
         - windows-tests
-        - raptor
+        - raptor-firefox
+        - raptor-chrome
 
 windows7-32-pgo/opt:
     build-platform: win32-pgo/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-reftest-gpu
         - windows-talos
         - windows-tests
-        - raptor
+        - raptor-firefox
 
 windows7-32-nightly/opt:
     build-platform: win32-nightly/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-reftest-gpu
         - windows-tests
@@ -203,26 +207,27 @@ windows10-64-msvc/debug:
 windows10-64/opt:
     build-platform: win64/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-talos
         - windows-tests
         - mochitest-headless
-        - raptor
+        - raptor-firefox
+        - raptor-chrome
 
 windows10-64-pgo/opt:
     build-platform: win64-pgo/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-talos
         - windows-tests
-        - raptor
+        - raptor-firefox
 
 windows10-64-nightly/opt:
     build-platform: win64-nightly/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - desktop-instrumentation
         - windows-tests
@@ -254,17 +259,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
+        - raptor-firefox
 
 
 ##
 # MacOS X platforms (matching /macosx.*/)
 
 macosx64/debug:
     build-platform: macosx64/debug
     test-sets:
@@ -272,17 +277,18 @@ macosx64/debug:
 
 macosx64/opt:
     build-platform: macosx64/opt
     test-sets:
         - macosx64-talos
         - macosx64-tests
         - desktop-screenshot-capture
         - awsy
-        - raptor
+        - raptor-firefox
+        - raptor-chrome
 
 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
@@ -75,32 +75,34 @@ talos:
     - talos-tp6
     - talos-tp6-stylo-threads
     - talos-tps
     - talos-speedometer
     - talos-motionmark
     - talos-h1
     - talos-h2
 
-raptor:
+raptor-firefox:
     - raptor-tp6-firefox
-    - raptor-tp6-chrome
     - raptor-speedometer-firefox
-    - raptor-speedometer-chrome
     - raptor-stylebench-firefox
-    - raptor-stylebench-chrome
     - raptor-motionmark-htmlsuite-firefox
-    - raptor-motionmark-htmlsuite-chrome
     - raptor-motionmark-animometer-firefox
-    - raptor-motionmark-animometer-chrome
     - raptor-webaudio-firefox
+    - raptor-gdocs-firefox
+    - raptor-sunspider-firefox
+
+raptor-chrome:
+    - raptor-tp6-chrome
+    - raptor-speedometer-chrome
+    - raptor-stylebench-chrome
+    - raptor-motionmark-htmlsuite-chrome
+    - raptor-motionmark-animometer-chrome
     - raptor-webaudio-chrome
-    - raptor-gdocs-firefox
     - raptor-gdocs-chrome
-    - raptor-sunspider-firefox
     - raptor-sunspider-chrome
 
 awsy:
     - awsy
     - awsy-base
 
 awsy-stylo-sequential:
     - awsy-stylo-sequential