--- a/taskcluster/ci/test/raptor.yml
+++ b/taskcluster/ci/test/raptor.yml
@@ -31,17 +31,17 @@ raptor-firefox-tp6:
     treeherder-symbol: Rap(tp6)
     run-on-projects: ['try', 'mozilla-central']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --test=raptor-tp6
 
 raptor-firefox-speedometer:
-    description: "Raptor Firefox speedometer"
+    description: "Raptor Firefox Speedometer"
     try-name: raptor-firefox-speedometer
     treeherder-symbol: Rap(sp)
     run-on-projects: ['try', 'mozilla-central']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --test=raptor-speedometer
 
@@ -50,16 +50,26 @@ raptor-firefox-stylebench:
     try-name: raptor-firefox-stylebench
     treeherder-symbol: Rap(sb)
     run-on-projects: ['try', 'mozilla-central']
     max-run-time: 1800
     mozharness:
         extra-options:
             - --test=raptor-stylebench
 
+raptor-firefox-sunspider:
+    description: "Raptor Firefox SunSpider"
+    try-name: raptor-firefox-sunspider
+    treeherder-symbol: Rap(ss)
+    run-on-projects: ['try', 'mozilla-central']
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-sunspider
+
 raptor-firefox-motionmark-htmlsuite:
     description: "Raptor Firefox MotionMark HtmlSuite"
     try-name: raptor-firefox-motionmark-htmlsuite
     treeherder-symbol: Rap(mm-h)
     run-on-projects: ['try', 'mozilla-central']
     max-run-time: 1800
     mozharness:
         extra-options:
@@ -95,17 +105,17 @@ raptor-chrome-tp6:
             default: ['try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --test=raptor-tp6
             - --app=chrome
 
 raptor-chrome-speedometer:
-    description: "Raptor Chrome speedometer"
+    description: "Raptor Chrome Speedometer"
     try-name: raptor-chrome-speedometer
     treeherder-symbol: Rap-C(sp)
     run-on-projects: ['try', 'mozilla-central']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --test=raptor-speedometer
             - --app=chrome
@@ -116,16 +126,27 @@ raptor-chrome-stylebench:
     treeherder-symbol: Rap-C(sb)
     run-on-projects: ['try', 'mozilla-central']
     max-run-time: 1800
     mozharness:
         extra-options:
             - --test=raptor-stylebench
             - --app=chrome
 
+raptor-chrome-sunspider:
+    description: "Raptor Chrome SunSpider"
+    try-name: raptor-chrome-sunspider
+    treeherder-symbol: Rap-C(ss)
+    run-on-projects: ['try', 'mozilla-central']
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-sunspider
+            - --app=chrome
+
 raptor-chrome-motionmark-htmlsuite:
     description: "Raptor Chrome MotionMark HtmlSuite"
     try-name: raptor-chrome-motionmark-htmlsuite
     treeherder-symbol: Rap-C(mm-h)
     run-on-projects: ['try', 'mozilla-central']
     max-run-time: 1800
     mozharness:
         extra-options:

--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -79,22 +79,24 @@ talos:
     - talos-motionmark
     - talos-h1
     - talos-h2
 
 raptor:
     - raptor-firefox-tp6
     - raptor-firefox-speedometer
     - raptor-firefox-stylebench
+    - raptor-firefox-sunspider
     - raptor-firefox-motionmark-htmlsuite
     - raptor-firefox-motionmark-animometer
     - raptor-firefox-webaudio
     - raptor-chrome-tp6
     - raptor-chrome-speedometer
     - raptor-chrome-stylebench
+    - raptor-chrome-sunspider
     - raptor-chrome-webaudio
 
 awsy:
     - awsy
     - awsy-base
 
 awsy-stylo-sequential:
     - awsy-stylo-sequential

--- a/testing/raptor/raptor/tests/raptor-sunspider.ini
+++ b/testing/raptor/raptor/tests/raptor-sunspider.ini
@@ -1,21 +1,20 @@
 # 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/.
 
 # sunspider benchmark for firefox and chrome
 
 [DEFAULT]
 type =  benchmark
+test_url = http://localhost:<port>/SunSpider/sunspider-1.0.1/sunspider-1.0.1/driver.html?raptor
 page_cycles = 5
 page_timeout = 35000
 unit = score
 lower_is_better = false
 alert_threshold = 2.0
 
-[raptor-sunspider-browser-firefox]
-test_url = http://localhost:<port>/SunSpider/sunspider-1.0.1/sunspider-1.0.1/driver.html?raptor
+[raptor-sunspider-firefox]
 apps = firefox
 
-[raptor-sunspider-browser-chrome]
-test_url = http://localhost:<port>/SunSpider/sunspider-1.0.1/sunspider-1.0.1/driver.html?raptor
+[raptor-sunspider-chrome]
 apps = chrome