diff --git a/jenkins/jobs/barbican.yaml b/jenkins/jobs/barbican.yaml
index d064987752..cb9b015e44 100644
--- a/jenkins/jobs/barbican.yaml
+++ b/jenkins/jobs/barbican.yaml
@@ -41,3 +41,42 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job-template:
+    name: 'gate-python-barbicanclient-devstack-dsvm-{node}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 70
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export ENABLED_SERVICES=barbican,tempest,keystone
+          export PROJECTS="openstack/barbican $PROJECTS"
+          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
+          export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
+
+          function gate_hook {{
+              $BASE/new/barbican/devstack/gate_hook.sh
+          }}
+          export -f gate_hook
+
+          function post_test_hook {{
+              cd /opt/stack/new/python-barbicanclient/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
diff --git a/jenkins/jobs/python-barbicanclient.yaml b/jenkins/jobs/python-barbicanclient.yaml
deleted file mode 100644
index 5fec5a73f8..0000000000
--- a/jenkins/jobs/python-barbicanclient.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-- job-template:
-    name: 'gate-python-barbicanclient-devstack-dsvm-{node}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 70
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export ENABLED_SERVICES=barbican,tempest,keystone
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
-
-          function gate_hook {{
-              $BASE/new/barbican/devstack/gate_hook.sh
-          }}
-          export -f gate_hook
-
-          function post_test_hook {{
-              cd /opt/stack/new/python-barbicanclient/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