diff --git a/tcp_tests/templates/shared-openstack.yaml b/tcp_tests/templates/shared-openstack.yaml
index c10ad43..dfa65e4 100644
--- a/tcp_tests/templates/shared-openstack.yaml
+++ b/tcp_tests/templates/shared-openstack.yaml
@@ -63,7 +63,8 @@
 
 - description: Check keystone service-list
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@keystone:server' cmd.run '. /root/keystonercv3; openstack service list'
+    -C "I@keystone:server" cmd.run ". /root/keystonercv3;
+    openstack service list"
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
@@ -100,7 +101,8 @@
 
 - description: Check glance image-list
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@keystone:server' cmd.run '. /root/keystonerc; glance image-list'
+    -C "I@keystone:server" cmd.run ". /root/keystonercv3;
+    openstack image list"
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
@@ -123,15 +125,16 @@
 
 - description: Check nova service-list
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C "I@keystone:server" cmd.run ". /root/keystonercv3; nova
-    --debug service-list"
+    -C "I@keystone:server" cmd.run ". /root/keystonercv3;
+    openstack compute service list"
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
 
 - description: Check nova list
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C "I@keystone:server" cmd.run ". /root/keystonercv3; nova --debug list"
+    -C "I@keystone:server" cmd.run ". /root/keystonercv3;
+    openstack server list"
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
@@ -154,7 +157,8 @@
 
 - description: Check cinder list
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@keystone:server' cmd.run '. /root/keystonerc; cinder list'
+    -C "I@keystone:server" cmd.run ". /root/keystonercv3;
+    openstack volume list"
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
@@ -220,7 +224,8 @@
 
 - description: Check heat service
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@keystone:server' cmd.run '. /root/keystonercv3; openstack orchestration resource type list'
+    -C 'I@keystone:server' cmd.run '. /root/keystonercv3;
+    openstack orchestration resource type list'
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 5, delay: 10}
   skip_fail: false