diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/NonRefreshableFeignClientUrlTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/NonRefreshableFeignClientUrlTests.java
index 1670e635..47520ff3 100644
--- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/NonRefreshableFeignClientUrlTests.java
+++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/NonRefreshableFeignClientUrlTests.java
@@ -76,11 +76,36 @@ class NonRefreshableFeignClientUrlTests {
 		assertThat(response.getTargetType()).isEqualTo(Target.HardCodedTarget.class);
 	}
 
+	@Test
+	void shouldInstantiateFeignClientWhenUrlAndPathAreInTheFeignClientAnnotation(
+		@Autowired Application.WithPathAndFixUrlClient withPathAndFixUrlClient
+	) {
+		UrlTestClient.UrlResponseForTests response = withPathAndFixUrlClient.test();
+		assertThat(response.getUrl()).isEqualTo("http://localhost:7777/common/test");
+		assertThat(response.getTargetType()).isEqualTo(Target.HardCodedTarget.class);
+	}
+
+	@Test
+	void shouldInstantiateFeignClientWhenUrlFromPropertiesAndPathInTheFeignClientAnnotation(
+		@Autowired Application.WithPathAndUrlFromConfigClient withPathAndUrlFromConfigClient
+	) {
+		UrlTestClient.UrlResponseForTests response = withPathAndUrlFromConfigClient.test();
+		assertThat(response.getUrl()).isEqualTo("http://localhost:7777/common/test");
+		assertThat(response.getTargetType()).isEqualTo(Target.HardCodedTarget.class);
+	}
+
 	@Configuration
 	@EnableAutoConfiguration
 	@EnableConfigurationProperties(FeignClientProperties.class)
-	@EnableFeignClients(clients = { Application.FeignClientWithFixUrl.class, Application.ConfigBasedClient.class,
-			Application.NameBasedUrlClient.class })
+	@EnableFeignClients(
+		clients = {
+			Application.FeignClientWithFixUrl.class,
+			Application.ConfigBasedClient.class,
+			Application.NameBasedUrlClient.class,
+			Application.WithPathAndUrlFromConfigClient.class,
+			Application.WithPathAndFixUrlClient.class
+		}
+	)
 	protected static class Application {
 
 		@Bean
@@ -112,6 +137,22 @@ class NonRefreshableFeignClientUrlTests {
 
 		}
 
+		@FeignClient(name = "withPathAndFixUrlClient", path = "/common", url = "http://localhost:7777")
+		protected interface WithPathAndFixUrlClient {
+
+			@GetMapping("/test")
+			UrlTestClient.UrlResponseForTests test();
+
+		}
+
+		@FeignClient(name = "withPathAndUrlFromConfigClient", path = "/common")
+		protected interface WithPathAndUrlFromConfigClient {
+
+			@GetMapping("/test")
+			UrlTestClient.UrlResponseForTests test();
+
+		}
+
 	}
 
 }
diff --git a/spring-cloud-openfeign-core/src/test/resources/feign-properties.properties b/spring-cloud-openfeign-core/src/test/resources/feign-properties.properties
index b4c6e9ef..305d2610 100644
--- a/spring-cloud-openfeign-core/src/test/resources/feign-properties.properties
+++ b/spring-cloud-openfeign-core/src/test/resources/feign-properties.properties
@@ -28,3 +28,4 @@ spring.cloud.openfeign.client.config.connectTimeout.connectTimeout=1000
 spring.cloud.openfeign.client.config.default.followRedirects=false
 spring.cloud.openfeign.client.config.feignClientWithFixUrl.url=http://localhost:8888
 spring.cloud.openfeign.client.config.configBasedClient.url=http://localhost:9999
+spring.cloud.openfeign.client.config.withPathAndUrlFromConfigClient.url=http://localhost:7777