diff --git a/NEWS.rst b/NEWS.rst
index 91f7e09b73..b79b4e62a4 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -11,13 +11,19 @@ Since 1.3.0:
   QueueItem has the full context for why the change is being run
   (including the pipeline, items ahead and behind, etc.).  The Change
   is still available via the "change" attribute on the QueueItem.  The
-  second argument is now the Job that is about to be run, ande the
+  second argument is now the Job that is about to be run, and the
   parameter dictionary is shifted to the third position.
 
 * The ZUUL_SHORT_* parameters have been removed (the same
   functionality may be achieved with a custom parameter function that
   matches all jobs).
 
+* Multiple triggers are now supported, in principle (though only
+  Gerrit is defined currently).  Your layout.yaml file will need to
+  change to add the key "gerrit:" inside of the "triggers:" list to
+  specify a Gerrit trigger (and facilitate adding other kinds of
+  triggers later).  See the sample layout.yaml.
+
 * The default behavior is now to immediately dequeue changes that have
   merge conflicts, even those not at the head of the queue.  To enable
   the old behavior (which would wait until the conflicting change was
diff --git a/TESTING.rst b/TESTING.rst
index 293bb8370c..56f2fbb5e3 100644
--- a/TESTING.rst
+++ b/TESTING.rst
@@ -67,6 +67,19 @@ List Failing Tests
   .tox/py27/bin/activate
   testr failing --list
 
+Hanging Tests
+-------------
+
+The following will run each test in turn and print the name of the
+test as it is run::
+
+  . .tox/py27/bin/activate
+  testr run --subunit | subunit2pyunit
+
+You can compare the output of that to::
+
+  python -m testtools.run discover --list
+
 Need More Info?
 ---------------
 
diff --git a/doc/source/zuul.rst b/doc/source/zuul.rst
index 817a57af2e..cb878fd0c4 100644
--- a/doc/source/zuul.rst
+++ b/doc/source/zuul.rst
@@ -178,7 +178,8 @@ explanation of each of the parameters::
   - name: check
     manager: IndependentPipelineManager
     trigger:
-      - event: patchset-created
+      gerrit:
+        - event: patchset-created
     success:
       verified: 1
     failure:
@@ -253,51 +254,55 @@ explanation of each of the parameters::
     DependentPipelineManager, see: :doc:`gating`.
 
 **trigger**
-  This describes what Gerrit events should be placed in the pipeline.
+  Exactly one trigger source must be supplied for each pipeline.
   Triggers are not exclusive -- matching events may be placed in
-  multiple pipelines, and they will behave independently in each of the
-  pipelines they match.  Multiple triggers may be listed.  Further
-  parameters describe the kind of events that match:
+  multiple pipelines, and they will behave independently in each of
+  the pipelines they match.  You may select from the following:
 
-  *event*
-  The event name from gerrit.  Examples: ``patchset-created``,
-  ``comment-added``, ``ref-updated``.  This field is treated as a
-  regular expression.
+  **gerrit**
+    This describes what Gerrit events should be placed in the
+    pipeline.  Multiple gerrit triggers may be listed.  Further
+    parameters describe the kind of events that match:
 
-  *branch*
-  The branch associated with the event.  Example: ``master``.  This
-  field is treated as a regular expression, and multiple branches may
-  be listed.
+    *event*
+    The event name from gerrit.  Examples: ``patchset-created``,
+    ``comment-added``, ``ref-updated``.  This field is treated as a
+    regular expression.
 
-  *ref*
-  On ref-updated events, the branch parameter is not used, instead the
-  ref is provided.  Currently Gerrit has the somewhat idiosyncratic
-  behavior of specifying bare refs for branch names (e.g., ``master``),
-  but full ref names for other kinds of refs (e.g., ``refs/tags/foo``).
-  Zuul matches what you put here exactly against what Gerrit
-  provides.  This field is treated as a regular expression, and
-  multiple refs may be listed.
+    *branch*
+    The branch associated with the event.  Example: ``master``.  This
+    field is treated as a regular expression, and multiple branches may
+    be listed.
 
-  *approval*
-  This is only used for ``comment-added`` events.  It only matches if
-  the event has a matching approval associated with it.  Example:
-  ``code-review: 2`` matches a ``+2`` vote on the code review category.
-  Multiple approvals may be listed.
+    *ref*
+    On ref-updated events, the branch parameter is not used, instead the
+    ref is provided.  Currently Gerrit has the somewhat idiosyncratic
+    behavior of specifying bare refs for branch names (e.g., ``master``),
+    but full ref names for other kinds of refs (e.g., ``refs/tags/foo``).
+    Zuul matches what you put here exactly against what Gerrit
+    provides.  This field is treated as a regular expression, and
+    multiple refs may be listed.
 
-  *email_filter*
-  This is used for any event.  It takes a regex applied on the performer
-  email, i.e Gerrit account email address.  If you want to specify
-  several email filters, you must use a YAML list.  Make sure to use non
-  greedy matchers and to escapes dots!
-  Example: ``email_filter: ^.*?@example\.org$``.
+    *approval*
+    This is only used for ``comment-added`` events.  It only matches if
+    the event has a matching approval associated with it.  Example:
+    ``code-review: 2`` matches a ``+2`` vote on the code review category.
+    Multiple approvals may be listed.
 
-  *comment_filter*
-  This is only used for ``comment-added`` events.  It accepts a list of
-  regexes that are searched for in the comment string. If any of these
-  regexes matches a portion of the comment string the trigger is
-  matched. ``comment_filter: retrigger`` will match when comments
-  containing 'retrigger' somewhere in the comment text are added to a
-  change.
+    *email_filter*
+    This is used for any event.  It takes a regex applied on the performer
+    email, i.e Gerrit account email address.  If you want to specify
+    several email filters, you must use a YAML list.  Make sure to use non
+    greedy matchers and to escapes dots!
+    Example: ``email_filter: ^.*?@example\.org$``.
+
+    *comment_filter*
+    This is only used for ``comment-added`` events.  It accepts a list of
+    regexes that are searched for in the comment string. If any of these
+    regexes matches a portion of the comment string the trigger is
+    matched. ``comment_filter: retrigger`` will match when comments
+    containing 'retrigger' somewhere in the comment text are added to a
+    change.
 
 **dequeue-on-new-patchset**
   Normally, if a new patchset is uploaded to a change that is in a
diff --git a/etc/layout.yaml-sample b/etc/layout.yaml-sample
index eec855355f..b49f5d5968 100644
--- a/etc/layout.yaml-sample
+++ b/etc/layout.yaml-sample
@@ -2,7 +2,8 @@ pipelines:
   - name: check
     manager: IndependentPipelineManager
     trigger:
-      - event: patchset-created
+      gerrit:
+        - event: patchset-created
     success:
       verified: 1
     failure:
@@ -11,8 +12,9 @@ pipelines:
   - name: tests
     manager: IndependentPipelineManager
     trigger:
-     - event: patchset-created
-       email_filter: ^.*@example.org$
+      gerrit:
+        - event: patchset-created
+          email_filter: ^.*@example.org$
     success:
       verified: 1
     failure:
@@ -21,15 +23,17 @@ pipelines:
   - name: post
     manager: IndependentPipelineManager
     trigger:
-      - event: ref-updated
-        ref: ^(?!refs/).*$
+      gerrit:
+        - event: ref-updated
+          ref: ^(?!refs/).*$
 
   - name: gate
     manager: DependentPipelineManager
     trigger:
-      - event: comment-added
-        approval:
-          - approved: 1
+      gerrit:
+        - event: comment-added
+          approval:
+            - approved: 1
     start:
       verified: 0
     success:
diff --git a/tests/fixtures/layout-delayed-repo-init.yaml b/tests/fixtures/layout-delayed-repo-init.yaml
index 79f98980f9..e0613f1d1b 100644
--- a/tests/fixtures/layout-delayed-repo-init.yaml
+++ b/tests/fixtures/layout-delayed-repo-init.yaml
@@ -2,7 +2,8 @@ pipelines:
   - name: check
     manager: IndependentPipelineManager
     trigger:
-      - event: patchset-created
+      gerrit:
+        - event: patchset-created
     success:
       verified: 1
     failure:
@@ -11,16 +12,18 @@ pipelines:
   - name: post
     manager: IndependentPipelineManager
     trigger:
-      - event: ref-updated
-        ref: ^(?!refs/).*$
+      gerrit:
+        - event: ref-updated
+          ref: ^(?!refs/).*$
 
   - name: gate
     manager: DependentPipelineManager
     failure-message: Build failed.  For information on how to proceed, see http://wiki.example.org/Test_Failures
     trigger:
-      - event: comment-added
-        approval:
-          - approved: 1
+      gerrit:
+        - event: comment-added
+          approval:
+            - approved: 1
     success:
       verified: 2
       submit: true
diff --git a/tests/fixtures/layout.yaml b/tests/fixtures/layout.yaml
index ed63e729b5..675d3516b7 100644
--- a/tests/fixtures/layout.yaml
+++ b/tests/fixtures/layout.yaml
@@ -5,7 +5,8 @@ pipelines:
   - name: check
     manager: IndependentPipelineManager
     trigger:
-      - event: patchset-created
+      gerrit:
+        - event: patchset-created
     success:
       verified: 1
     failure:
@@ -14,16 +15,18 @@ pipelines:
   - name: post
     manager: IndependentPipelineManager
     trigger:
-      - event: ref-updated
-        ref: ^(?!refs/).*$
+      gerrit:
+        - event: ref-updated
+          ref: ^(?!refs/).*$
 
   - name: gate
     manager: DependentPipelineManager
     failure-message: Build failed.  For information on how to proceed, see http://wiki.example.org/Test_Failures
     trigger:
-      - event: comment-added
-        approval:
-          - approved: 1
+      gerrit:
+        - event: comment-added
+          approval:
+            - approved: 1
     success:
       verified: 2
       submit: true
@@ -37,14 +40,16 @@ pipelines:
     manager: IndependentPipelineManager
     dequeue-on-new-patchset: false
     trigger:
-      - event: comment-added
-        approval:
-          - approved: 1
+      gerrit:
+        - event: comment-added
+          approval:
+            - approved: 1
 
   - name: dup1
     manager: IndependentPipelineManager
     trigger:
-      - event: change-restored
+      gerrit:
+        - event: change-restored
     success:
       verified: 1
     failure:
@@ -53,7 +58,8 @@ pipelines:
   - name: dup2
     manager: IndependentPipelineManager
     trigger:
-      - event: change-restored
+      gerrit:
+        - event: change-restored
     success:
       verified: 1
     failure:
@@ -64,9 +70,10 @@ pipelines:
     manager: DependentPipelineManager
     failure-message: Build failed.  For information on how to proceed, see http://wiki.example.org/Test_Failures
     trigger:
-      - event: comment-added
-        approval:
-          - approved: 1
+      gerrit:
+        - event: comment-added
+          approval:
+            - approved: 1
     success:
       verified: 2
       submit: true
diff --git a/tests/fixtures/layouts/bad_pipelines4.yaml b/tests/fixtures/layouts/bad_pipelines4.yaml
index a99b9e29a8..7f58024c95 100644
--- a/tests/fixtures/layouts/bad_pipelines4.yaml
+++ b/tests/fixtures/layouts/bad_pipelines4.yaml
@@ -2,7 +2,8 @@ pipelines:
   - name: check
     manager: IndependentPipelineManager
     trigger:
-      - event: non-event
+      gerrit:
+        - event: non-event
 
 projects:
   - name: foo
diff --git a/tests/fixtures/layouts/bad_pipelines5.yaml b/tests/fixtures/layouts/bad_pipelines5.yaml
index 7db7bd1ef4..929c1a94f3 100644
--- a/tests/fixtures/layouts/bad_pipelines5.yaml
+++ b/tests/fixtures/layouts/bad_pipelines5.yaml
@@ -2,8 +2,9 @@ pipelines:
   - name: check
     manager: IndependentPipelineManager
     trigger:
-      - approval:
-          - approved: 1
+      gerrit:
+        - approval:
+            - approved: 1
 
 projects:
   - name: foo
diff --git a/tests/fixtures/layouts/bad_pipelines6.yaml b/tests/fixtures/layouts/bad_pipelines6.yaml
index 8d313bc655..6dcdaf351b 100644
--- a/tests/fixtures/layouts/bad_pipelines6.yaml
+++ b/tests/fixtures/layouts/bad_pipelines6.yaml
@@ -2,8 +2,9 @@ pipelines:
   - name: check
     manager: IndependentPipelineManager
     trigger:
-      - event: comment-added
-        approved: 1
+      gerrit:
+        - event: comment-added
+          approved: 1
 
 projects:
   - name: foo
diff --git a/tests/fixtures/layouts/bad_template1.yaml b/tests/fixtures/layouts/bad_template1.yaml
index 43da793c26..15822d11c4 100644
--- a/tests/fixtures/layouts/bad_template1.yaml
+++ b/tests/fixtures/layouts/bad_template1.yaml
@@ -4,7 +4,8 @@ pipelines:
   - name: 'check'
     manager: IndependentPipelineManager
     trigger:
-     - event: patchset-created
+      gerrit:
+        - event: patchset-created
 
 project-templates:
   - name: template-generic
diff --git a/tests/fixtures/layouts/bad_template2.yaml b/tests/fixtures/layouts/bad_template2.yaml
index 0e40d2d943..b731543829 100644
--- a/tests/fixtures/layouts/bad_template2.yaml
+++ b/tests/fixtures/layouts/bad_template2.yaml
@@ -4,7 +4,8 @@ pipelines:
   - name: 'check'
     manager: IndependentPipelineManager
     trigger:
-     - event: patchset-created
+      gerrit:
+        - event: patchset-created
 
 project-templates:
   - name: template-generic
diff --git a/tests/fixtures/layouts/good_layout.yaml b/tests/fixtures/layouts/good_layout.yaml
index 76a76d9c4e..15be6ef7e5 100644
--- a/tests/fixtures/layouts/good_layout.yaml
+++ b/tests/fixtures/layouts/good_layout.yaml
@@ -5,7 +5,8 @@ pipelines:
   - name: check
     manager: IndependentPipelineManager
     trigger:
-      - event: patchset-created
+      gerrit:
+        - event: patchset-created
     success:
       verified: 1
     failure:
@@ -14,17 +15,19 @@ pipelines:
   - name: post
     manager: IndependentPipelineManager
     trigger:
-      - event: ref-updated
-        ref: ^(?!refs/).*$
+      gerrit:
+        - event: ref-updated
+          ref: ^(?!refs/).*$
 
   - name: gate
     manager: DependentPipelineManager
     success-message: Your change is awesome.
     failure-message: Build failed.  For information on how to proceed, see http://wiki.example.org/Test_Failures
     trigger:
-      - event: comment-added
-        approval:
-          - approved: 1
+      gerrit:
+        - event: comment-added
+          approval:
+            - approved: 1
     success:
       verified: 2
       code-review: 1
diff --git a/tests/fixtures/layouts/good_template1.yaml b/tests/fixtures/layouts/good_template1.yaml
index 1d179f7923..ad060a4e6d 100644
--- a/tests/fixtures/layouts/good_template1.yaml
+++ b/tests/fixtures/layouts/good_template1.yaml
@@ -2,7 +2,8 @@ pipelines:
   - name: 'check'
     manager: IndependentPipelineManager
     trigger:
-     - event: patchset-created
+      gerrit:
+        - event: patchset-created
 
 project-templates:
   - name: template-generic
diff --git a/tests/test_layoutvalidator.py b/tests/test_layoutvalidator.py
index f8225467f4..6881bc9910 100644
--- a/tests/test_layoutvalidator.py
+++ b/tests/test_layoutvalidator.py
@@ -28,7 +28,7 @@ FIXTURE_DIR = os.path.join(os.path.dirname(__file__),
 LAYOUT_RE = re.compile(r'^(good|bad)_.*\.yaml$')
 
 
-class testScheduler(testtools.TestCase):
+class TestLayoutValidator(testtools.TestCase):
     def test_layouts(self):
         """Test layout file validation"""
         print
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index de000c051b..494e1a97a3 100644
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -761,7 +761,7 @@ class TestScheduler(testtools.TestCase):
         self.webapp = zuul.webapp.WebApp(self.sched, port=0)
 
         self.sched.setLauncher(self.launcher)
-        self.sched.setTrigger(self.gerrit)
+        self.sched.registerTrigger(self.gerrit)
 
         self.sched.start()
         self.sched.reconfigure(self.config)
@@ -777,7 +777,7 @@ class TestScheduler(testtools.TestCase):
 
     def assertFinalState(self):
         # Make sure that the change cache is cleared
-        self.assertEqual(len(self.sched.trigger._change_cache.keys()), 0)
+        self.assertEqual(len(self.gerrit._change_cache.keys()), 0)
         self.assertEmptyQueues()
 
     def shutdown(self):
@@ -1440,9 +1440,9 @@ class TestScheduler(testtools.TestCase):
         self.fake_gerrit.addEvent(B.addApproval('APRV', 1))
         self.waitUntilSettled()
 
-        self.log.debug("len %s " % self.sched.trigger._change_cache.keys())
+        self.log.debug("len %s " % self.gerrit._change_cache.keys())
         # there should still be changes in the cache
-        self.assertNotEqual(len(self.sched.trigger._change_cache.keys()), 0)
+        self.assertNotEqual(len(self.gerrit._change_cache.keys()), 0)
 
         self.worker.hold_jobs_in_build = False
         self.worker.release()
@@ -1457,21 +1457,19 @@ class TestScheduler(testtools.TestCase):
         "Test whether a change is ready to merge"
         # TODO: move to test_gerrit (this is a unit test!)
         A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
-        a = self.sched.trigger.getChange(1, 2)
+        trigger = self.sched.layout.pipelines['gate'].trigger
+        a = self.sched.triggers['gerrit'].getChange(1, 2)
         mgr = self.sched.layout.pipelines['gate'].manager
-        self.assertFalse(
-            self.sched.trigger.canMerge(a, mgr.getSubmitAllowNeeds()))
+        self.assertFalse(trigger.canMerge(a, mgr.getSubmitAllowNeeds()))
 
         A.addApproval('CRVW', 2)
-        a = self.sched.trigger.getChange(1, 2, refresh=True)
-        self.assertFalse(
-            self.sched.trigger.canMerge(a, mgr.getSubmitAllowNeeds()))
+        a = trigger.getChange(1, 2, refresh=True)
+        self.assertFalse(trigger.canMerge(a, mgr.getSubmitAllowNeeds()))
 
         A.addApproval('APRV', 1)
-        a = self.sched.trigger.getChange(1, 2, refresh=True)
-        self.assertTrue(
-            self.sched.trigger.canMerge(a, mgr.getSubmitAllowNeeds()))
-        self.sched.trigger.maintainCache([])
+        a = trigger.getChange(1, 2, refresh=True)
+        self.assertTrue(trigger.canMerge(a, mgr.getSubmitAllowNeeds()))
+        trigger.maintainCache([])
 
     def test_build_configuration(self):
         "Test that zuul merges the right commits for testing"
@@ -2347,6 +2345,7 @@ class TestScheduler(testtools.TestCase):
     def test_test_config(self):
         "Test that we can test the config"
         sched = zuul.scheduler.Scheduler()
+        sched.registerTrigger(None, 'gerrit')
         sched.testConfig(CONFIG.get('zuul', 'layout_config'))
 
     def test_build_description(self):
diff --git a/zuul/cmd/server.py b/zuul/cmd/server.py
index 9b4cc48ed4..571e2823ac 100755
--- a/zuul/cmd/server.py
+++ b/zuul/cmd/server.py
@@ -105,6 +105,7 @@ class Server(object):
 
         logging.basicConfig(level=logging.DEBUG)
         self.sched = zuul.scheduler.Scheduler()
+        self.sched.registerTrigger(None, 'gerrit')
         layout = self.sched.testConfig(self.config.get('zuul',
                                                        'layout_config'))
         if not job_list_path:
@@ -165,7 +166,7 @@ class Server(object):
         webapp = zuul.webapp.WebApp(self.sched)
 
         self.sched.setLauncher(gearman)
-        self.sched.setTrigger(gerrit)
+        self.sched.registerTrigger(gerrit)
 
         self.sched.start()
         self.sched.reconfigure(self.config)
diff --git a/zuul/layoutvalidator.py b/zuul/layoutvalidator.py
index 7caf0794aa..250fbd42cb 100644
--- a/zuul/layoutvalidator.py
+++ b/zuul/layoutvalidator.py
@@ -35,18 +35,21 @@ class LayoutSchema(object):
 
     variable_dict = v.Schema({}, extra=True)
 
-    trigger = {v.Required('event'): toList(v.Any('patchset-created',
-                                                 'change-abandoned',
-                                                 'change-restored',
-                                                 'change-merged',
-                                                 'comment-added',
-                                                 'ref-updated')),
-               'comment_filter': toList(str),
-               'email_filter': toList(str),
-               'branch': toList(str),
-               'ref': toList(str),
-               'approval': toList(variable_dict),
-               }
+    gerrit_trigger = {v.Required('event'):
+                      toList(v.Any('patchset-created',
+                                   'change-abandoned',
+                                   'change-restored',
+                                   'change-merged',
+                                   'comment-added',
+                                   'ref-updated')),
+                      'comment_filter': toList(str),
+                      'email_filter': toList(str),
+                      'branch': toList(str),
+                      'ref': toList(str),
+                      'approval': toList(variable_dict),
+                      }
+
+    trigger = v.Required(v.Any({'gerrit': toList(gerrit_trigger)}))
 
     pipeline = {v.Required('name'): str,
                 v.Required('manager'): manager,
@@ -56,7 +59,7 @@ class LayoutSchema(object):
                 'failure-message': str,
                 'dequeue-on-new-patchset': bool,
                 'dequeue-on-conflict': bool,
-                'trigger': toList(trigger),
+                'trigger': trigger,
                 'success': variable_dict,
                 'failure': variable_dict,
                 'start': variable_dict,
diff --git a/zuul/model.py b/zuul/model.py
index d48fd718c7..c45bfd5ac7 100644
--- a/zuul/model.py
+++ b/zuul/model.py
@@ -47,6 +47,7 @@ class Pipeline(object):
         self.manager = None
         self.queues = []
         self.precedence = PRECEDENCE_NORMAL
+        self.trigger = None
 
     def __repr__(self):
         return '<Pipeline %s>' % self.name
@@ -724,6 +725,7 @@ class TriggerEvent(object):
         # common
         self.type = None
         self.project_name = None
+        self.trigger_name = None
         # Representation of the user account that performed the event.
         self.account = None
         # patchset-created, comment-added, etc.
diff --git a/zuul/scheduler.py b/zuul/scheduler.py
index 3e346e2138..f486bed52f 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
@@ -74,7 +74,7 @@ class Scheduler(threading.Thread):
         self._exit = False
         self._stopped = False
         self.launcher = None
-        self.trigger = None
+        self.triggers = dict()
         self.config = None
         self._maintain_trigger_cache = False
 
@@ -141,20 +141,24 @@ class Scheduler(threading.Thread):
             manager.success_action = conf_pipeline.get('success')
             manager.failure_action = conf_pipeline.get('failure')
             manager.start_action = conf_pipeline.get('start')
-            for trigger in toList(conf_pipeline['trigger']):
-                approvals = {}
-                for approval_dict in toList(trigger.get('approval')):
-                    for k, v in approval_dict.items():
-                        approvals[k] = v
-                f = EventFilter(types=toList(trigger['event']),
-                                branches=toList(trigger.get('branch')),
-                                refs=toList(trigger.get('ref')),
-                                approvals=approvals,
-                                comment_filters=
-                                toList(trigger.get('comment_filter')),
-                                email_filters=
-                                toList(trigger.get('email_filter')))
-                manager.event_filters.append(f)
+            # TODO: move this into triggers (may require pluggable
+            # configuration)
+            if 'gerrit' in conf_pipeline['trigger']:
+                pipeline.trigger = self.triggers['gerrit']
+                for trigger in toList(conf_pipeline['trigger']['gerrit']):
+                    approvals = {}
+                    for approval_dict in toList(trigger.get('approval')):
+                        for k, v in approval_dict.items():
+                            approvals[k] = v
+                    f = EventFilter(types=toList(trigger['event']),
+                                    branches=toList(trigger.get('branch')),
+                                    refs=toList(trigger.get('ref')),
+                                    approvals=approvals,
+                                    comment_filters=
+                                    toList(trigger.get('comment_filter')),
+                                    email_filters=
+                                    toList(trigger.get('email_filter')))
+                    manager.event_filters.append(f)
 
         for project_template in data.get('project-templates', []):
             # Make sure the template only contains valid pipelines
@@ -272,17 +276,23 @@ class Scheduler(threading.Thread):
         else:
             sshkey = None
 
-        self.merger = merger.Merger(self.trigger, merge_root, push_refs,
+        # TODO: The merger should have an upstream repo independent of
+        # triggers, and then each trigger should provide a fetch
+        # location.
+        self.merger = merger.Merger(self.triggers['gerrit'],
+                                    merge_root, push_refs,
                                     sshkey, merge_email, merge_name)
         for project in self.layout.projects.values():
-            url = self.trigger.getGitUrl(project)
+            url = self.triggers['gerrit'].getGitUrl(project)
             self.merger.addProject(project, url)
 
     def setLauncher(self, launcher):
         self.launcher = launcher
 
-    def setTrigger(self, trigger):
-        self.trigger = trigger
+    def registerTrigger(self, trigger, name=None):
+        if name is None:
+            name = trigger.name
+        self.triggers[name] = trigger
 
     def getProject(self, name):
         self.layout_lock.acquire()
@@ -518,7 +528,8 @@ class Scheduler(threading.Thread):
                 relevant.add(item.change)
                 relevant.update(item.change.getRelatedChanges())
         self.log.debug("Trigger cache size: %s" % len(relevant))
-        self.trigger.maintainCache(relevant)
+        for trigger in self.triggers.values():
+            trigger.maintainCache(relevant)
 
     def process_event_queue(self):
         self.log.debug("Fetching trigger event")
@@ -540,7 +551,8 @@ class Scheduler(threading.Thread):
             self.merger.updateRepo(project)
 
         for pipeline in self.layout.pipelines.values():
-            change = event.getChange(project, self.trigger)
+            change = event.getChange(project,
+                                     self.triggers.get(event.trigger_name))
             if event.type == 'patchset-created':
                 pipeline.manager.removeOldVersionsOfChange(change)
             if pipeline.manager.eventMatches(event):
@@ -709,7 +721,7 @@ class BasePipelineManager(object):
             msg = "Starting %s jobs." % self.pipeline.name
             if self.sched.config.has_option('zuul', 'status_url'):
                 msg += "\n" + self.sched.config.get('zuul', 'status_url')
-            ret = self.sched.trigger.report(change, msg, self.start_action)
+            ret = self.pipeline.trigger.report(change, msg, self.start_action)
             if ret:
                 self.log.error("Reporting change start %s received: %s" %
                                (change, ret))
@@ -1025,8 +1037,8 @@ class BasePipelineManager(object):
             succeeded = self.pipeline.didAllJobsSucceed(item)
             merged = (not ret)
             if merged:
-                merged = self.sched.trigger.isMerged(item.change,
-                                                     item.change.branch)
+                merged = self.pipeline.trigger.isMerged(item.change,
+                                                        item.change.branch)
             self.log.info("Reported change %s status: all-succeeded: %s, "
                           "merged: %s" % (item.change, succeeded, merged))
             if not (succeeded and merged):
@@ -1054,7 +1066,7 @@ class BasePipelineManager(object):
         try:
             self.log.info("Reporting change %s, action: %s" %
                           (item.change, action))
-            ret = self.sched.trigger.report(item.change, report, action)
+            ret = self.pipeline.trigger.report(item.change, report, action)
             if ret:
                 self.log.error("Reporting change %s received: %s" %
                                (item.change, ret))
@@ -1307,8 +1319,8 @@ class DependentPipelineManager(BasePipelineManager):
             self.log.info("    %s" % queue)
 
     def isChangeReadyToBeEnqueued(self, change):
-        if not self.sched.trigger.canMerge(change,
-                                           self.getSubmitAllowNeeds()):
+        if not self.pipeline.trigger.canMerge(change,
+                                              self.getSubmitAllowNeeds()):
             self.log.debug("Change %s can not merge, ignoring" % change)
             return False
         return True
@@ -1320,8 +1332,8 @@ class DependentPipelineManager(BasePipelineManager):
             self.log.debug("  Changeish does not support dependencies")
             return
         for needs in change.needed_by_changes:
-            if self.sched.trigger.canMerge(needs,
-                                           self.getSubmitAllowNeeds()):
+            if self.pipeline.trigger.canMerge(needs,
+                                              self.getSubmitAllowNeeds()):
                 self.log.debug("  Change %s needs %s and is ready to merge" %
                                (needs, change))
                 to_enqueue.append(needs)
@@ -1358,8 +1370,8 @@ class DependentPipelineManager(BasePipelineManager):
         if self.isChangeAlreadyInQueue(change.needs_change):
             self.log.debug("  Needed change is already ahead in the queue")
             return True
-        if self.sched.trigger.canMerge(change.needs_change,
-                                       self.getSubmitAllowNeeds()):
+        if self.pipeline.trigger.canMerge(change.needs_change,
+                                          self.getSubmitAllowNeeds()):
             self.log.debug("  Change %s is needed" %
                            change.needs_change)
             return change.needs_change
diff --git a/zuul/trigger/gerrit.py b/zuul/trigger/gerrit.py
index 16b80c4e53..923b319776 100644
--- a/zuul/trigger/gerrit.py
+++ b/zuul/trigger/gerrit.py
@@ -25,11 +25,12 @@ class GerritEventConnector(threading.Thread):
 
     log = logging.getLogger("zuul.GerritEventConnector")
 
-    def __init__(self, gerrit, sched):
+    def __init__(self, gerrit, sched, trigger):
         super(GerritEventConnector, self).__init__()
         self.daemon = True
         self.gerrit = gerrit
         self.sched = sched
+        self.trigger = trigger
         self._stopped = False
 
     def stop(self):
@@ -42,6 +43,7 @@ class GerritEventConnector(threading.Thread):
             return
         event = TriggerEvent()
         event.type = data.get('type')
+        event.trigger_name = self.trigger.name
         change = data.get('change')
         if change:
             event.project_name = change.get('project')
@@ -85,9 +87,9 @@ class GerritEventConnector(threading.Thread):
             # Call getChange for the side effect of updating the
             # cache.  Note that this modifies Change objects outside
             # the main thread.
-            self.sched.trigger.getChange(event.change_number,
-                                         event.patch_number,
-                                         refresh=True)
+            self.trigger.getChange(event.change_number,
+                                   event.patch_number,
+                                   refresh=True)
 
         self.sched.addEvent(event)
         self.gerrit.eventDone()
@@ -103,6 +105,7 @@ class GerritEventConnector(threading.Thread):
 
 
 class Gerrit(object):
+    name = 'gerrit'
     log = logging.getLogger("zuul.Gerrit")
     replication_timeout = 60
     replication_retry_interval = 5
@@ -128,7 +131,7 @@ class Gerrit(object):
         self.gerrit = gerrit.Gerrit(self.server, user, port, sshkey)
         self.gerrit.startWatching()
         self.gerrit_connector = GerritEventConnector(
-            self.gerrit, sched)
+            self.gerrit, sched, self)
         self.gerrit_connector.start()
 
     def stop(self):