diff --git a/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml b/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml
new file mode 100644
index 0000000000..aef9f7d494
--- /dev/null
+++ b/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml
@@ -0,0 +1,37 @@
+- job:
+    name: gate-swift-devstack-vm-functional
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 120
+          fail: true
+      - timestamps
+
+    parameters:
+      - label:
+          name: NODE_LABEL
+          description: Label of node to use for this build
+          default: devstack-precise
+
+    builders:
+      - devstack-inprogress
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+
+          function post_test_hook {
+              cd /opt/stack/swift
+              bash .functests
+          }
+          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
+      - link-logs
+
+    publishers:
+      - console-log
+      - devstack-complete
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 784f1ff827..5478eb21b4 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -85,6 +85,9 @@ jobs:
     branch: ^(?!stable/(folsom|grizzly)).*$
   - name: tempest-docs
     branch: ^(?!stable/(folsom|grizzly)).*$
+  - name: gate-swift-devstack-vm-functional
+    voting: false
+    branch: ^(?!stable/(folsom|grizzly)).*$
   - name: gate-nova-pylint
     voting: false
   - name: gate-cinder-pylint
@@ -649,6 +652,7 @@ projects:
       - gate-swift-docs
       - gate-swift-python26
       - gate-swift-python27
+      - gate-swift-devstack-vm-functional
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
       - gate-tempest-devstack-vm-cinder