diff --git a/integration-test/src/test/groovy/de/gesellix/docker/client/DockerContainerIntegrationSpec.groovy b/integration-test/src/test/groovy/de/gesellix/docker/client/DockerContainerIntegrationSpec.groovy
index 8756524a..a1f6fe99 100644
--- a/integration-test/src/test/groovy/de/gesellix/docker/client/DockerContainerIntegrationSpec.groovy
+++ b/integration-test/src/test/groovy/de/gesellix/docker/client/DockerContainerIntegrationSpec.groovy
@@ -246,7 +246,7 @@ class DockerContainerIntegrationSpec extends Specification {
     then:
     ClientException ex = thrown()
     ex.statusCode == 404
-    ex.toString() =~ /.*manifest for gesellix\/testimage:unknown not found.*/
+    ex.toString() =~ /.* (docker.io\/)?gesellix\/testimage:unknown:? not found.*/
   }
 
   def expectManifestNotFound(def content) {
diff --git a/integration-test/src/test/groovy/de/gesellix/docker/client/DockerImageIntegrationSpec.groovy b/integration-test/src/test/groovy/de/gesellix/docker/client/DockerImageIntegrationSpec.groovy
index c33137c5..a80125cc 100644
--- a/integration-test/src/test/groovy/de/gesellix/docker/client/DockerImageIntegrationSpec.groovy
+++ b/integration-test/src/test/groovy/de/gesellix/docker/client/DockerImageIntegrationSpec.groovy
@@ -192,7 +192,7 @@ class DockerImageIntegrationSpec extends Specification {
 
     then:
     notThrown(Exception)
-    infos.last().error.contains(" missing/image")
+    infos.last().error.matches(".*(docker.io/)?missing/image.*")
   }
 
   def "build image with custom Dockerfile"() {
@@ -396,7 +396,7 @@ class DockerImageIntegrationSpec extends Specification {
 
     then:
     !infos.empty
-    infos.find { it.status.contains("digest") || it.status.contains("aux") }.status =~ "sha256:\\w+"
+    infos.find { it.status?.contains("digest") || it.status?.contains("aux") }.status =~ "sha256:\\w+"
 //    pushResult.content.last().aux.Digest =~ "sha256:\\w+"
 
     cleanup: