diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/CustomItemReaderTest.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java
similarity index 98%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/CustomItemReaderTest.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java
index 542cb007f..45c7bbfbc 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/CustomItemReaderTest.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java
@@ -37,7 +37,7 @@ import junit.framework.TestCase;
  * @author Lucas Ward
  *
  */
-public class CustomItemReaderTest extends TestCase {
+public class CustomItemReaderTests extends TestCase {
 
 	ItemReader<String> itemReader;
 	
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/CustomItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java
similarity index 100%
rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/common/CustomItemWriterTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java