diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifier.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifier.java
index 2896cf2b0e..9d6a852a57 100644
--- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifier.java
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifier.java
@@ -131,8 +131,8 @@ public class ResourceKnownHostsServerKeyVerifier implements ServerKeyVerifier {
 	private static Collection<SshdSocketAddress> resolveHostNetworkIdentities(
 			ClientSession clientSession, SocketAddress remoteAddress) {
 		/*
-		 * NOTE !!! we do not resolve the fully-qualified name to avoid long DNS timeouts. Instead we use the reported
-		 * peer address and the original connection target host
+		 * NOTE !!! we do not resolve the fully-qualified name to avoid long DNS timeouts.
+		 * Instead, we use the reported peer address and the original connection target host
 		 */
 		Collection<SshdSocketAddress> candidates = new TreeSet<>(SshdSocketAddress.BY_HOST_AND_PORT);
 		candidates.add(SshdSocketAddress.toSshdSocketAddress(remoteAddress));
diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifierTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifierTests.java
index b1566e42e2..c3b3f25a10 100644
--- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifierTests.java
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifierTests.java
@@ -122,7 +122,7 @@ public class ResourceKnownHostsServerKeyVerifierTests {
 	}
 
 	static boolean isDefaultKnownHostsFilePresent() {
-		return KnownHostEntry.getDefaultKnownHostsFile().toFile().exists();
+		return System.getenv("bamboo_buildKey") == null && KnownHostEntry.getDefaultKnownHostsFile().toFile().exists();
 	}
 
 }