diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java
index 47d8305791f..01099ae3f72 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java
@@ -76,11 +76,6 @@ public class MailProperties {
 	 */
 	private String jndiName;
 
-	/**
-	 * Whether to test that the mail server is available on startup.
-	 */
-	private boolean testConnection;
-
 	public String getHost() {
 		return this.host;
 	}
@@ -141,12 +136,4 @@ public class MailProperties {
 		return this.jndiName;
 	}
 
-	public boolean isTestConnection() {
-		return this.testConnection;
-	}
-
-	public void setTestConnection(boolean testConnection) {
-		this.testConnection = testConnection;
-	}
-
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 930e3988ca4..dafabc25def 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -409,6 +409,13 @@
       "name": "spring.kafka.listener.type",
       "defaultValue": "single"
     },
+    {
+      "name": "spring.mail.test-connection",
+      "description": "Whether to test that the mail server is available on startup.",
+      "sourceType": "org.springframework.boot.autoconfigure.mail.MailProperties",
+      "type": "java.lang.Boolean",
+      "defaultValue": false
+    },
     {
       "name": "spring.mongodb.embedded.features",
       "defaultValue": [