diff --git a/spring-data-redis/.classpath b/spring-data-redis/.classpath
index db8601f3f..f05397d51 100644
--- a/spring-data-redis/.classpath
+++ b/spring-data-redis/.classpath
@@ -6,6 +6,6 @@
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/spring-data-keyvalue-core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/spring-data-core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/CollectionTestParams.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/CollectionTestParams.java
index 0802607e1..4464c94ae 100644
--- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/CollectionTestParams.java
+++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/CollectionTestParams.java
@@ -103,9 +103,9 @@ public abstract class CollectionTestParams {
 		xstreamPersonTemplateJR.afterPropertiesSet();
 
 		RedisTemplate<String, Person> jsonPersonTemplateJR = new RedisTemplate<String, Person>();
-		jsonPersonTemplate.setValueSerializer(jsonSerializer);
-		jsonPersonTemplate.setConnectionFactory(jredisConnFactory);
-		jsonPersonTemplate.afterPropertiesSet();
+		jsonPersonTemplateJR.setValueSerializer(jsonSerializer);
+		jsonPersonTemplateJR.setConnectionFactory(jredisConnFactory);
+		jsonPersonTemplateJR.afterPropertiesSet();
 
 
 		// rjc
diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisMapTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisMapTests.java
index a2d9e449b..e9807ef68 100644
--- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisMapTests.java
+++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/support/collections/RedisMapTests.java
@@ -25,7 +25,6 @@ import org.springframework.data.keyvalue.redis.connection.jedis.JedisConnectionF
 import org.springframework.data.keyvalue.redis.connection.jredis.JredisConnectionFactory;
 import org.springframework.data.keyvalue.redis.connection.rjc.RjcConnectionFactory;
 import org.springframework.data.keyvalue.redis.core.RedisTemplate;
-import org.springframework.data.keyvalue.redis.core.StringRedisTemplate;
 import org.springframework.data.keyvalue.redis.serializer.JacksonJsonRedisSerializer;
 import org.springframework.data.keyvalue.redis.serializer.OxmSerializer;
 import org.springframework.oxm.xstream.XStreamMarshaller;
@@ -66,13 +65,13 @@ public class RedisMapTests extends AbstractRedisMapTests<Object, Object> {
 
 		JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory();
 		jedisConnFactory.setUsePool(false);
-
 		jedisConnFactory.setPort(SettingsUtils.getPort());
 		jedisConnFactory.setHostName(SettingsUtils.getHost());
-
 		jedisConnFactory.afterPropertiesSet();
 
-		RedisTemplate<String, String> genericTemplate = new StringRedisTemplate(jedisConnFactory);
+		RedisTemplate genericTemplate = new RedisTemplate();
+		genericTemplate.setConnectionFactory(jedisConnFactory);
+		genericTemplate.afterPropertiesSet();
 
 		RedisTemplate<String, String> xstreamGenericTemplate = new RedisTemplate<String, String>();
 		xstreamGenericTemplate.setConnectionFactory(jedisConnFactory);
@@ -93,7 +92,10 @@ public class RedisMapTests extends AbstractRedisMapTests<Object, Object> {
 		jredisConnFactory.setHostName(SettingsUtils.getHost());
 		jredisConnFactory.afterPropertiesSet();
 
-		RedisTemplate<String, String> genericTemplateJR = new StringRedisTemplate(jredisConnFactory);
+		RedisTemplate genericTemplateJR = new RedisTemplate();
+		genericTemplateJR.setConnectionFactory(jredisConnFactory);
+		genericTemplateJR.afterPropertiesSet();
+
 		RedisTemplate<String, Person> xGenericTemplateJR = new RedisTemplate<String, Person>();
 		xGenericTemplateJR.setConnectionFactory(jredisConnFactory);
 		xGenericTemplateJR.setDefaultSerializer(serializer);
@@ -115,7 +117,10 @@ public class RedisMapTests extends AbstractRedisMapTests<Object, Object> {
 		rjcConnFactory.setHostName(SettingsUtils.getHost());
 		rjcConnFactory.afterPropertiesSet();
 
-		RedisTemplate<String, String> genericTemplateRJC = new StringRedisTemplate(jredisConnFactory);
+		RedisTemplate genericTemplateRJC = new RedisTemplate();
+		genericTemplateRJC.setConnectionFactory(rjcConnFactory);
+		genericTemplateRJC.afterPropertiesSet();
+
 		RedisTemplate<String, Person> xGenericTemplateRJC = new RedisTemplate<String, Person>();
 		xGenericTemplateRJC.setConnectionFactory(rjcConnFactory);
 		xGenericTemplateRJC.setDefaultSerializer(serializer);