diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditIncreaseProcessorTests.java
similarity index 95%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditIncreaseProcessorTests.java
index c5ae81619..4851c6b10 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditIncreaseProcessorTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.domain.trade;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapperTests.java
similarity index 90%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapperTests.java
index 7d1165a0c..36b191cb5 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapperTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.domain.trade;
 
 import java.math.BigDecimal;
 import java.sql.ResultSet;
@@ -7,6 +7,7 @@ import java.sql.SQLException;
 import org.easymock.MockControl;
 import org.springframework.batch.sample.domain.trade.CustomerCredit;
 import org.springframework.batch.sample.domain.trade.CustomerCreditRowMapper;
+import org.springframework.batch.sample.mapping.AbstractRowMapperTests;
 import org.springframework.jdbc.core.RowMapper;
 
 public class CustomerCreditRowMapperTests extends AbstractRowMapperTests {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdatePreparedStatementSetterTests.java
similarity index 97%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetterTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdatePreparedStatementSetterTests.java
index 99a41cc51..9ba5f935c 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdatePreparedStatementSetterTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.domain.trade;
 
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdateProcessorTests.java
similarity index 96%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdateProcessorTests.java
index d938711b7..50b67db4b 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdateProcessorTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.domain.trade;
 
 import java.math.BigDecimal;
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java
similarity index 95%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java
index c7823e4dd..8f48b3b17 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.domain.trade;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/GeneratingItemReaderTests.java
similarity index 93%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/GeneratingItemReaderTests.java
index ab0985f18..d599785b4 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/GeneratingItemReaderTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.item.reader;
+package org.springframework.batch.sample.domain.trade;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeFieldSetMapperTests.java
similarity index 93%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeFieldSetMapperTests.java
index adde4f95e..1f4258f7e 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeFieldSetMapperTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.domain.trade;
 
 import static org.junit.Assert.assertEquals;
 
@@ -11,6 +11,7 @@ import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.support.AggregateItemReader;
 import org.springframework.batch.sample.domain.trade.Trade;
 import org.springframework.batch.sample.domain.trade.TradeFieldSetMapper;
+import org.springframework.batch.sample.mapping.AbstractFieldSetMapperTests;
 
 public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests {
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeProcessorTests.java
similarity index 94%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeProcessorTests.java
index c40ed44ae..ab961b000 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeProcessorTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.domain.trade;
 
 import org.easymock.MockControl;
 import org.junit.Before;
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeRowMapperTests.java
similarity index 91%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeRowMapperTests.java
index 179935dee..129c1f9da 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeRowMapperTests.java
@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.domain.trade;
 
 import java.math.BigDecimal;
 import java.sql.ResultSet;
@@ -7,6 +7,7 @@ import java.sql.SQLException;
 import org.easymock.MockControl;
 import org.springframework.batch.sample.domain.trade.Trade;
 import org.springframework.batch.sample.domain.trade.TradeRowMapper;
+import org.springframework.batch.sample.mapping.AbstractRowMapperTests;
 import org.springframework.jdbc.core.RowMapper;
 
 public class TradeRowMapperTests extends AbstractRowMapperTests {