diff --git a/tests/integration/targets/cics_cmci/playbooks/cics_cmci_module_defaults_cmci.yml b/tests/integration/targets/cics_cmci/playbooks/cics_cmci_module_defaults_cmci.yml
index dd3a3a48..48128a7d 100644
--- a/tests/integration/targets/cics_cmci/playbooks/cics_cmci_module_defaults_cmci.yml
+++ b/tests/integration/targets/cics_cmci/playbooks/cics_cmci_module_defaults_cmci.yml
@@ -227,8 +227,8 @@
         resources:
           filter:
             PROGRAM: "{{ program }}"
-      retries: 3 # May take a while to install, so give it a chance!
-      until: result is not failed
+      retries: 5 # May take a while to install, so give it a chance!
+      until: result.cpsm_response != "NODATA"
       register: result
       failed_when: false
 
diff --git a/tests/integration/targets/cics_cmci/playbooks/cics_cmci_module_defaults_cmci_group.yml b/tests/integration/targets/cics_cmci/playbooks/cics_cmci_module_defaults_cmci_group.yml
index d626941a..0e5c1292 100644
--- a/tests/integration/targets/cics_cmci/playbooks/cics_cmci_module_defaults_cmci_group.yml
+++ b/tests/integration/targets/cics_cmci/playbooks/cics_cmci_module_defaults_cmci_group.yml
@@ -227,8 +227,8 @@
         resources:
           filter:
             PROGRAM: "{{ program }}"
-      retries: 3 # May take a while to install, so give it a chance!
-      until: result is not failed
+      retries: 5 # May take a while to install, so give it a chance!
+      until: result.cpsm_response != "NODATA"
       register: result
       failed_when: false