diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml
index a38c94f9..500dca34 100644
--- a/config/zuul/layout.yaml
+++ b/config/zuul/layout.yaml
@@ -42,6 +42,7 @@ projects:
       - gate-sahara-nova-direct-hdp_1-aio
       - gate-sahara-nova-heat-hdp_2
       - gate-sahara-pep8-trunk
+      - tempest-sahara-tests
 
   - name: openstack/python-saharaclient
     check:
@@ -56,6 +57,7 @@ projects:
       - gate-saharaclient-nova-direct-hdp_1-aio
       - gate-saharaclient-nova-heat-hdp_2
       - gate-sahara-pep8-trunk
+      - tempest-saharaclient-tests
 
   - name: openstack/sahara-dashboard
     check:
@@ -107,8 +109,6 @@ jobs:
     branch: ^(master|proposed/juno|stable/icehouse)$
   - name: gate-sahara-pep8-trunk
     voting: false
-  - name: gate-saharaclient-tempest-tests
-    voting: false
   - name: ^gate-sahara-.*$
     files:
       - '^sahara/.*$'
diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml
index c48d718c..6e656425 100644
--- a/jenkins_job_builder/sahara.yaml
+++ b/jenkins_job_builder/sahara.yaml
@@ -1,14 +1,46 @@
 - job:
-    name: 'gate-saharaclient-tempest-tests'
+    name: 'tempest-saharaclient-tests'
     defaults: global
-    concurrent: true
+    concurrent: false
     builders:
       - gerrit-git-prep
       - shell: "rm -rf sahara-ci-config\
               \ngit clone https://git.openstack.org/stackforge/sahara-ci-config /tmp/sahara-ci-config\
-              \nFUNCTION_PATH=/tmp/sahara-ci-config/slave-scripts/functions.sh bash -x /tmp/sahara-ci-config/slave-scripts/gate-saharaclient.sh"
+              \nFUNCTION_PATH=/tmp/sahara-ci-config/slave-scripts/functions.sh bash -x /tmp/sahara-ci-config/slave-scripts/tempest.sh"
     properties:
       - zeromq-event
+      - build-blocker:
+          blocking-jobs:
+             - "tempest-sahara-tests"
+    wrappers:
+      - timeout:
+          timeout: 120
+          fail: true
+      - timestamps
+    publishers:
+      - console-log
+      - trigger-parameterized-builds:
+          - project: "integration-cleanup"
+            predefined-parameters:
+               "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\
+               \nPREV_JOB=$JOB_NAME\
+               \nHOST_NAME=$NODE_NAME"
+    node: precise-neutron || precise-nova
+
+- job:
+    name: 'tempest-sahara-tests'
+    defaults: global
+    concurrent: false
+    builders:
+      - gerrit-git-prep
+      - shell: "rm -rf sahara-ci-config\
+              \ngit clone https://git.openstack.org/stackforge/sahara-ci-config\
+              \nFUNCTION_PATH=sahara-ci-config/slave-scripts/functions.sh bash -x sahara-ci-config/slave-scripts/tempest.sh"
+    properties:
+      - zeromq-event
+      - build-blocker:
+          blocking-jobs:
+             - "tempest-saharaclient-tests"
     wrappers:
       - timeout:
           timeout: 120
diff --git a/slave-scripts/gate-saharaclient.sh b/slave-scripts/gate-saharaclient.sh
index 4c749cc0..5855e8fe 100644
--- a/slave-scripts/gate-saharaclient.sh
+++ b/slave-scripts/gate-saharaclient.sh
@@ -9,9 +9,4 @@ tox -e integration --notest
 # change sahara-client
 .tox/integration/bin/pip install $WORKSPACE
 
-JOB_TYPE=$(echo $JOB_NAME | awk -F '-' '{ print $3 }')
-if [ "$JOB_TYPE" != "tempest" ]; then
-   bash -x /tmp/sahara-ci-config/slave-scripts/gate-sahara.sh /tmp/sahara
-else
-   bash -x /tmp/sahara-ci-config/slave-scripts/gate-saharaclient-tempest.sh /tmp/sahara
-fi
+bash -x /tmp/sahara-ci-config/slave-scripts/gate-sahara.sh /tmp/sahara
diff --git a/slave-scripts/integration-cleanup.sh b/slave-scripts/integration-cleanup.sh
index b47f7568..c0159417 100644
--- a/slave-scripts/integration-cleanup.sh
+++ b/slave-scripts/integration-cleanup.sh
@@ -52,6 +52,8 @@ if [ $JOB_TYPE == 'dib' ]; then
     fi
 elif [[ $(echo $PREV_JOB | awk -F '-' '{ print $2 }') =~ ui ]]; then
     python cleanup.py cleanup $PREV_BUILD-selenium
+elif [ $JOB_TYPE == "tempest" ]; then
+    python cleanup.py cleanup sahara-cluster
 else
     ENGINE=$(echo $PREV_JOB | awk -F '-' '{ print $4 }')
     JOB_TYPE=$(echo $PREV_JOB | awk -F '-' '{ print $5 }')
diff --git a/slave-scripts/gate-saharaclient-tempest.sh b/slave-scripts/tempest.sh
similarity index 70%
rename from slave-scripts/gate-saharaclient-tempest.sh
rename to slave-scripts/tempest.sh
index 7cacfef5..81a60b75 100644
--- a/slave-scripts/gate-saharaclient-tempest.sh
+++ b/slave-scripts/tempest.sh
@@ -1,10 +1,23 @@
 #!/bin/bash
 
+PROJECT=$(echo $JOB_NAME | awk -F '-' '{ print $2 }')
+
+if [ "$PROJECT" == "sahara" ]; then
+   SAHARA_PATH="$WORKSPACE"
+   git clone http://github.com/openstack/python-saharaclient /tmp/saharaclient
+   cd /tmp/saharaclient
+   sudo pip install -U -r requirements.txt
+   sudo pip install .
+else
+   SAHARA_PATH=/tmp/sahara
+   git clone http://github.com/openstack/sahara $SAHARA_PATH
+   sudo pip install .
+fi
+
 . $FUNCTION_PATH
 
 check_openstack_host
 
-SAHARA_PATH=$1
 TEMPEST=True
 IMAGE_ID=$(glance image-list | grep ubuntu-test-image | awk '{print $2}')
 if $USE_NEUTRON; then
@@ -15,7 +28,7 @@ fi
 
 cd /home/jenkins
 
-cp -r $WORKSPACE/saharaclient/tests/tempest tempest/
+cp -r $SAHARA_PATH/sahara/tests/tempest tempest/
 
 cd tempest