diff --git a/tests/pwpolicy/test_pwpolicy.yml b/tests/pwpolicy/test_pwpolicy.yml
index 83f1763b2352aa49ee0f0ce6eaa72cef8b3543ad..340f64f55abdb7d3089af1e51cb6810e424e9271 100644
--- a/tests/pwpolicy/test_pwpolicy.yml
+++ b/tests/pwpolicy/test_pwpolicy.yml
@@ -176,21 +176,10 @@
       minlength: ""
     register: result
     failed_when:
-        result.changed or
         (result.failed and not
-            ("an internal error has occurred" in result.msg or
-             "int() argument must be" in result.msg))
-    when: ipa_version is version("4.9", ">=")
-
-  - name: Ensure minlength is not cleared due to FreeIPA issue
-    ipapwpolicy:
-      ipaadmin_password: SomeADMINpassword
-      ipaapi_context: "{{ ipa_context | default(omit) }}"
-      name: ops
-      minlength: ""
-    register: result
-    failed_when: not result.changed or result.failed
-    when: ipa_version is version("4.7", "<")
+         ("an internal error has occurred" in result.msg or
+          "int() argument must be" in result.msg))
+        or (not result.failed and not result.changed)
 
   - name: Execute tests if ipa_version >= 4.9.0
     when: ipa_version is version("4.9", ">=")