diff --git a/jenkins/jobs/barbican.yaml b/jenkins/jobs/barbican.yaml
index 5387c6504f..113bfdc356 100644
--- a/jenkins/jobs/barbican.yaml
+++ b/jenkins/jobs/barbican.yaml
@@ -78,9 +78,9 @@
       - devstack-logs
       - console-log
 
-- job:
-    name: gate-barbican-devstack-dsvm
-    node: ubuntu-trusty
+- job-template:
+    name: 'gate-barbican-{plugin}-devstack-dsvm'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -94,59 +94,20 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export ENABLED_SERVICES=tempest,keystone
+          export ENABLED_SERVICES='{services}'
           export PROJECTS="openstack/barbican $PROJECTS"
           export PROJECTS="openstack/python-barbicanclient $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican git://git.openstack.org/openstack/barbican"
 
-          function gate_hook {
+          function gate_hook {{
               $BASE/new/barbican/devstack/gate_hook.sh
-          }
+          }}
           export -f gate_hook
 
-          function post_test_hook {
+          function post_test_hook {{
               cd /opt/stack/new/barbican/functionaltests
               ./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:
-      - devstack-logs
-      - console-log
-
-- job:
-    name: gate-barbican-dogtag-devstack-dsvm-f23
-    node: 'fedora-23'
-
-    wrappers:
-      - build-timeout:
-          timeout: 70
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export ENABLED_SERVICES=barbican-dogtag,tempest,keystone
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican git://git.openstack.org/openstack/barbican"
-
-          function gate_hook {
-              $BASE/new/barbican/devstack/gate_hook.sh
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              cd /opt/stack/new/barbican/functionaltests
-              ./post_test_hook.sh
-          }
+          }}
           export -f post_test_hook
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index a142d80e1f..05ba9978b7 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -284,6 +284,18 @@
       - translation-jobs
       - openstack-publish-jobs
       - openstack-releasenotes-jobs
+      - 'gate-barbican-{plugin}-devstack-dsvm':
+          plugin: simple-crypto
+          node: ubuntu-trusty
+          services: tempest,keystone
+      - 'gate-barbican-{plugin}-devstack-dsvm':
+          plugin: dogtag
+          node: fedora-23
+          services: barbican-dogtag,tempest,keystone
+      - 'gate-barbican-{plugin}-devstack-dsvm':
+          plugin: kmip
+          node: ubuntu-trusty
+          services: barbican-pykmip,pykmip-server,tempest,keystone
       - api-guide-jobs:
           service: key-manager
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 434eca12d3..c1640305ec 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1927,13 +1927,13 @@ jobs:
   - name: gate-barbican-python34
     branch: ^(?!stable/kilo).*$
 
-  - name: gate-barbican-devstack-dsvm
+  - name: gate-barbican-simple-crypto-devstack-dsvm
     branch: ^(?!stable/kilo).*$
 
   - name: gate-barbican-devstack-dsvm-oldstable
     branch: ^stable/kilo$
 
-  - name: gate-barbican-dogtag-devstack-dsvm-f23
+  - name: gate-barbican-dogtag-devstack-dsvm
     voting: false
     branch: ^(?!stable/kilo).*$
 
@@ -1941,6 +1941,10 @@ jobs:
     voting: false
     branch: ^stable/kilo$
 
+  - name: gate-barbican-kmip-devstack-dsvm
+    voting: false
+    branch: ^(?!stable/(?:kilo|liberty|mitaka)).*$
+
   - name: gate-designate-python34-db
     branch: ^(?!stable/(?:kilo|liberty)).*$
 
@@ -4667,13 +4671,15 @@ projects:
       - name: check-requirements
       - name: api-guide-jobs
     check:
-      - gate-barbican-devstack-dsvm
+      - gate-barbican-simple-crypto-devstack-dsvm
       - gate-barbican-devstack-dsvm-oldstable
       - barbican-coverage
-      - gate-barbican-dogtag-devstack-dsvm-f23
+      - gate-barbican-dogtag-devstack-dsvm
       - gate-barbican-dogtag-devstack-dsvm-f23-oldstable
+    experimental:
+      - gate-barbican-kmip-devstack-dsvm
     gate:
-      - gate-barbican-devstack-dsvm
+      - gate-barbican-simple-crypto-devstack-dsvm
       - gate-barbican-devstack-dsvm-oldstable
 
   - name: openstack/barbican-specs