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 7712498643..aa58b0b22d 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
@@ -68,7 +68,6 @@ import org.mockito.InOrder;
 
 import org.springframework.boot.testsupport.rule.OutputCapture;
 import org.springframework.boot.web.server.WebServerException;
-import org.springframework.boot.web.servlet.ServletContextInitializer;
 import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory;
 import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactoryTests;
 import org.springframework.core.io.ByteArrayResource;
@@ -538,25 +537,19 @@ public class TomcatServletWebServerFactoryTests
 			throws IOException, URISyntaxException {
 		TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(0);
 		AtomicReference<ServletContext> servletContextReference = new AtomicReference<>();
-		factory.addInitializers(new ServletContextInitializer() {
+		factory.addInitializers((servletContext) -> {
+			servletContextReference.set(servletContext);
+			Dynamic servlet = servletContext.addServlet("upload", new HttpServlet() {
 
-			@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));
-			}
+				@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 2356419472..b09b3b7fcb 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
@@ -25,7 +25,6 @@ import java.io.PrintWriter;
 import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
 import java.net.ServerSocket;
-import java.net.Socket;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -75,8 +74,6 @@ import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.ssl.PrivateKeyDetails;
-import org.apache.http.ssl.PrivateKeyStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.ssl.TrustStrategy;
 import org.apache.jasper.EmbeddedServletOptions;
@@ -503,16 +500,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 +526,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 +619,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();