diff --git a/modules/jenkins_jobs/manifests/generic_jobs.pp b/modules/jenkins_jobs/manifests/generic_jobs.pp
index c64932a57b..9e0b3a21ca 100644
--- a/modules/jenkins_jobs/manifests/generic_jobs.pp
+++ b/modules/jenkins_jobs/manifests/generic_jobs.pp
@@ -6,6 +6,14 @@ define jenkins_jobs::generic_jobs($site, $project, $node_group, $ensure="present
     ensure => $ensure
   }
 
+  jenkins_jobs::jobs::merge_check { $name:
+    site => $site,
+    project => $project,
+    node_group => $node_group,
+    trigger_branches => [[$project, '**']],
+    ensure => $ensure
+  }
+
   jenkins_jobs::jobs::merge_gate { $name:
     site => $site,
     project => $project,
diff --git a/modules/jenkins_jobs/manifests/jobs/merge_check.pp b/modules/jenkins_jobs/manifests/jobs/merge_check.pp
new file mode 100644
index 0000000000..b10a44ec5c
--- /dev/null
+++ b/modules/jenkins_jobs/manifests/jobs/merge_check.pp
@@ -0,0 +1,13 @@
+define jenkins_jobs::jobs::merge_check($site, $project, $node_group, $trigger_branches, $ensure="present") {
+  jenkins_jobs::build_job { "check-${name}-merge":
+    ensure => $ensure,
+    site => $site,
+    project => $project,
+    job => "merge",
+    node_group => $node_group,
+    triggers => trigger("gerrit_uploaded_merge"),
+    builders => builder("gerrit_git_prep"),
+    trigger_branches => $trigger_branches,
+    auth_build => true
+  }
+}
diff --git a/modules/jenkins_jobs/manifests/jobs/pep8_check.pp b/modules/jenkins_jobs/manifests/jobs/pep8_check.pp
new file mode 100644
index 0000000000..41b4eaa427
--- /dev/null
+++ b/modules/jenkins_jobs/manifests/jobs/pep8_check.pp
@@ -0,0 +1,14 @@
+define jenkins_jobs::jobs::pep8_check($site, $project, $node_group, $trigger_branches, $ensure="present") {
+  jenkins_jobs::build_job { "check-${name}-pep8":
+    ensure => $ensure,
+    site => $site,
+    project => $project,
+    job => "pep8",
+    node_group => $node_group,
+    triggers => trigger("gerrit_uploaded_plain"),
+    builders => [builder("gerrit_git_prep"), builder("copy_bundle"), builder("pep8")],
+    publishers => publisher("pep8"),
+    trigger_branches => $trigger_branches,
+    auth_build => true
+  }
+}
diff --git a/modules/jenkins_jobs/manifests/jobs/python26_check.pp b/modules/jenkins_jobs/manifests/jobs/python26_check.pp
new file mode 100644
index 0000000000..f7902de2bb
--- /dev/null
+++ b/modules/jenkins_jobs/manifests/jobs/python26_check.pp
@@ -0,0 +1,13 @@
+define jenkins_jobs::jobs::python26_check($site, $project, $node_group, $trigger_branches, $ensure="present") {
+  jenkins_jobs::build_job { "check-${name}-python26":
+    ensure => $ensure,
+    site => $site,
+    project => $project,
+    job => "python26",
+    node_group => $node_group,
+    triggers => trigger("gerrit_uploaded_plain"),
+    builders => [builder("gerrit_git_prep"), builder("copy_bundle"), builder("python26")],
+    trigger_branches => $trigger_branches,
+    auth_build => true
+  }
+}
diff --git a/modules/jenkins_jobs/manifests/jobs/python27_check.pp b/modules/jenkins_jobs/manifests/jobs/python27_check.pp
new file mode 100644
index 0000000000..baec9bae12
--- /dev/null
+++ b/modules/jenkins_jobs/manifests/jobs/python27_check.pp
@@ -0,0 +1,13 @@
+define jenkins_jobs::jobs::python27_check($site, $project, $node_group, $trigger_branches, $ensure="present") {
+  jenkins_jobs::build_job { "check-${name}-python27":
+    ensure => $ensure,
+    site => $site,
+    project => $project,
+    job => "python27",
+    node_group => $node_group,
+    triggers => trigger("gerrit_uploaded_plain"),
+    builders => [builder("gerrit_git_prep"), builder("copy_bundle"), builder("python27")],
+    trigger_branches => $trigger_branches,
+    auth_build => true
+  }
+}
diff --git a/modules/jenkins_jobs/manifests/python_jobs.pp b/modules/jenkins_jobs/manifests/python_jobs.pp
index 05bf39bb74..29fc130e12 100644
--- a/modules/jenkins_jobs/manifests/python_jobs.pp
+++ b/modules/jenkins_jobs/manifests/python_jobs.pp
@@ -5,6 +5,27 @@ define jenkins_jobs::python_jobs($site, $project, $node_group, $ensure="present"
     node_group => $node_group,
     ensure => $ensure
   }
+  jenkins_jobs::jobs::pep8_check { $name:
+    site => $site,
+    project => $project,
+    node_group => $node_group,
+    trigger_branches => [[$project, '**']],
+    ensure => $ensure
+  }
+  jenkins_jobs::jobs::python26_check { $name:
+    site => $site,
+    project => $project,
+    node_group => $node_group,
+    trigger_branches => [[$project, '**']],
+    ensure => $ensure
+  }
+  jenkins_jobs::jobs::python27_check { $name:
+    site => $site,
+    project => $project,
+    node_group => $node_group,
+    trigger_branches => [[$project, '**']],
+    ensure => $ensure
+  }
   jenkins_jobs::jobs::pep8_gate { $name:
     site => $site,
     project => $project,
diff --git a/modules/jenkins_jobs/templates/trigger_gerrit_uploaded_merge.xml.erb b/modules/jenkins_jobs/templates/trigger_gerrit_uploaded_merge.xml.erb
new file mode 100644
index 0000000000..62ff1ffdaa
--- /dev/null
+++ b/modules/jenkins_jobs/templates/trigger_gerrit_uploaded_merge.xml.erb
@@ -0,0 +1,28 @@
+    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
+      <spec></spec>
+      <gerritProjects>
+        <% trigger_branches.each do |trigger| %>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
+          <compareType>PLAIN</compareType>
+          <pattern><%= site %>/<%= trigger[0] %></pattern>
+          <branches>
+            <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+              <compareType>ANT</compareType>
+              <pattern><%= trigger[1] %></pattern>
+            </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+          </branches>
+        </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
+        <% end %>
+      </gerritProjects>
+      <silentMode>false</silentMode>
+      <escapeQuotes>true</escapeQuotes>
+      <triggerOnPatchsetUploadedEvent>true</triggerOnPatchsetUploadedEvent>
+      <triggerOnChangeMergedEvent>false</triggerOnChangeMergedEvent>
+      <triggerOnCommentAddedEvent>false</triggerOnCommentAddedEvent>
+      <triggerOnRefUpdatedEvent>false</triggerOnRefUpdatedEvent>
+      <buildStartMessage></buildStartMessage>
+      <buildFailureMessage>This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.</buildFailureMessage>
+      <buildSuccessfulMessage></buildSuccessfulMessage>
+      <buildUnstableMessage></buildUnstableMessage>
+      <customUrl></customUrl>
+    </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
diff --git a/modules/jenkins_jobs/templates/trigger_gerrit_uploaded_plain.xml.erb b/modules/jenkins_jobs/templates/trigger_gerrit_uploaded_plain.xml.erb
new file mode 100644
index 0000000000..fd6c8028b9
--- /dev/null
+++ b/modules/jenkins_jobs/templates/trigger_gerrit_uploaded_plain.xml.erb
@@ -0,0 +1,28 @@
+    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
+      <spec></spec>
+      <gerritProjects>
+        <% trigger_branches.each do |trigger| %>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
+          <compareType>PLAIN</compareType>
+          <pattern><%= site %>/<%= trigger[0] %></pattern>
+          <branches>
+            <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+              <compareType>ANT</compareType>
+              <pattern><%= trigger[1] %></pattern>
+            </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+          </branches>
+        </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
+        <% end %>
+      </gerritProjects>
+      <silentMode>false</silentMode>
+      <escapeQuotes>true</escapeQuotes>
+      <triggerOnPatchsetUploadedEvent>true</triggerOnPatchsetUploadedEvent>
+      <triggerOnChangeMergedEvent>false</triggerOnChangeMergedEvent>
+      <triggerOnCommentAddedEvent>false</triggerOnCommentAddedEvent>
+      <triggerOnRefUpdatedEvent>false</triggerOnRefUpdatedEvent>
+      <buildStartMessage></buildStartMessage>
+      <buildFailureMessage></buildFailureMessage>
+      <buildSuccessfulMessage></buildSuccessfulMessage>
+      <buildUnstableMessage></buildUnstableMessage>
+      <customUrl></customUrl>
+    </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>