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 248f428bba..737afeccb8 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
@@ -122,8 +122,7 @@ static Optional<Pattern> getEndpointsPatterns(String contextPath,
 			String basePath = webEndpointProperties.getBasePath();
 			String pattern = endpoints.stream().map(PathMappedEndpoint::getRootPath)
 					.map(path -> path + "|" + path + "/.*")
-					.collect(Collectors.joining("|",
-							getPathPrefix(contextPath, basePath),
+					.collect(Collectors.joining("|", getPathPrefix(contextPath, basePath),
 							getPathSuffix(contextPath, basePath)));
 			if (StringUtils.hasText(pattern)) {
 				return Optional.of(Pattern.compile(pattern));
@@ -149,9 +148,8 @@ private static String getPathPrefix(String contextPath, String actuatorBasePath)
 
 		private static String getPathSuffix(String contextPath, String actuatorBasePath) {
 			String result = ")";
-			if (StringUtils.hasText(contextPath) ||
-					(StringUtils.hasText(actuatorBasePath)
-							&& !"/".equals(actuatorBasePath))) {
+			if (StringUtils.hasText(contextPath) || (StringUtils.hasText(actuatorBasePath)
+					&& !"/".equals(actuatorBasePath))) {
 				result += ")?";
 			}
 			return result;
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 0ec2a0eb12..05744e668d 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
@@ -181,7 +181,8 @@ public void should_return_endpoints_with_context_path_and_base_path_set_to_root(
 				.skipPattern();
 
 		then(pattern).isNotEmpty();
-		then(pattern.get().pattern()).isEqualTo("foo(/|/(info|info/.*|health|health/.*))?");
+		then(pattern.get().pattern())
+				.isEqualTo("foo(/|/(info|info/.*|health|health/.*))?");
 	}
 
 	@Test
diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java
index 146f2b0b3d..1af0a7d0f7 100644
--- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java
+++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java
@@ -91,7 +91,7 @@ ZipkinLoadBalancer noOpLoadBalancer(final ZipkinProperties zipkinProperties) {
 	static class DiscoveryClientZipkinUrlExtractorConfiguration {
 
 		@Configuration
-		@ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "true", matchIfMissing = true)
+		@ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled", havingValue = "true", matchIfMissing = true)
 		static class ZipkinClientLoadBalancedConfiguration {
 
 			@Autowired(required = false)
@@ -108,7 +108,7 @@ ZipkinLoadBalancer loadBalancerClientZipkinLoadBalancer(
 		}
 
 		@Configuration
-		@ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "false")
+		@ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled", havingValue = "false")
 		static class ZipkinClientNoOpConfiguration {
 
 			@Bean
diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfigurationTest.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfigurationTest.java
new file mode 100644
index 0000000000..2f35ef366a
--- /dev/null
+++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfigurationTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.sleuth.zipkin2.sender;
+
+import org.junit.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.sleuth.zipkin2.ZipkinLoadBalancer;
+import org.springframework.cloud.sleuth.zipkin2.ZipkinProperties;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author liaochuntao
+ */
+public class ZipkinRestTemplateSenderConfigurationTest {
+
+	@Test
+	public void disableZipkinDiscoveryClient() {
+		ConfigurableApplicationContext ctxt = new SpringApplication(
+				ZipkinRestTemplateSenderConfigurationTest.MyDiscoveryClientZipkinUrlExtractorConfiguration.class,
+				ZipkinProperties.class)
+						.run("--spring.zipkin.discovery-client-enabled=false");
+		assertThat(ctxt.getBean(ZipkinLoadBalancer.class))
+				.isInstanceOf(NoOpZipkinLoadBalancer.class);
+		ctxt.close();
+	}
+
+	@Test
+	public void enableZipkinDiscoveryClient() {
+		ConfigurableApplicationContext ctxt = new SpringApplication(
+				ZipkinRestTemplateSenderConfigurationTest.MyDiscoveryClientZipkinUrlExtractorConfiguration.class,
+				ZipkinProperties.class)
+						.run("--spring.zipkin.discovery-client-enabled=true");
+		assertThat(ctxt.getBean(ZipkinLoadBalancer.class))
+				.isInstanceOf(LoadBalancerClientZipkinLoadBalancer.class);
+		ctxt.close();
+	}
+
+	@Configuration
+	@ConditionalOnClass(LoadBalancerClient.class)
+	static class MyDiscoveryClientZipkinUrlExtractorConfiguration {
+
+		@Configuration
+		@ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled", havingValue = "true", matchIfMissing = true)
+		static class ZipkinClientLoadBalancedConfiguration {
+
+			@Autowired(required = false)
+			LoadBalancerClient client;
+
+			@Bean
+			@ConditionalOnMissingBean
+			ZipkinLoadBalancer loadBalancerClientZipkinLoadBalancer(
+					ZipkinProperties zipkinProperties) {
+				return new LoadBalancerClientZipkinLoadBalancer(this.client,
+						zipkinProperties);
+			}
+
+		}
+
+		@Configuration
+		@ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled", havingValue = "false")
+		static class ZipkinClientNoOpConfiguration {
+
+			@Bean
+			@ConditionalOnMissingBean
+			ZipkinLoadBalancer noOpLoadBalancer(final ZipkinProperties zipkinProperties) {
+				return new NoOpZipkinLoadBalancer(zipkinProperties);
+			}
+
+		}
+
+	}
+
+}