diff --git a/taskcluster/ci/test/raptor.yml b/taskcluster/ci/test/raptor.yml
index 4c27d5da2964..aaedc542d0ba 100644
--- a/taskcluster/ci/test/raptor.yml
+++ b/taskcluster/ci/test/raptor.yml
@@ -36,7 +36,7 @@ raptor-firefox-tp6:
             - --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']
@@ -55,6 +55,16 @@ raptor-firefox-stylebench:
         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
@@ -100,7 +110,7 @@ raptor-chrome-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']
@@ -121,6 +131,17 @@ raptor-chrome-stylebench:
             - --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
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index e79cb32fae64..82a2b3bed1b5 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -84,12 +84,14 @@ 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:
diff --git a/testing/raptor/raptor/tests/raptor-sunspider.ini b/testing/raptor/raptor/tests/raptor-sunspider.ini
index f37bdc7967e5..ba0da59f44ac 100644
--- a/testing/raptor/raptor/tests/raptor-sunspider.ini
+++ b/testing/raptor/raptor/tests/raptor-sunspider.ini
@@ -6,16 +6,15 @@
 
 [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