diff --git a/pom.xml b/pom.xml
index 48a2c43c4..a87e7d1dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,7 @@
 						<ignoredResourcePattern>plugin.properties</ignoredResourcePattern>
 						<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
 					</ignoredResourcePatterns>
+					<checkTestClasspath>false</checkTestClasspath>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml
index 4cc0d3545..74aec5f0d 100644
--- a/spring-cloud-netflix-eureka-client/pom.xml
+++ b/spring-cloud-netflix-eureka-client/pom.xml
@@ -40,7 +40,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-server</artifactId>
-			<optional>true</optional>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfiguration.java
index aed00cb52..34555cf05 100644
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfiguration.java
+++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfiguration.java
@@ -24,9 +24,9 @@ import com.netflix.discovery.EurekaClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.config.server.config.ConfigServerProperties;
 import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;
 
 /**
@@ -36,21 +36,22 @@ import org.springframework.util.StringUtils;
  */
 @Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
-@ConditionalOnClass({ EurekaInstanceConfigBean.class, EurekaClient.class, ConfigServerProperties.class })
+@ConditionalOnClass(value = { EurekaInstanceConfigBean.class, EurekaClient.class },
+		name = "org.springframework.cloud.config.server.config.ConfigServerProperties")
 public class EurekaClientConfigServerAutoConfiguration {
 
 	@Autowired(required = false)
 	private EurekaInstanceConfig instance;
 
-	@Autowired(required = false)
-	private ConfigServerProperties server;
+	@Autowired
+	private Environment env;
 
 	@PostConstruct
 	public void init() {
-		if (this.instance == null || this.server == null) {
+		if (this.instance == null) {
 			return;
 		}
-		String prefix = this.server.getPrefix();
+		String prefix = this.env.getProperty("spring.cloud.config.server.prefix");
 		if (StringUtils.hasText(prefix) && !StringUtils.hasText(this.instance.getMetadataMap().get("configPath"))) {
 			this.instance.getMetadataMap().put("configPath", prefix);
 		}