diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml
index e6afe382..4e19d220 100644
--- a/spring-cloud-config-server/pom.xml
+++ b/spring-cloud-config-server/pom.xml
@@ -51,7 +51,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring-cloud.version>${project.version}</spring-cloud.version>
-		<start-class>org.springframework.cloud.config.server.Application</start-class>
+		<start-class>org.springframework.cloud.config.server.ConfigServerApplication</start-class>
 		<java.version>1.7</java.version>
 	</properties>
 
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerApplication.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerApplication.java
index ea6ef56b..9fc9e486 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerApplication.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerApplication.java
@@ -1,6 +1,7 @@
 package org.springframework.cloud.config.server;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
@@ -8,4 +9,9 @@ import org.springframework.context.annotation.Configuration;
 @EnableConfigServer
 public class ConfigServerApplication {
 
+	public static void main(String[] args) {
+		new SpringApplicationBuilder(ConfigServerApplication.class).properties(
+				"spring.config.name=configserver").run(args);
+	}
+
 }
diff --git a/spring-cloud-config-server/src/main/resources/application.yml b/spring-cloud-config-server/src/main/resources/configserver.yml
similarity index 100%
rename from spring-cloud-config-server/src/main/resources/application.yml
rename to spring-cloud-config-server/src/main/resources/configserver.yml
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ApplicationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ApplicationTests.java
index 936e1d5f..bf548d04 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ApplicationTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ApplicationTests.java
@@ -9,13 +9,15 @@ import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
 import org.springframework.cloud.config.Environment;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = ConfigServerApplication.class)
-@IntegrationTest("server.port:0")
+@IntegrationTest({"server.port:0", "spring.config.name:configserver"})
 @WebAppConfiguration
+@ActiveProfiles("test")
 public class ApplicationTests {
 	
 	@Value("${local.server.port}")
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java
index ca2a2c84..25043488 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java
@@ -32,28 +32,28 @@ public class SpringApplicationEnvironmentRepositoryTests {
 	@Test
 	public void vanilla() {
 		Environment environment = repository.findOne("foo", "development", "master");
-		assertEquals(3, environment.getPropertySources().size());
+		assertEquals(2, environment.getPropertySources().size());
 	}
 
 	@Test
 	public void ignoresExistingProfile() {
 		System.setProperty("spring.profiles.active", "cloud");
 		Environment environment = repository.findOne("foo", "main", "master");
-		assertEquals(2, environment.getPropertySources().size());
+		assertEquals(1, environment.getPropertySources().size());
 	}
 
 	@Test
 	public void prefixed() {
 		repository.setSearchLocations("classpath:/test");
 		Environment environment = repository.findOne("foo", "development", "master");
-		assertEquals(4, environment.getPropertySources().size());
+		assertEquals(3, environment.getPropertySources().size());
 	}
 
 	@Test
 	public void prefixedWithFile() {
 		repository.setSearchLocations("file:./src/test/resources/test");
 		Environment environment = repository.findOne("foo", "development", "master");
-		assertEquals(4, environment.getPropertySources().size());
+		assertEquals(3, environment.getPropertySources().size());
 	}
 
 }
diff --git a/spring-cloud-config-server/src/main/resources/application-test.yml b/spring-cloud-config-server/src/test/resources/configserver-test.yml
similarity index 100%
rename from spring-cloud-config-server/src/main/resources/application-test.yml
rename to spring-cloud-config-server/src/test/resources/configserver-test.yml