diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java
index 29c05c0bdf..5794f8613e 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java
@@ -17,8 +17,7 @@
 package org.springframework.boot.actuate.autoconfigure;
 
 import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.validation.constraints.NotNull;
@@ -179,7 +178,7 @@ public class ManagementServerProperties implements SecurityPrerequisite {
 		/**
 		 * Comma-separated list of roles that can access the management endpoint.
 		 */
-		private List<String> roles = new ArrayList<String>(Collections.singletonList("ADMIN"));
+		private List<String> roles = Arrays.asList("ADMIN");
 
 		/**
 		 * Session creating policy to use (always, never, if_required, stateless).
@@ -200,7 +199,7 @@ public class ManagementServerProperties implements SecurityPrerequisite {
 
 		@Deprecated
 		public void setRole(String role) {
-			this.roles = new ArrayList<String>(Collections.singletonList(role));
+			this.roles = Arrays.asList(role);
 		}
 
 		public List<String> getRoles() {
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
index ffc5e53c3e..951e1222be 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
@@ -82,8 +82,7 @@ public class ManagementServerPropertiesAutoConfigurationTests {
 
 	@Test
 	public void managementRolesAllowsIndexedAccess() {
-		ManagementServerProperties properties = load(
-				"management.security.roles[0]=FOO");
+		ManagementServerProperties properties = load("management.security.roles[0]=FOO");
 		assertThat(properties.getSecurity().getRoles()).containsOnly("FOO");
 	}
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java
index 166ce81275..bb0ca4cef1 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java
@@ -16,8 +16,7 @@
 
 package org.springframework.boot.autoconfigure.elasticsearch.jest;
 
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -34,8 +33,7 @@ public class JestProperties {
 	/**
 	 * Comma-separated list of the Elasticsearch instances to use.
 	 */
-	private List<String> uris = new ArrayList<String>(Collections.singletonList(
-			"http://localhost:9200"));
+	private List<String> uris = Arrays.asList("http://localhost:9200");
 
 	/**
 	 * Login user.