diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
index 9f3b40dd8..c17177aa3 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
@@ -68,21 +68,20 @@ public class TraceWebAutoConfiguration {
 		}
 
 		/**
-		 * Sets or appends {@link ManagementServerProperties#getContextPath()} to the skip
+		 * Sets or appends {@link ManagementServerProperties.Servlet#getContextPath()} to the skip
 		 * pattern. If neither is available then sets the default one
 		 */
 		static Pattern getPatternForManagementServerProperties(
 				ManagementServerProperties managementServerProperties,
 				SleuthWebProperties sleuthWebProperties) {
 			String skipPattern = sleuthWebProperties.getSkipPattern();
-			if (StringUtils.hasText(skipPattern)
-					&& StringUtils.hasText(managementServerProperties.getContextPath())) {
-				return Pattern.compile(skipPattern + "|"
-						+ managementServerProperties.getContextPath() + ".*");
+			String contextPath = managementServerProperties.getServlet().getContextPath();
+
+			if (StringUtils.hasText(skipPattern) && StringUtils.hasText(contextPath)) {
+				return Pattern.compile(skipPattern + "|" + contextPath + ".*");
 			}
-			else if (StringUtils.hasText(managementServerProperties.getContextPath())) {
-				return Pattern
-						.compile(managementServerProperties.getContextPath() + ".*");
+			else if (StringUtils.hasText(contextPath)) {
+				return Pattern.compile(contextPath + ".*");
 			}
 			return defaultSkipPattern(skipPattern);
 		}
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java
index 8ff3f8bfd..85b332438 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java
@@ -64,20 +64,18 @@ public class SkipPatternProviderConfigTest {
 		SleuthWebProperties sleuthWebProperties = new SleuthWebProperties();
 		sleuthWebProperties.setSkipPattern("");
 
+		ManagementServerProperties properties = new ManagementServerProperties();
+		properties.getServlet().setContextPath("");
+
 		Pattern pattern = TraceWebAutoConfiguration.SkipPatternProviderConfig.getPatternForManagementServerProperties(
-				new ManagementServerProperties() {
-					@Override
-					public String getContextPath() {
-						return "";
-					}
-				}, sleuthWebProperties);
+				properties, sleuthWebProperties);
 
 		then(pattern.pattern()).isEqualTo(SleuthWebProperties.DEFAULT_SKIP_PATTERN);
 	}
 
 	private ManagementServerProperties managementServerPropertiesWithContextPath() {
 		ManagementServerProperties managementServerProperties = new ManagementServerProperties();
-		managementServerProperties.setContextPath("/management/context");
+		managementServerProperties.getServlet().setContextPath("/management/context");
 		return managementServerProperties;
 	}
 }
\ No newline at end of file
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterIntegrationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterIntegrationTests.java
index 4ec3ebd9a..d868d3811 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterIntegrationTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterIntegrationTests.java
@@ -289,7 +289,7 @@ public class TraceFilterIntegrationTests extends AbstractMvcIntegrationTest {
 			@Primary
 			ManagementServerProperties managementServerProperties() {
 				ManagementServerProperties managementServerProperties = new ManagementServerProperties();
-				managementServerProperties.setContextPath("/additionalContextPath");
+				managementServerProperties.getServlet().setContextPath("/additionalContextPath");
 				return managementServerProperties;
 			}
 		}