diff --git a/roles/validate-ha/tasks/main.yml b/roles/validate-ha/tasks/main.yml
index 1630e01..56cc63e 100644
--- a/roles/validate-ha/tasks/main.yml
+++ b/roles/validate-ha/tasks/main.yml
@@ -51,6 +51,7 @@
   rescue:
     - name: copy stderr test result to undercloud and check command
       copy: content="{{ test_ha_failed_actions_cmd.stderr }}" dest="{{ validate_ha_logs_dir }}/test_ha_failed_actions_stderr.log"
+    - fail: msg="{{ test_ha_failed_actions_cmd.stderr }}"
   when: test_ha_failed_actions|bool
 
 # Test: Master/Slave
@@ -66,6 +67,7 @@
   rescue:
     - name: copy stderr test result to undercloud and check command
       copy: content="{{ test_ha_master_slave_cmd.stderr }}" dest="{{ validate_ha_logs_dir }}/test_ha_master_slave_stderr.log"
+    - fail: msg="{{ test_ha_master_slave_cmd.stderr }}"
   when: test_ha_master_slave|bool
 
 # Test: Keystone stop
@@ -81,6 +83,7 @@
   rescue:
     - name: copy stderr test result to undercloud and check command
       copy: content="{{ test_ha_keystone_stop_cmd.stderr }}" dest="{{ validate_ha_logs_dir }}/test_ha_keystone_stop_stderr.log"
+    - fail: msg="{{ test_ha_keystone_stop_cmd.stderr }}"
   when: test_ha_keystone_stop|bool
 
 # Test: Keystone removal
@@ -96,6 +99,7 @@
   rescue:
     - name: copy stderr test result to undercloud and check command
       copy: content="{{ test_ha_keystone_constraint_removal_cmd.stderr }}" dest="{{ validate_ha_logs_dir }}/test_ha_keystone_constraint_removal_stderr.log"
+    - fail: msg="{{ test_ha_keystone_constraint_removal_cmd.stderr }}"
   when: test_ha_keystone_constraint_removal|bool
 
 # Test: NG A
@@ -111,6 +115,7 @@
   rescue:
     - name: copy stderr test result to undercloud and check command
       copy: content="{{ test_ha_ng_a_cmd.stderr }}" dest="{{ validate_ha_logs_dir }}/test_ha_ng_a_stderr.log"
+    - fail: msg="{{ test_ha_ng_a_cmd.stderr }}"
   when: test_ha_ng_a|bool
 
 # Test: NG B
@@ -126,6 +131,7 @@
   rescue:
     - name: copy stderr test result to undercloud and check command
       copy: content="{{ test_ha_ng_b_cmd.stderr }}" dest="{{ validate_ha_logs_dir }}/test_ha_ng_b_stderr.log"
+    - fail: msg="{{ test_ha_ng_b_cmd.stderr }}"
   when: test_ha_ng_b|bool
 
 # Test: NG C
@@ -141,6 +147,7 @@
   rescue:
     - name: copy stderr test result to undercloud and check command
       copy: content="{{ test_ha_ng_c_cmd.stderr }}" dest="{{ validate_ha_logs_dir }}/test_ha_ng_c_stderr.log"
+    - fail: msg="{{ test_ha_ng_c_cmd.stderr }}"
   when: test_ha_ng_c|bool
 
 # Test: Instance deployment
@@ -155,4 +162,5 @@
   rescue:
     - name: copy stderr test result to undercloud and check command
       copy: content="{{ test_ha_instance_cmd.stderr }}" dest="{{ validate_ha_logs_dir }}/test_ha_instance_stderr.log"
+    - fail: msg="{{ test_ha_instance_cmd.stderr }}"
   when: test_ha_instance|bool
diff --git a/tools/ha-test-suite/include/functions b/tools/ha-test-suite/include/functions
index b03c0fa..765a0e3 100755
--- a/tools/ha-test-suite/include/functions
+++ b/tools/ha-test-suite/include/functions
@@ -137,7 +137,7 @@ function play_on_resources {
   do
    echo -n "$(date) - Performing action $action on resource $resource "
    # Do the action on the resource
-   sudo pcs resource $action $resource --wait $RESOURCE_CHANGE_STATUS_TIMEOUT
+   sudo pcs resource $action $resource --wait=$RESOURCE_CHANGE_STATUS_TIMEOUT
    if [ $? -ne 0 ]
     then
      echo "FAILURE!"