diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/servererrors/FeignClientServerErrorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/servererrors/FeignClientServerErrorTests.java
index 0cc4aee60..ea1d260b5 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/servererrors/FeignClientServerErrorTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/servererrors/FeignClientServerErrorTests.java
@@ -72,7 +72,8 @@ import static org.assertj.core.api.BDDAssertions.then;
 @SpringBootTest(classes = FeignClientServerErrorTests.TestConfiguration.class,
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @TestPropertySource(properties = {
-		"spring.application.name=fooservice" ,
+		"spring.application.name=fooservice",
+		"spring.sleuth.sampler.probability=1.0",
 		"feign.hystrix.enabled=true",
 		"spring.sleuth.http.legacy.enabled=true",
 		"hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000",
@@ -225,7 +226,7 @@ public class FeignClientServerErrorTests {
 		}
 
 		@Bean
-		Sampler testSampler() {
+		Sampler alwaysSampler() {
 			return Sampler.ALWAYS_SAMPLE;
 		}
 
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/multiple/MultipleHopsIntegrationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/multiple/MultipleHopsIntegrationTests.java
index caac76977..6ff1cac3b 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/multiple/MultipleHopsIntegrationTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/multiple/MultipleHopsIntegrationTests.java
@@ -113,7 +113,9 @@ public class MultipleHopsIntegrationTests {
 			ExtraFieldPropagation.set("foo", "bar");
 			ExtraFieldPropagation.set("UPPER_CASE", "someValue");
 			//end::baggage[]
+		}
 
+		try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(initialSpan)) {
 			//tag::baggage_tag[]
 			initialSpan.tag("foo",
 					ExtraFieldPropagation.get(initialSpan.context(), "foo"));