diff --git a/handlers/main.yml b/handlers/main.yml
index d00301e3..6353b734 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -28,7 +28,7 @@
     daemon_reload: yes
   with_items: "{{ filtered_nova_services }}"
   register: _stop
-  until: _stop  is success
+  until: _stop is success
   retries: 5
   delay: 2
   listen: "Restart nova services"
@@ -59,7 +59,7 @@
     daemon_reload: yes
   with_items: "{{ filtered_nova_services }}"
   register: _start
-  until: _start  is success
+  until: _start is success
   retries: 5
   delay: 2
   listen: "Restart nova services"
diff --git a/tasks/nova_install_apt_powervm.yml b/tasks/nova_install_apt_powervm.yml
index aaa5916a..cff7fcfd 100644
--- a/tasks/nova_install_apt_powervm.yml
+++ b/tasks/nova_install_apt_powervm.yml
@@ -47,7 +47,7 @@
     update_cache: yes
   when: add_nv_repos  is changed
   register: update_apt_cache
-  until: update_apt_cache  is success
+  until: update_apt_cache is success
   retries: 5
   delay: 2
   tags:
diff --git a/tests/test-nova-resources-upgrade.yml b/tests/test-nova-resources-upgrade.yml
index 6ccbe1e8..b0dea5fb 100644
--- a/tests/test-nova-resources-upgrade.yml
+++ b/tests/test-nova-resources-upgrade.yml
@@ -36,7 +36,7 @@
           {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
           {{ pip_install_options | default('') }}
       register: install_packages
-      until: install_packages  is success
+      until: install_packages is success
       retries: 5
       delay: 2