diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java
index acdab8d8..0b6dbd78 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java
@@ -33,6 +33,9 @@ public class ContextRefresher {
 
 	private static final String REFRESH_ARGS_PROPERTY_SOURCE = "refreshArgs";
 
+	private static final String[] DEFAULT_PROPERTY_SOURCES = new String[] {
+			"defaultProperties" };
+
 	private Set<String> standardSources = new HashSet<>(
 			Arrays.asList(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME,
 					StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME,
@@ -125,11 +128,18 @@ public class ContextRefresher {
 	private StandardEnvironment copyEnvironment(ConfigurableEnvironment input) {
 		StandardEnvironment environment = new StandardEnvironment();
 		MutablePropertySources capturedPropertySources = environment.getPropertySources();
-		for (PropertySource<?> source : capturedPropertySources) {
-			capturedPropertySources.remove(source.getName());
-		}
-		for (PropertySource<?> source : input.getPropertySources()) {
-			capturedPropertySources.addLast(source);
+		// Only copy the default property source(s) and the profiles over from the main
+		// environment (everything else should be pristine, just like it was on startup).
+		for (String name : DEFAULT_PROPERTY_SOURCES) {
+			if (input.getPropertySources().contains(name)) {
+				if (capturedPropertySources.contains(name)) {
+					capturedPropertySources.replace(name,
+							input.getPropertySources().get(name));
+				}
+				else {
+					capturedPropertySources.addLast(input.getPropertySources().get(name));
+				}
+			}
 		}
 		environment.setActiveProfiles(input.getActiveProfiles());
 		environment.setDefaultProfiles(input.getDefaultProfiles());
diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java
index 96e7dd52..99211813 100644
--- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java
+++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java
@@ -63,7 +63,7 @@ public class ContextRefresherTests {
 		List<String> names = names(context.getEnvironment().getPropertySources());
 		assertThat(names).doesNotContain("bootstrapProperties");
 		ContextRefresher refresher = new ContextRefresher(context, scope);
-		EnvironmentTestUtils.addEnvironment(context,
+		EnvironmentTestUtils.addEnvironment("defaultProperties", context.getEnvironment(),
 				"spring.cloud.bootstrap.sources: org.springframework.cloud.context.refresh.ContextRefresherTests.PropertySourceConfiguration\n"
 						+ "");
 		refresher.refresh();
diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java
index 3c400474..4eb75750 100644
--- a/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java
+++ b/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java
@@ -70,7 +70,7 @@ public class RefreshEndpointTests {
 				.run();
 		RefreshScope scope = new RefreshScope();
 		scope.setApplicationContext(this.context);
-		EnvironmentTestUtils.addEnvironment(this.context, "spring.profiles.active=local");
+		context.getEnvironment().setActiveProfiles("local");
 		ContextRefresher contextRefresher = new ContextRefresher(this.context, scope);
 		RefreshEndpoint endpoint = new RefreshEndpoint(contextRefresher);
 		Collection<String> keys = endpoint.invoke();
@@ -84,8 +84,7 @@ public class RefreshEndpointTests {
 				.run();
 		RefreshScope scope = new RefreshScope();
 		scope.setApplicationContext(this.context);
-		EnvironmentTestUtils.addEnvironment(this.context,
-				"spring.profiles.active=override");
+		context.getEnvironment().setActiveProfiles("override");
 		ContextRefresher contextRefresher = new ContextRefresher(this.context, scope);
 		RefreshEndpoint endpoint = new RefreshEndpoint(contextRefresher);
 		Collection<String> keys = endpoint.invoke();
@@ -99,7 +98,7 @@ public class RefreshEndpointTests {
 				.run();
 		RefreshScope scope = new RefreshScope();
 		scope.setApplicationContext(this.context);
-		EnvironmentTestUtils.addEnvironment(this.context,
+		EnvironmentTestUtils.addEnvironment("defaultProperties", this.context.getEnvironment(),
 				"spring.cloud.bootstrap.sources="
 						+ ExternalPropertySourceLocator.class.getName());
 		ContextRefresher contextRefresher = new ContextRefresher(this.context, scope);