diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
index 84745ec393..697ddfe137 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
@@ -1,5 +1,5 @@
 - job:
-    name: gate-manila-devstack-dsvm
+    name: gate-manila-tempest-dsvm-neutron
     node: devstack-precise
 
     wrappers:
@@ -14,19 +14,39 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=60
-          export ENABLED_SERVICES=manila,m-api,m-shr,m-sch
+          export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest
           export PROJECTS="stackforge/manila $PROJECTS"
           export PROJECTS="stackforge/python-manilaclient $PROJECTS"
+          export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export TEMPEST_CONCURRENCY=1
+          export KEEP_LOCALRC=1
+          echo "API_RATE_LIMIT=False" >> localrc
+          echo "SHARE_BACKING_FILE_SIZE=12G" >> localrc
+          echo "VOLUME_BACKING_FILE_SIZE=12G" >> localrc
 
           function pre_test_hook {
-              # Install Manila devstack integration
-              MANILA_BASE=/opt/stack/new/manila/contrib/devstack
-              DEVSTACK_BASE=/opt/stack/new/devstack
-              cp ${MANILA_BASE}/lib/* ${DEVSTACK_BASE}/lib
-              cp ${MANILA_BASE}/extras.d/* ${DEVSTACK_BASE}/extras.d
+              # Install manila devstack integration
+              cp -r $BASE/new/manila/contrib/devstack/* $BASE/new/devstack
+              # Install manila tempest integration
+              cp -r $BASE/new/manila/contrib/tempest/tempest/* $BASE/new/tempest/tempest
+              tests_pathes='tempest.cli.*manila*'
+              if [[ ! "$ZUUL_PROJECT" =~ "*python-manilaclient*" ]]; then
+                tests_pathes+=' tempest.api.share*';
+              fi
           }
           export -f pre_test_hook
 
+          function post_test_hook {
+              # let us control if we die or not
+              set +o errexit
+              cd $BASE/new/tempest
+              sudo chown -R tempest:stack $BASE/new/tempest
+              echo "Running tempest manila test suites"
+              sudo -H -u tempest tox -evenv bash tools/pretty_tox.sh \"$tests_pathes\" -- --concurrency=$TEMPEST_CONCURRENCY
+          }
+          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
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 469b2cf553..d025e9e042 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -557,7 +557,7 @@ jobs:
     voting: false
   - name: gate-rubick-python33
     voting: false
-  - name: gate-manila-devstack-dsvm
+  - name: gate-manila-tempest-dsvm-neutron
     voting: false
   - name: gate-climate-devstack-dsvm
     voting: false
@@ -3565,12 +3565,12 @@ projects:
       - gate-manila-pep8
       - gate-manila-python26
       - gate-manila-python27
-      - gate-manila-devstack-dsvm
+      - gate-manila-tempest-dsvm-neutron
     gate:
       - gate-manila-pep8
       - gate-manila-python26
       - gate-manila-python27
-      - gate-manila-devstack-dsvm
+      - gate-manila-tempest-dsvm-neutron
     post:
       - manila-branch-tarball
       - manila-coverage
@@ -4286,10 +4286,12 @@ projects:
       - gate-python-manilaclient-pep8
       - gate-python-manilaclient-python26
       - gate-python-manilaclient-python27
+      - gate-manila-tempest-dsvm-neutron
     gate:
       - gate-python-manilaclient-pep8
       - gate-python-manilaclient-python26
       - gate-python-manilaclient-python27
+      - gate-manila-tempest-dsvm-neutron
     post:
       - python-manilaclient-branch-tarball
       - python-manilaclient-coverage