diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java
index 284388dd..6eb86b20 100644
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java
+++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java
@@ -181,7 +181,7 @@ public class EurekaInstanceConfigBeanTests {
 	}
 
 	@Test
-	public void testVirtualHostName() throws Exception {
+	public void testDefaultVirtualHostName() throws Exception {
 		addEnvironment(this.context, "spring.application.name:myapp");
 		setupContext();
 		assertEquals("virtualHostName wrong", "myapp", getInstanceConfig().getVirtualHostName());
@@ -189,6 +189,16 @@ public class EurekaInstanceConfigBeanTests {
 
 	}
 
+	@Test
+	public void testCustomVirtualHostName() throws Exception {
+		addEnvironment(this.context, "spring.application.name:myapp", "eureka.instance.virtualHostName=myvirthost",
+				"eureka.instance.secureVirtualHostName=mysecurevirthost");
+		setupContext();
+		assertEquals("virtualHostName wrong", "myvirthost", getInstanceConfig().getVirtualHostName());
+		assertEquals("secureVirtualHostName wrong", "mysecurevirthost", getInstanceConfig().getSecureVirtualHostName());
+
+	}
+
 	@Test
 	public void testDefaultAppName() throws Exception {
 		setupContext();