diff --git a/.zuul.yaml b/.zuul.yaml
index 07fb12358b..4745579bc8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -128,6 +128,7 @@
           IMAGE_URLS: http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-uec.tar.gz, http://download.cirros-cloud.net/0.6.1/cirros-0.6.1-x86_64-uec.tar.gz
       devstack_services:
         neutron-trunk: true
+        openstack-cli-server: true
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG:
@@ -198,6 +199,7 @@
         s-container: false
         s-object: false
         s-proxy: false
+        openstack-cli-server: true
       devstack_local_conf:
         post-config:
           "/$NEUTRON_CORE_PLUGIN_CONF":
@@ -263,6 +265,8 @@
       tempest_exclude_regex: (test_live_migration_with_trunk)
       devstack_localrc:
         <<: *uec_image_vars
+      devstack_services:
+        openstack-cli-server: true
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG:
@@ -328,6 +332,7 @@
       devstack_services:
         # Disable non-essential services that we don't need for this job.
         c-bak: false
+        openstack-cli-server: true
 
 - job:
     name: nova-emulation
@@ -368,6 +373,8 @@
         DOWNLOAD_DEFAULT_IMAGES: False
         IMAGE_URLS: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-aarch64-disk.img"
         DEFAULT_INSTANCE_TYPE: m1.micro
+      devstack_services:
+        openstack-cli-server: true
     pre-run:
       - playbooks/nova-emulation/pre.yaml
 
@@ -530,6 +537,7 @@
         neutron-qos: true
         # Disable non-essential services that we don't need for this job.
         c-bak: false
+        openstack-cli-server: true
       devstack_plugins:
         # Needed for QoS port heal allocation testing.
         neutron: https://opendev.org/openstack/neutron
@@ -647,6 +655,7 @@
       devstack_services:
         # Disable other non-essential services that we don't need for this job.
         c-bak: false
+        openstack-cli-server: true
       devstack_localrc:
         <<: *uec_image_vars
         # Setup two non-cell0 cells (cell1 and cell2).
@@ -729,6 +738,7 @@
         s-container: false
         s-object: false
         s-proxy: false
+        openstack-cli-server: true
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG:
@@ -800,6 +810,8 @@
       - openstack/neutron
       - openstack/neutron-lib
     vars:
+      devstack_services:
+        openstack-cli-server: true
       devstack_localrc:
         <<: *uec_image_vars
         # Enabeling the scope and new defaults for services implemented it.
@@ -819,6 +831,8 @@
     description: |
       This job runs the Tempest tests with Nova RBAC old defaults
     vars:
+      devstack_services:
+        openstack-cli-server: true
       devstack_localrc:
         <<: *uec_image_vars
         NOVA_ENFORCE_SCOPE: false