diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/VaultEnvironmentProperties.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/VaultEnvironmentProperties.java
index e7068fc0..97c77320 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/VaultEnvironmentProperties.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/VaultEnvironmentProperties.java
@@ -74,7 +74,8 @@ public class VaultEnvironmentProperties implements HttpEnvironmentRepositoryProp
 	private int kvVersion = 1;
 
 	/**
-	 * The value of the Vault X-Vault-Namespace header. Defaults to null. This a Vault Enterprise feature only.
+	 * The value of the Vault X-Vault-Namespace header. Defaults to null. This a Vault
+	 * Enterprise feature only.
 	 */
 	private String namespace;
 
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeClasspathTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeClasspathTests.java
index c2dfc674..b00a01c0 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeClasspathTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeClasspathTests.java
@@ -27,7 +27,7 @@ import org.springframework.cloud.test.ModifiedClassPathRunner;
 public class CompositeClasspathTests {
 
 	@RunWith(ModifiedClassPathRunner.class)
-	@ClassPathExclusions({"spring-jdbc-*.jar", "spring-data-redis-*.jar"})
+	@ClassPathExclusions({ "spring-jdbc-*.jar", "spring-data-redis-*.jar" })
 	public static class JdbcTests {
 
 		@Test
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/RedisEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/RedisEnvironmentRepositoryIntegrationTests.java
index 95fce418..67e08156 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/RedisEnvironmentRepositoryIntegrationTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/RedisEnvironmentRepositoryIntegrationTests.java
@@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
-@DataRedisTest
+@DataRedisTest(properties = "spring.redis.port=6378")
 @ActiveProfiles("redis")
 public class RedisEnvironmentRepositoryIntegrationTests {
 
@@ -43,7 +43,7 @@ public class RedisEnvironmentRepositoryIntegrationTests {
 
 	@Before
 	public void startRedis() throws IOException {
-		redisServer = new RedisServer(6379);
+		redisServer = new RedisServer(6378);
 		redisServer.start();
 	}