diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java
index d2fa079d9..c4afef86d 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
 public class SleuthTagPropagationAutoConfiguration {
 
 	@Configuration
-	@ConditionalOnProperty(value = "spring.sleuth.propagation.tag.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(value = "spring.sleuth.propagation.tag.enabled")
 	@EnableConfigurationProperties(SleuthTagPropagationProperties.class)
 	protected static class TagPropagationConfiguration {
 
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTests.java
similarity index 85%
rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTest.java
rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTests.java
index 48f074b2c..c999bb74d 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTest.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfigurationTests.java
@@ -23,7 +23,7 @@ import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
 import static org.assertj.core.api.Assertions.assertThat;
 
 
-public class SleuthTagPropagationAutoConfigurationTest {
+public class SleuthTagPropagationAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(SleuthTagPropagationAutoConfiguration.class));
@@ -37,10 +37,8 @@ public class SleuthTagPropagationAutoConfigurationTest {
 	}
 
 	@Test
-	public void shouldNotCreateHandlerByDisablingIt() {
+	public void shouldNotCreateHandlerByDefault() {
 		this.contextRunner
-				.withPropertyValues("spring.sleuth.propagation.tag.whitelisted-keys=some-key")
-				.withPropertyValues("spring.sleuth.propagation.tag.enabled=false")
 				.withUserConfiguration(TraceAutoConfiguration.class)
 				.run((context) -> {
 					assertThat(context).doesNotHaveBean(TagPropagationFinishedSpanHandler.class);
@@ -48,8 +46,9 @@ public class SleuthTagPropagationAutoConfigurationTest {
 	}
 
 	@Test
-	public void shouldCreateHandler() {
+	public void shouldCreateHandlerWhenEnabled() {
 		this.contextRunner
+				.withPropertyValues("spring.sleuth.propagation.tag.enabled=true")
 				.withPropertyValues("spring.sleuth.propagation.tag.whitelisted-keys=some-key")
 				.withUserConfiguration(TraceAutoConfiguration.class)
 				.run((context) -> {