diff --git a/tests/hostgroup/test_hostgroup_membermanager.yml b/tests/hostgroup/test_hostgroup_membermanager.yml
index 2af8445de9e54719a5ed3fe5bea146a97c68d16c..ff8adc87844dd106e0c448163f50d4d4b3198552 100644
--- a/tests/hostgroup/test_hostgroup_membermanager.yml
+++ b/tests/hostgroup/test_hostgroup_membermanager.yml
@@ -45,21 +45,21 @@
             first: manageruser2
             last: Last2
         register: result
-        failed_when: not result.changed
+        failed_when: not result.changed or result.failed
 
       - name: Ensure managergroup1 is present
         ipagroup:
           ipaadmin_password: SomeADMINpassword
           name: managergroup1
         register: result
-        failed_when: not result.changed
+        failed_when: not result.changed or result.failed
 
       - name: Ensure managergroup2 is present
         ipagroup:
           ipaadmin_password: SomeADMINpassword
           name: managergroup2
         register: result
-        failed_when: not result.changed
+        failed_when: not result.changed or result.failed
 
       - name: Ensure membermanager user1 is present for testhostgroup
         ipahostgroup:
@@ -67,7 +67,7 @@
           name: testhostgroup
           membermanager_user: manageruser1
         register: result
-        failed_when: not result.changed
+        failed_when: not result.changed or result.failed
 
       - name: Ensure membermanager user1 is present for testhostgroup again
         ipahostgroup:
@@ -75,7 +75,7 @@
           name: testhostgroup
           membermanager_user: manageruser1
         register: result
-        failed_when: result.changed
+        failed_when: result.changed or result.failed
 
       - name: Ensure membermanager group1 is present for testhostgroup
         ipahostgroup:
@@ -83,7 +83,7 @@
           name: testhostgroup
           membermanager_group: managergroup1
         register: result
-        failed_when: not result.changed
+        failed_when: not result.changed or result.failed
 
       - name: Ensure membermanager group1 is present for testhostgroup again
         ipahostgroup:
@@ -91,7 +91,7 @@
           name: testhostgroup
           membermanager_group: managergroup1
         register: result
-        failed_when: result.changed
+        failed_when: result.changed or result.failed
 
       - name: Ensure membermanager user2 and group2 members are present for testhostgroup
         ipahostgroup:
@@ -101,7 +101,7 @@
           membermanager_group: managergroup2
           action: member
         register: result
-        failed_when: not result.changed
+        failed_when: not result.changed or result.failed
 
       - name: Ensure membermanager user2 and group2 members are present for testhostgroup again
         ipahostgroup:
@@ -111,7 +111,7 @@
           membermanager_group: managergroup2
           action: member
         register: result
-        failed_when: result.changed
+        failed_when: result.changed or result.failed
 
       - name: Ensure membermanager user and group members are present for testhostgroup again
         ipahostgroup:
@@ -121,7 +121,7 @@
           membermanager_group: managergroup1,managergroup2
           action: member
         register: result
-        failed_when: result.changed
+        failed_when: result.changed or result.failed
 
       - name: Ensure membermanager user1 and group1 members are absent for testhostgroup
         ipahostgroup:
@@ -132,7 +132,7 @@
           action: member
           state: absent
         register: result
-        failed_when: not result.changed
+        failed_when: not result.changed or result.failed
 
       - name: Ensure membermanager user1 and group1 members are absent for testhostgroup again
         ipahostgroup:
@@ -143,7 +143,7 @@
           action: member
           state: absent
         register: result
-        failed_when: result.changed
+        failed_when: result.changed or result.failed
 
 
       - name: Ensure membermanager user1 and group1 members are present for testhostgroup
@@ -154,7 +154,7 @@
           membermanager_group: managergroup1
           action: member
         register: result
-        failed_when: not result.changed
+        failed_when: not result.changed or result.failed
 
       - name: Ensure membermanager user1 and group1 members are present for testhostgroup again
         ipahostgroup:
@@ -164,7 +164,7 @@
           membermanager_group: managergroup1
           action: member
         register: result
-        failed_when: result.changed
+        failed_when: result.changed or result.failed
 
       - name: Ensure membermanager user and group members are absent for testhostgroup
         ipahostgroup:
@@ -175,7 +175,7 @@
           action: member
           state: absent
         register: result
-        failed_when: not result.changed
+        failed_when: not result.changed or result.failed
 
       - name: Ensure membermanager user and group members are absent for testhostgroup again
         ipahostgroup:
@@ -186,7 +186,7 @@
           action: member
           state: absent
         register: result
-        failed_when: result.changed
+        failed_when: result.changed or result.failed
 
       - name: Ensure user manangeruser1 and manageruser2 is absent
         ipauser:
@@ -194,7 +194,7 @@
           name: manageruser1,manageruser2
           state: absent
         register: result
-        failed_when: not result.changed
+        failed_when: not result.changed or result.failed
 
       - name: Ensure group managergroup1 and managergroup2 are absent
         ipagroup:
@@ -202,8 +202,10 @@
           name: managergroup1,managergroup2
           state: absent
         register: result
-        failed_when: not result.changed
+        failed_when: not result.changed or result.failed
 
+      # Do not add failed_when result.failed, as this test needs to fail
+      # due to using an unknown user
       - name: Ensure unknown membermanager_user member failure
         ipahostgroup:
           ipaadmin_password: SomeADMINpassword
@@ -220,5 +222,5 @@
           - testhostgroup
           state: absent
         register: result
-        failed_when: not result.changed
+        failed_when: not result.changed or result.failed
     when: ipa_version is version('4.8.4', '>=')