--- a/build/gen_test_packages_manifest.py
+++ b/build/gen_test_packages_manifest.py
@@ -13,27 +13,29 @@ ALL_HARNESSES = [
     'mochitest',
     'reftest',
     'xpcshell',
     'cppunittest',
     'jittest',
     'mozbase',
     'web-platform',
     'talos',
+    'raptor',
     'awsy',
     'gtest',
 ]
 
 PACKAGE_SPECIFIED_HARNESSES = [
     'cppunittest',
     'mochitest',
     'reftest',
     'xpcshell',
     'web-platform',
     'talos',
+    'raptor',
     'awsy',
 ]
 
 # These packages are not present for every build configuration.
 OPTIONAL_PACKAGES = [
     'gtest',
 ]
 

--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -101,16 +101,17 @@ ARCHIVE_FILES = {
             'base': '',
             'pattern': '**',
             'ignore': [
                 'cppunittest/**',
                 'gtest/**',
                 'mochitest/**',
                 'reftest/**',
                 'talos/**',
+                'raptor/**',
                 'awsy/**',
                 'web-platform/**',
                 'xpcshell/**',
             ],
         },
         {
             'source': buildconfig.topobjdir,
             'base': '_tests',
@@ -400,16 +401,29 @@ ARCHIVE_FILES = {
         },
         {
             'source': buildconfig.topsrcdir,
             'base': 'third_party/webkit/PerformanceTests',
             'pattern': '**',
             'dest': 'talos/talos/tests/webkit/PerformanceTests/',
         },
     ],
+    'raptor': [
+        {
+            'source': buildconfig.topsrcdir,
+            'base': 'testing',
+            'pattern': 'raptor/**',
+        },
+        {
+            'source': buildconfig.topsrcdir,
+            'base': 'third_party/webkit/PerformanceTests',
+            'pattern': '**',
+            'dest': 'raptor/raptor/tests/webkit/PerformanceTests/',
+        },
+    ],
     'awsy': [
         {
             'source': buildconfig.topsrcdir,
             'base': 'testing',
             'pattern': 'awsy/**',
         },
     ],
     'web-platform': [

--- a/taskcluster/taskgraph/test/test_target_tasks.py
+++ b/taskcluster/taskgraph/test/test_target_tasks.py
@@ -15,16 +15,17 @@ from taskgraph.task import Task
 from mozunit import main
 
 
 class FakeTryOptionSyntax(object):
 
     def __init__(self, message, task_graph, graph_config):
         self.trigger_tests = 0
         self.talos_trigger_tests = 0
+        self.raptor_trigger_tests = 0
         self.notifications = None
         self.env = []
         self.profile = False
         self.tag = None
         self.no_retry = False
 
     def task_matches(self, task):
         return 'at-at' in task.attributes

--- a/testing/moz.build
+++ b/testing/moz.build
@@ -114,8 +114,13 @@ with Files("tools/websocketprocessbridge
 with Files("tools/fileid/**"):
     BUG_COMPONENT = ("Toolkit", "Crash Reporting")
 
 with Files("tools/minidumpwriter/**"):
     BUG_COMPONENT = ("Toolkit", "Crash Reporting")
 
 with Files("remote*"):
     BUG_COMPONENT = ("Firefox for Android", "Testing")
+
+with Files("raptor/**"):
+    BUG_COMPONENT = ("Testing", "Raptor")
+    SCHEDULES.exclusive = ['raptor']
+

--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -113,16 +113,17 @@ stage-all: stage-cppunittests
 endif
 
 TEST_PKGS_ZIP := \
   common \
   cppunittest \
   mochitest \
   reftest \
   talos \
+  raptor \
   awsy \
   xpcshell \
   $(NULL)
 
 TEST_PKGS_TARGZ := \
   web-platform \
   $(NULL)