diff --git a/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/mqtt/MosquittoContainerTest.java b/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/mqtt/MosquittoContainerTest.java
index c1da74d2..f2160a98 100644
--- a/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/mqtt/MosquittoContainerTest.java
+++ b/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/mqtt/MosquittoContainerTest.java
@@ -32,6 +32,9 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 @Testcontainers(disabledWithoutDocker = true)
 public interface MosquittoContainerTest {
 
+	/**
+	 * The Mosquitto Testcontainers instance.
+	 */
 	GenericContainer<?> MOSQUITTO_CONTAINER = new GenericContainer<>("eclipse-mosquitto:2.0.13")
 		.withCommand("mosquitto -c /mosquitto-no-auth.conf")
 		.withExposedPorts(1883);
diff --git a/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/sftp/SftpTestSupport.java b/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/sftp/SftpTestSupport.java
index c4fe87bf..cd70dd37 100644
--- a/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/sftp/SftpTestSupport.java
+++ b/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/sftp/SftpTestSupport.java
@@ -59,12 +59,8 @@ public class SftpTestSupport extends RemoteFileTestSupport {
 	public static void createServer() throws Exception {
 		server = SshServer.setUpDefaultServer();
 		server.setPasswordAuthenticator(
-				(username, password, session) -> StringUtils.hasText(password) && !"badPassword".equals(password)); // fail
-																													// if
-																													// pub
-																													// key
-																													// validation
-																													// failed
+				// fail if pub key validation failed
+				(username, password, session) -> StringUtils.hasText(password) && !"badPassword".equals(password));
 		server.setPublickeyAuthenticator((username, key, session) -> key.equals(decodePublicKey("id_rsa_pp.pub")));
 		server.setPort(0);
 		server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser").toPath()));
diff --git a/consumer/spring-mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java b/consumer/spring-mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java
index 01ea0b2e..320f3a59 100644
--- a/consumer/spring-mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java
+++ b/consumer/spring-mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java
@@ -59,7 +59,7 @@ public class MqttConsumerTests implements MosquittoContainerTest {
 
 	@DynamicPropertySource
 	static void mongoDbProperties(DynamicPropertyRegistry registry) {
-		registry.add("mqtt.url", () -> "tcp://localhost:" + MOSQUITTO_CONTAINER.getMappedPort(1883));
+		registry.add("mqtt.url", MosquittoContainerTest::mqttUrl);
 	}
 
 	@Test
diff --git a/supplier/spring-mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java b/supplier/spring-mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java
index 7a6603b9..e559276c 100644
--- a/supplier/spring-mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java
+++ b/supplier/spring-mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java
@@ -58,7 +58,7 @@ public class MqttSupplierTests implements MosquittoContainerTest {
 
 	@DynamicPropertySource
 	static void mongoDbProperties(DynamicPropertyRegistry registry) {
-		registry.add("mqtt.url", () -> "tcp://localhost:" + MOSQUITTO_CONTAINER.getMappedPort(1883));
+		registry.add("mqtt.url", MosquittoContainerTest::mqttUrl);
 	}
 
 	@Autowired