diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/CustomSkipPatternJarScanner.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/SkipPatternJarScanner.java
similarity index 100%
rename from spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/CustomSkipPatternJarScanner.java
rename to spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/SkipPatternJarScanner.java
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java
index d1026b60c7e..3b2bd37ba28 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java
@@ -16,9 +16,12 @@
 
 package org.springframework.boot.context.embedded.tomcat;
 
+import java.lang.reflect.Method;
+
 import org.apache.catalina.Container;
 import org.apache.catalina.core.StandardContext;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ReflectionUtils;
 
 /**
  * Tomcat {@link StandardContext} used by {@link TomcatEmbeddedServletContainer} to
@@ -45,7 +48,12 @@ class TomcatEmbeddedContext extends StandardContext {
 		if (classLoader != null) {
 			existingLoader = ClassUtils.overrideThreadContextClassLoader(classLoader);
 		}
-		super.loadOnStartup(findChildren());
+		if (ClassUtils.isPresent("org.apache.catalina.deploy.ErrorPage", null)) {
+			super.loadOnStartup(findChildren());
+		}
+		else {
+			callSuper(this, "loadOnStartup", findChildren(), Container[].class);
+		}
 		if (existingLoader != null) {
 			ClassUtils.overrideThreadContextClassLoader(existingLoader);
 		}
@@ -59,4 +67,10 @@ class TomcatEmbeddedContext extends StandardContext {
 		return this.starter;
 	}
 
+	private void callSuper(Object target, String name, Object value, Class<?> type) {
+		Method method = ReflectionUtils.findMethod(target.getClass().getSuperclass(),
+				name, type);
+		ReflectionUtils.invokeMethod(method, target, value);
+	}
+
 }