diff --git a/.zuul.yaml b/.zuul.yaml
index 552b079..0ce9216 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,13 +8,6 @@
       jobs:
         - vitrage-tempest-plugin-api
         - vitrage-tempest-plugin-datasources
-        - vitrage-tempest-plugin-datasources-zed
-        - vitrage-tempest-plugin-api-zed
-        - vitrage-tempest-plugin-datasources-yoga
-        - vitrage-tempest-plugin-api-yoga
-        - vitrage-tempest-plugin-datasources-xena:
-            voting: false
-        - vitrage-tempest-plugin-api-xena
     gate:
       jobs:
         - vitrage-tempest-plugin-api
@@ -81,10 +74,13 @@
       tempest_plugins:
         - vitrage-tempest-plugin
       devstack_localrc:
+        GLOBAL_VENV: False
+        VITRAGE_COORDINATION_URL: memcached://127.0.0.1:11211
         VITRAGE_USE_STATIC: 1
         VITRAGE_USE_DOCTOR: 1
         VITRAGE_USE_PROMETHEUS: 1
       devstack_services:
+        etcd3: false
         s-account: false
         s-container: false
         s-object: false
@@ -263,7 +259,4 @@
     name: vitrage-tempest-plugin-datasources-xena
     parent: vitrage-tempest-plugin-datasources
     nodeset: openstack-single-node-focal
-    override-checkout: stable/xena
-
-
-
+    override-checkout: stable/xena
\ No newline at end of file
diff --git a/vitrage_tempest_plugin/tests/api/services/test_service.py b/vitrage_tempest_plugin/tests/api/services/test_service.py
index 6263259..2c6968f 100644
--- a/vitrage_tempest_plugin/tests/api/services/test_service.py
+++ b/vitrage_tempest_plugin/tests/api/services/test_service.py
@@ -39,7 +39,7 @@ class ServiceTest(BaseVitrageTempest):
         self.check_different_process_ids_for(services)
 
     def check_all_equal(self, services, expected_svc_names):
-        names = {service['name'].split(' ')[0] for service in services}
+        names = {service['name'].split('_')[0] for service in services}
         self.assert_set_equal(expected_svc_names, names)
 
     def check_all_hosted(self, services, hostname):