diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java
index 27fec4de7..95a94f1f6 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java
@@ -72,6 +72,7 @@ public class TracingOnScheduledTests {
 	}
 
 	@Test
+	@DirtiesContext
 	public void should_have_span_set_after_scheduled_method_has_been_executed() {
 		await().atMost(10, SECONDS).untilAsserted(() -> {
 			then(this.beanWithScheduledMethod.isExecuted()).isTrue();
@@ -110,8 +111,9 @@ public class TracingOnScheduledTests {
 		then(storedSpan).isNotNull();
 		then(storedSpan.context().traceId()).isNotNull();
 		zipkin2.Span foundSpan = this.reporter.getSpans().stream()
-				.filter(span -> !span.tags().containsKey("error")).findFirst()
-				.orElseThrow(() -> new AssertionError("Span is missing"));
+				.filter(span -> !span.tags().containsKey("error")
+						&& span.tags().containsValue("TestBeanWithScheduledMethod"))
+				.findFirst().orElseThrow(() -> new AssertionError("Span is missing"));
 		then(foundSpan.tags()).contains(
 				new AbstractMap.SimpleEntry<>("class", "TestBeanWithScheduledMethod"),
 				new AbstractMap.SimpleEntry<>("method", "scheduledMethod"));