diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfigurationWithDisabledSleuthTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfigurationWithDisabledSleuthTests.java
index 43384c73f..8fc43d109 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfigurationWithDisabledSleuthTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfigurationWithDisabledSleuthTests.java
@@ -41,7 +41,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 		classes = TraceAutoConfigurationWithDisabledSleuthTests.Config.class)
 @ActiveProfiles("disabled")
 @ExtendWith(OutputCaptureExtension.class)
-@DirtiesContext
 public class TraceAutoConfigurationWithDisabledSleuthTests {
 
 	private static final Log log = LogFactory
diff --git a/spring-cloud-sleuth-core/src/test/resources/application-disabled.yml b/spring-cloud-sleuth-core/src/test/resources/application-disabled.yml
new file mode 100644
index 000000000..19d33f4a3
--- /dev/null
+++ b/spring-cloud-sleuth-core/src/test/resources/application-disabled.yml
@@ -0,0 +1,3 @@
+spring:
+  sleuth:
+    enabled: false
diff --git a/spring-cloud-sleuth-core/src/test/resources/bootstrap-disabled.yml b/spring-cloud-sleuth-core/src/test/resources/bootstrap-disabled.yml
index a2d1a7bc3..72d915911 100644
--- a/spring-cloud-sleuth-core/src/test/resources/bootstrap-disabled.yml
+++ b/spring-cloud-sleuth-core/src/test/resources/bootstrap-disabled.yml
@@ -1,5 +1,3 @@
 spring:
   application:
     name: foo
-  sleuth:
-    enabled: false