diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 794b15a7b4a..1c147e29e06 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -175,7 +175,7 @@
 		<thymeleaf-layout-dialect.version>1.4.0</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
 		<thymeleaf-extras-java8time.version>2.1.0.RELEASE</thymeleaf-extras-java8time.version>
-		<tomcat.version>8.5.4</tomcat.version>
+		<tomcat.version>8.5.5</tomcat.version>
 		<undertow.version>1.3.23.Final</undertow.version>
 		<velocity.version>1.7</velocity.version>
 		<velocity-tools.version>2.0</velocity-tools.version>
diff --git a/spring-boot/src/test/resources/test.jks b/spring-boot/src/test/resources/test.jks
index cc0d7081c2e..b10103d0d9d 100644
Binary files a/spring-boot/src/test/resources/test.jks and b/spring-boot/src/test/resources/test.jks differ
diff --git a/spring-boot/src/test/resources/test.p12 b/spring-boot/src/test/resources/test.p12
index 5726ff02f4b..de3664b9d7d 100644
Binary files a/spring-boot/src/test/resources/test.p12 and b/spring-boot/src/test/resources/test.p12 differ