diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
index 0f11fa2630..cd4f9ef5d5 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
@@ -123,7 +123,7 @@ public class TomcatDataSourceConfigurationTests {
 		assertEquals(5000, ds.getTimeBetweenEvictionRunsMillis());
 		assertEquals(60000, ds.getMinEvictableIdleTimeMillis());
 		assertEquals(30000, ds.getMaxWait());
-		assertEquals(30000L, ds.getValidationInterval());
+		assertEquals(3000L, ds.getValidationInterval());
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index f7447d4c40..5163d52317 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -156,7 +156,7 @@
 		<thymeleaf-extras-conditionalcomments.version>2.1.2.RELEASE</thymeleaf-extras-conditionalcomments.version>
 		<thymeleaf-layout-dialect.version>1.3.3</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
-		<tomcat.version>8.0.36</tomcat.version>
+		<tomcat.version>8.0.37</tomcat.version>
 		<undertow.version>1.3.23.Final</undertow.version>
 		<velocity.version>1.7</velocity.version>
 		<velocity-tools.version>2.0</velocity-tools.version>