diff --git a/tests/cert/test_cert_host.yml b/tests/cert/test_cert_host.yml
index 89b4203e..7e5b4d60 100644
--- a/tests/cert/test_cert_host.yml
+++ b/tests/cert/test_cert_host.yml
@@ -194,7 +194,7 @@
       profile: invalid_profile
       state: requested
     register: result
-    failed_when: not (result.failed and "Request failed with status 400" in result.msg)
+    failed_when: not (result.failed and ("Request failed with status 400" in result.msg or "Profile not found" in result.msg))
 
 
   # CLEANUP TEST ITEMS
diff --git a/tests/cert/test_cert_service.yml b/tests/cert/test_cert_service.yml
index ce8365fa..906acd64 100644
--- a/tests/cert/test_cert_service.yml
+++ b/tests/cert/test_cert_service.yml
@@ -207,7 +207,7 @@
       profile: invalid_profile
       state: requested
     register: result
-    failed_when: not (result.failed and "Request failed with status 400" in result.msg)
+    failed_when: not (result.failed and ("Request failed with status 400" in result.msg or "Profile not found" in result.msg))
 
   # CLEANUP TEST ITEMS
 
diff --git a/tests/cert/test_cert_user.yml b/tests/cert/test_cert_user.yml
index cf6a1686..799f644f 100644
--- a/tests/cert/test_cert_user.yml
+++ b/tests/cert/test_cert_user.yml
@@ -194,7 +194,7 @@
       profile: invalid_profile
       state: requested
     register: result
-    failed_when: not (result.failed and "Request failed with status 400" in result.msg)
+    failed_when: not (result.failed and ("Request failed with status 400" in result.msg or "Profile not found" in result.msg))
 
   # CLEANUP TEST ITEMS