diff --git a/pom.xml b/pom.xml
index 0afbf4733..8a4c862ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,7 +169,7 @@
 			<dependency>
 				<groupId>com.netflix.feign</groupId>
 				<artifactId>feign-core</artifactId>
-				<version>8.1.1</version>
+				<version>8.7.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.aspectj</groupId>
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/FeignTraceTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/FeignTraceTest.java
index 2dde3a41a..0ae409a3c 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/FeignTraceTest.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/FeignTraceTest.java
@@ -52,7 +52,7 @@ public class FeignTraceTest {
 				.spanId(currentSpanId).parent(currentParentId).build());
 
 		// when
-		ResponseEntity<String> response = testFeignInterface.getHealth();
+		ResponseEntity<String> response = testFeignInterface.getTraceId();
 
 		// then
 		assertThat(getHeader(response, TRACE_ID_NAME)).isEqualTo(currentTraceId);
@@ -69,7 +69,7 @@ public class FeignTraceTest {
 	@FeignClient("fooservice")
 	public interface TestFeignInterface {
 		@RequestMapping(method = RequestMethod.GET, value = "/traceid")
-		ResponseEntity<String> getHealth();
+		ResponseEntity<String> getTraceId();
 	}
 
 	@Configuration
@@ -88,7 +88,7 @@ public class FeignTraceTest {
 	public static class FooController {
 
 		@RequestMapping(value = "/traceid", method = RequestMethod.GET)
-		public String foo(@RequestHeader(TRACE_ID_NAME) String traceId,
+		public String traceId(@RequestHeader(TRACE_ID_NAME) String traceId,
 				@RequestHeader(SPAN_ID_NAME) String spanId,
 				@RequestHeader(PARENT_ID_NAME) String parentId) {
 			assertThat(traceId).isNotEmpty();