diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java
index 8e2c7d85f0a..191076ed0fe 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java
@@ -37,8 +37,8 @@ import org.springframework.util.Assert;
 public abstract class AbstractConfigurableEmbeddedServletContainer implements
 		ConfigurableEmbeddedServletContainer {
 
-	private static final int DEFAULT_SESSION_TIMEOUT = (int) TimeUnit.SECONDS
-			.toMinutes(30);
+	private static final int DEFAULT_SESSION_TIMEOUT = (int) TimeUnit.MINUTES
+			.toSeconds(30);
 
 	private String contextPath = "";
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
index 268a7c1e852..66941a4c00f 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
@@ -534,6 +534,11 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 				equalTo("test"));
 	}
 
+	@Test
+	public void defaultSessionTimeout() throws Exception {
+		assertThat(getFactory().getSessionTimeout(), equalTo(30 * 60));
+	}
+
 	protected String getLocalUrl(String resourcePath) {
 		return getLocalUrl("http", resourcePath);
 	}