diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 4c5f943140..a563bc16f6 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -7434,6 +7434,7 @@
 
     jobs:
       - python-jobs
+      - pypi-jobs
 
 - project:
     name: python-watcherclient
@@ -8788,6 +8789,12 @@
 
     jobs:
       - python-jobs
+      - pypi-jobs
+      - '{pipeline}-vitrage-dsvm{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          job-suffix: '-nv'
+          branch-override: default
 
 - project:
     name: vitrage-dashboard
@@ -8795,6 +8802,7 @@
 
     jobs:
       - python-jobs
+      - pypi-jobs
 
 - project:
     name: vitrage-specs
diff --git a/jenkins/jobs/vitrage.yaml b/jenkins/jobs/vitrage.yaml
new file mode 100644
index 0000000000..7341af0841
--- /dev/null
+++ b/jenkins/jobs/vitrage.yaml
@@ -0,0 +1,48 @@
+- job-template:
+    name: '{pipeline}-vitrage-dsvm{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export PROJECTS="openstack/python-vitrageclient $PROJECTS"
+          export PROJECTS="openstack/vitrage $PROJECTS"
+          export PROJECTS="openstack/vitrage-dashboard $PROJECTS"
+          export ENABLED_SERVICES=tempest
+
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin vitrage git://git.openstack.org/openstack/vitrage"
+
+          function pre_test_hook {{
+              cd $BASE/new/vitrage/devstack
+              ./pre_test_hook.sh
+          }}
+          export -f pre_test_hook
+
+          function gate_hook {{
+              cd $BASE/new/vitrage/devstack
+              ./gate_hook.sh
+          }}
+          export -f gate_hook
+
+          function post_test_hook {{
+              cd $BASE/new/vitrage/devstack
+              ./post_test_hook.sh
+          }}
+          export -f post_test_hook
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - test-results
+      - devstack-logs
+      - console-log
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0472677d3b..d1409924ea 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -10249,6 +10249,9 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
+      - name: check-requirements
+      - name: publish-to-pypi
 
   - name: openstack/python-watcherclient
     template:
@@ -11686,11 +11689,19 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
+      - name: check-requirements
+      - name: publish-to-pypi
+    experimental:
+      - gate-vitrage-dsvm-nv
 
   - name: openstack/vitrage-dashboard
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
+      - name: check-requirements
+      - name: publish-to-pypi
 
   - name: openstack/vitrage-specs
     template: