diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/serializer/SimpleRedisSerializerTest.java b/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/serializer/SimpleRedisSerializerTests.java
similarity index 98%
rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/serializer/SimpleRedisSerializerTest.java
rename to spring-datastore-redis/src/test/java/org/springframework/datastore/redis/serializer/SimpleRedisSerializerTests.java
index f4eb31688..cbe1f2538 100644
--- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/serializer/SimpleRedisSerializerTest.java
+++ b/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/serializer/SimpleRedisSerializerTests.java
@@ -27,7 +27,7 @@ import org.springframework.datastore.redis.Address;
 import org.springframework.datastore.redis.Person;
 
 
-public class SimpleRedisSerializerTest {
+public class SimpleRedisSerializerTests {
 
 	private static class A implements Serializable {
 		private Integer value = Integer.valueOf(30);
diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisCollectionTest.java b/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisCollectionTests.java
similarity index 99%
rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisCollectionTest.java
rename to spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisCollectionTests.java
index fc2714f45..1365996f2 100644
--- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisCollectionTest.java
+++ b/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisCollectionTests.java
@@ -41,7 +41,7 @@ import org.junit.Test;
  *  
  * @author Costin Leau
  */
-public abstract class AbstractRedisCollectionTest<T> {
+public abstract class AbstractRedisCollectionTests<T> {
 
 	protected AbstractRedisCollection<T> collection;
 
diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisListTest.java b/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisListTests.java
similarity index 98%
rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisListTest.java
rename to spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisListTests.java
index 8852c85cd..9f4f135ac 100644
--- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisListTest.java
+++ b/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/AbstractRedisListTests.java
@@ -29,7 +29,7 @@ import org.junit.Test;
  * 
  * @author Costin Leau
  */
-public abstract class AbstractRedisListTest<T> extends AbstractRedisCollectionTest<T> {
+public abstract class AbstractRedisListTests<T> extends AbstractRedisCollectionTests<T> {
 
 	protected RedisList<T> list;
 
diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/PersonRedisListTest.java b/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/PersonRedisListTests.java
similarity index 96%
rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/PersonRedisListTest.java
rename to spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/PersonRedisListTests.java
index 51454bc68..4feeffdb5 100644
--- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/PersonRedisListTest.java
+++ b/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/PersonRedisListTests.java
@@ -28,7 +28,7 @@ import org.springframework.datastore.redis.core.RedisTemplate;
  * 
  * @author Costin Leau
  */
-public class PersonRedisListTest extends AbstractRedisListTest<Person> {
+public class PersonRedisListTests extends AbstractRedisListTests<Person> {
 
 	private JedisConnectionFactory factory;
 	private int counter = 0;
diff --git a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/StringRedisListTest.java b/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/StringRedisListTests.java
similarity index 95%
rename from spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/StringRedisListTest.java
rename to spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/StringRedisListTests.java
index 148927012..b0a907c41 100644
--- a/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/StringRedisListTest.java
+++ b/spring-datastore-redis/src/test/java/org/springframework/datastore/redis/util/StringRedisListTests.java
@@ -27,7 +27,7 @@ import org.springframework.datastore.redis.core.RedisTemplate;
  * 
  * @author Costin Leau
  */
-public class StringRedisListTest extends AbstractRedisListTest<String> {
+public class StringRedisListTests extends AbstractRedisListTests<String> {
 
 	private JedisConnectionFactory factory;