diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml
new file mode 100644
index 0000000..7fa0ff4
--- /dev/null
+++ b/jjb/integration/integration-csit.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+    name: integration-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'integration'
+    stream: 'master'
+    functionality:
+      - 'functionality1':
+          trigger_jobs:
+    robot-options: ''
+    branch: 'master'
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
new file mode 100644
index 0000000..c3f0542
--- /dev/null
+++ b/jjb/integration/integration-macros.yaml
@@ -0,0 +1,48 @@
+---
+- parameter:
+    name: integration-test-plan
+    parameters:
+      - string:
+          name: TESTPLAN
+          default: '{test-plan}'
+          description: 'General test plan we will run unless stream-specific one is found'
+
+- parameter:
+    name: integration-test-options
+    parameters:
+      - string:
+          name: TESTOPTIONS
+          default: '{test-options}'
+          description: 'Robot command options'
+
+- builder:
+    name: integration-install-robotframework
+    builders:
+      - shell:
+          !include-raw:
+          - include-raw-integration-install-robotframework.sh
+
+- builder:
+    name: integration-run-test
+    builders:
+      - shell: "${WORKSPACE}/test/csit/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}"
+
+- builder:
+    name: integration-autorelease-fix-relativepaths
+    builders:
+      - shell: "${WORKSPACE}/autorelease/scripts/fix-relativepaths.sh"
+
+- builder:
+    name: integration-autorelease-set-version
+    builders:
+      - shell: "${WORKSPACE}/autorelease/scripts/set-version.sh"
+
+- publisher:
+    name: integration-robot
+    publishers:
+      - robot:
+          output-path: 'archives'
+          other-files: ''
+          unstable-threshold: '{unstable-if}'
+          pass-threshold: '{pass-if}'
+          only-critical: false
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
new file mode 100644
index 0000000..f12bcfb
--- /dev/null
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -0,0 +1,111 @@
+---
+- job-template:
+    name: '{project-name}-{stream}-verify-csit-{functionality}'
+    disabled: false
+
+    project-type: freestyle
+    build-node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
+
+    properties:
+      - lf-infra-properties:
+          project: '{project-name}'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project-name}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-test-plan:
+          test-plan: 'plans/{project-name}/{functionality}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: 'integration'
+          branch: '{branch}'
+          files: 'test/csit/**/{project-name}/**'
+
+    builders:
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-test
+
+    publishers:
+      - integration-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - lf-infra-publish
+
+- job-template:
+    name: '{project-name}-{stream}-csit-{functionality}'
+    disabled: false
+
+    project-type: freestyle
+    build-node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
+
+    properties:
+      - lf-infra-properties:
+          project: '{project-name}'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project-name}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-test-plan:
+          test-plan: 'plans/{project-name}/{functionality}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          server: '{server-name}'
+          project: 'integration'
+          branch: '{branch}'
+          files: 'test/csit/**/{project-name}/**'
+      - timed: '@daily'
+      - reverse:
+          jobs: '{obj:trigger_jobs}'
+
+    builders:
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-test
+
+    publishers:
+      - integration-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - lf-infra-publish