diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/LazyClient.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/LazyClient.java
index 480354d0a..4495f3a50 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/LazyClient.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/LazyClient.java
@@ -23,7 +23,7 @@ import feign.Request;
 import feign.Response;
 import org.springframework.beans.factory.BeanFactory;
 
-class LazyClient implements Client {
+class  LazyClient implements Client {
 
 	private final BeanFactory beanFactory;
 	private final Client delegate;
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 c4fcafd63..ac4e06d03 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
@@ -74,12 +74,9 @@ import static org.assertj.core.api.BDDAssertions.then;
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @TestPropertySource(properties = {
 		"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",
 		"hystrix.command.default.execution.isolation.strategy=SEMAPHORE"})
-@DirtiesContext
 public class FeignClientServerErrorTests {
 
 	private static final Log log = LogFactory.getLog(FeignClientServerErrorTests.class);
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleSleuthApplication.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleSleuthApplication.java
index d47e87da8..2216214ce 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleSleuthApplication.java
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleSleuthApplication.java
@@ -27,7 +27,7 @@ import org.springframework.web.client.RestTemplate;
  * @author Spencer Gibb
  */
 @SpringBootApplication
-@EnableAsync
+@EnableAsyncFeignClientServerErrorTests
 public class SampleSleuthApplication {
 
 	@Bean