diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
index 7712498643d..8574f86bf33 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
@@ -538,25 +538,20 @@ public class TomcatServletWebServerFactoryTests
 			throws IOException, URISyntaxException {
 		TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(0);
 		AtomicReference<ServletContext> servletContextReference = new AtomicReference<>();
-		factory.addInitializers(new ServletContextInitializer() {
-
-			@Override
-			public void onStartup(ServletContext servletContext) throws ServletException {
-				servletContextReference.set(servletContext);
-				Dynamic servlet = servletContext.addServlet("upload", new HttpServlet() {
-
-					@Override
-					protected void doPost(HttpServletRequest req,
-							HttpServletResponse resp)
-							throws ServletException, IOException {
-						req.getParts();
-					}
-
-				});
-				servlet.addMapping("/upload");
-				servlet.setMultipartConfig(new MultipartConfigElement((String) null));
-			}
+		factory.addInitializers((ServletContextInitializer) servletContext -> {
+			servletContextReference.set(servletContext);
+			Dynamic servlet = servletContext.addServlet("upload", new HttpServlet() {
+
+				@Override
+				protected void doPost(HttpServletRequest req,
+						HttpServletResponse resp)
+						throws ServletException, IOException {
+					req.getParts();
+				}
 
+			});
+			servlet.addMapping("/upload");
+			servlet.setMultipartConfig(new MultipartConfigElement((String) null));
 		});
 		this.webServer = factory.getWebServer();
 		this.webServer.start();
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
index 23564194729..69374bba789 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
@@ -503,16 +503,7 @@ public abstract class AbstractServletWebServerFactoryTests {
 				new SSLContextBuilder()
 						.loadTrustMaterial(null, new TrustSelfSignedStrategy())
 						.loadKeyMaterial(keyStore, "secret".toCharArray(),
-								new PrivateKeyStrategy() {
-
-									@Override
-									public String chooseAlias(
-											Map<String, PrivateKeyDetails> aliases,
-											Socket socket) {
-										return "spring-boot";
-									}
-
-								})
+								(aliases, socket) -> "spring-boot")
 						.build());
 		HttpClient httpClient = HttpClients.custom().setSSLSocketFactory(socketFactory)
 				.build();
@@ -538,15 +529,7 @@ public abstract class AbstractServletWebServerFactoryTests {
 				new SSLContextBuilder()
 						.loadTrustMaterial(null, new TrustSelfSignedStrategy())
 						.loadKeyMaterial(keyStore, "password".toCharArray(),
-								new PrivateKeyStrategy() {
-
-									@Override
-									public String chooseAlias(
-											Map<String, PrivateKeyDetails> aliases,
-											Socket socket) {
-										return "spring-boot";
-									}
-								})
+								(aliases, socket) -> "spring-boot")
 						.build());
 		HttpClient httpClient = HttpClients.custom().setSSLSocketFactory(socketFactory)
 				.build();
@@ -639,15 +622,7 @@ public abstract class AbstractServletWebServerFactoryTests {
 				new SSLContextBuilder()
 						.loadTrustMaterial(null, new TrustSelfSignedStrategy())
 						.loadKeyMaterial(keyStore, "password".toCharArray(),
-								new PrivateKeyStrategy() {
-
-									@Override
-									public String chooseAlias(
-											Map<String, PrivateKeyDetails> aliases,
-											Socket socket) {
-										return "spring-boot";
-									}
-								})
+								(aliases, socket) -> "spring-boot")
 						.build());
 		HttpClient httpClient = HttpClients.custom().setSSLSocketFactory(socketFactory)
 				.build();