diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml
index d94a3582..cf8bf799 100644
--- a/spring-cloud-config-client/pom.xml
+++ b/spring-cloud-config-client/pom.xml
@@ -81,6 +81,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-test-support</artifactId>
diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml
index ba03d2f2..50c95596 100644
--- a/spring-cloud-config-server/pom.xml
+++ b/spring-cloud-config-server/pom.xml
@@ -123,6 +123,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-test-support</artifactId>
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryFactory.java
index 5e14831e..a09b96f8 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryFactory.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryFactory.java
@@ -37,6 +37,7 @@ public class AwsS3EnvironmentRepositoryFactory implements
 		if (environmentProperties.getRegion() != null) {
 			clientBuilder.withRegion(environmentProperties.getRegion());
 		}
+		clientBuilder.withClientConfiguration()
 		final AmazonS3 client = clientBuilder.build();
 		if (environmentProperties.getEndpoint() != null) {
 			client.setEndpoint(environmentProperties.getEndpoint());