diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java
index 2e8f362a..d62280ec 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java
@@ -37,32 +37,24 @@ import org.springframework.context.annotation.Primary;
 @ConditionalOnMissingBean(CompositeEnvironmentRepository.class)
 public class CompositeConfiguration {
 
-	private List<EnvironmentRepository> environmentRepos = new ArrayList<>();
-
-	private ConfigServerProperties properties;
-
 	@Bean
 	@Primary
 	@ConditionalOnBean(SearchPathLocator.class)
-	public SearchPathCompositeEnvironmentRepository searchPathCompositeEnvironmentRepository() {
-		return new SearchPathCompositeEnvironmentRepository(this.environmentRepos, properties.isFailOnCompositeError());
+	public SearchPathCompositeEnvironmentRepository searchPathCompositeEnvironmentRepository(
+			@Autowired(required = false) List<EnvironmentRepository> environmentRepos,
+			ConfigServerProperties properties) {
+		environmentRepos = environmentRepos != null ? environmentRepos : new ArrayList<>();
+		return new SearchPathCompositeEnvironmentRepository(environmentRepos, properties.isFailOnCompositeError());
 	}
 
 	@Bean
 	@Primary
 	@ConditionalOnMissingBean(SearchPathLocator.class)
-	public CompositeEnvironmentRepository compositeEnvironmentRepository() {
-		return new CompositeEnvironmentRepository(this.environmentRepos, properties.isFailOnCompositeError());
-	}
-
-	@Autowired
-	public void setEnvironmentRepos(List<EnvironmentRepository> repos) {
-		this.environmentRepos = repos;
-	}
-
-	@Autowired
-	public void setProperties(ConfigServerProperties properties) {
-		this.properties = properties;
+	public CompositeEnvironmentRepository compositeEnvironmentRepository(
+			@Autowired(required = false) List<EnvironmentRepository> environmentRepos,
+			ConfigServerProperties properties) {
+		environmentRepos = environmentRepos != null ? environmentRepos : new ArrayList<>();
+		return new CompositeEnvironmentRepository(environmentRepos, properties.isFailOnCompositeError());
 	}
 
 }