diff --git a/redis/cluster/pom.xml b/redis/cluster/pom.xml
index b17ec808..35637e5b 100644
--- a/redis/cluster/pom.xml
+++ b/redis/cluster/pom.xml
@@ -18,6 +18,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-redis</artifactId>
 		</dependency>
+		
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-data-redis-example-utils</artifactId>
@@ -25,12 +26,12 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- remove this one when DATAREDIS-315 has been merged -->
 		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-redis</artifactId>
-			<version>1.7.0.DATAREDIS-315-SNAPSHOT</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
 		</dependency>
+		
 	</dependencies>
 
 </project>
\ No newline at end of file
diff --git a/redis/cluster/src/main/java/example/springdata/redis/cluster/AppConfig.java b/redis/cluster/src/main/java/example/springdata/redis/cluster/AppConfig.java
index a8fc23e1..80a910c5 100644
--- a/redis/cluster/src/main/java/example/springdata/redis/cluster/AppConfig.java
+++ b/redis/cluster/src/main/java/example/springdata/redis/cluster/AppConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/redis/cluster/src/main/java/example/springdata/redis/cluster/ClusterConfigurationProperties.java b/redis/cluster/src/main/java/example/springdata/redis/cluster/ClusterConfigurationProperties.java
index 59b94a40..29044d82 100644
--- a/redis/cluster/src/main/java/example/springdata/redis/cluster/ClusterConfigurationProperties.java
+++ b/redis/cluster/src/main/java/example/springdata/redis/cluster/ClusterConfigurationProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,12 +24,13 @@ import org.springframework.stereotype.Component;
  * Type safe representation of {@code spring.redis.cluster.*} properties in {@literal application.properties}.
  * 
  * @author Christoph Strobl
+ * @author Oliver Gierke
  */
 @Component
 @ConfigurationProperties(prefix = "spring.redis.cluster")
 public class ClusterConfigurationProperties {
 
-	List<String> nodes;
+	private List<String> nodes;
 
 	/**
 	 * Get initial collection of known cluster nodes in format {@code host:port}.
@@ -43,5 +44,4 @@ public class ClusterConfigurationProperties {
 	public void setNodes(List<String> nodes) {
 		this.nodes = nodes;
 	}
-
 }
diff --git a/redis/cluster/src/test/java/example/springdata/redis/cluster/BasicUsageTests.java b/redis/cluster/src/test/java/example/springdata/redis/cluster/BasicUsageTests.java
index 2a1c7365..5d3e9aea 100644
--- a/redis/cluster/src/test/java/example/springdata/redis/cluster/BasicUsageTests.java
+++ b/redis/cluster/src/test/java/example/springdata/redis/cluster/BasicUsageTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@ import static org.hamcrest.core.Is.*;
 import static org.hamcrest.core.IsCollectionContaining.*;
 import static org.junit.Assert.*;
 
+import example.springdata.redis.test.util.RequiresRedisServer;
+
 import java.util.Arrays;
 
 import org.junit.Before;
@@ -34,8 +36,6 @@ import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import example.springdata.redis.test.util.RequiresRedisServer;
-
 /**
  * {@link BasicUsageTests} shows general usage of {@link RedisTemplate} and {@link RedisOperations} in a clustered
  * environment.