diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml
index 726176576b..c375366011 100644
--- a/jenkins/jobs/sahara.yaml
+++ b/jenkins/jobs/sahara.yaml
@@ -203,7 +203,12 @@
           export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_REGEX="data_processing"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara"
+          if [[ "stable/kilo" =~ $ZUUL_BRANCH ]]; then
+              # Sahara was moved out of DevStack as plugin after Kilo
+              export DEVSTACK_GATE_SAHARA=1
+          else
+              export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara"
+          fi
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE