diff --git a/tests/cert/test_cert_host.yml b/tests/cert/test_cert_host.yml
index a40850eb..89b4203e 100644
--- a/tests/cert/test_cert_host.yml
+++ b/tests/cert/test_cert_host.yml
@@ -124,7 +124,7 @@
       reason: 9
       state: revoked
     register: result
-    failed_when: not (result.failed and ("Request failed with status 404" in result.msg or "Certificate serial number 0x123456789 not found" in result.msg))
+    failed_when: not (result.failed and ("Request failed with status 404" in result.msg or result.msg is regex("Certificate [^0]*0x123456789 not found")))
 
   - name: Try to release revoked certificate
     ipacert:
diff --git a/tests/cert/test_cert_service.yml b/tests/cert/test_cert_service.yml
index 2089fc3d..ce8365fa 100644
--- a/tests/cert/test_cert_service.yml
+++ b/tests/cert/test_cert_service.yml
@@ -136,7 +136,7 @@
       reason: 9
       state: revoked
     register: result
-    failed_when: not (result.failed and ("Request failed with status 404" in result.msg or "Certificate serial number 0x123456789 not found" in result.msg))
+    failed_when: not (result.failed and ("Request failed with status 404" in result.msg or result.msg is regex("Certificate [^0]*0x123456789 not found")))
 
   - name: Try to release revoked certificate
     ipacert:
diff --git a/tests/cert/test_cert_user.yml b/tests/cert/test_cert_user.yml
index 4a85b459..cf6a1686 100644
--- a/tests/cert/test_cert_user.yml
+++ b/tests/cert/test_cert_user.yml
@@ -123,7 +123,7 @@
       reason: 9
       state: revoked
     register: result
-    failed_when: not (result.failed and ("Request failed with status 404" in result.msg or "Certificate serial number 0x123456789 not found" in result.msg))
+    failed_when: not (result.failed and ("Request failed with status 404" in result.msg or result.msg is regex("Certificate [^0]*0x123456789 not found")))
 
   - name: Try to release revoked certificate
     ipacert: