diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/XStreamMarshallingTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/XStreamMarshallingTests.java
index 1a5272d7a..2d58d12bc 100644
--- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/XStreamMarshallingTests.java
+++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/XStreamMarshallingTests.java
@@ -4,12 +4,15 @@ import org.springframework.batch.item.xml.domain.Trade;
 import org.springframework.oxm.Marshaller;
 import org.springframework.oxm.xstream.XStreamMarshaller;
 
+import java.util.Collections;
+
 public class XStreamMarshallingTests extends
 		AbstractStaxEventWriterItemWriterTests {
 
 	protected Marshaller getMarshaller() throws Exception {
 		XStreamMarshaller marshaller = new XStreamMarshaller();
-		marshaller.addAlias("trade", Trade.class);
+//		marshaller.addAlias("trade", Trade.class);
+		marshaller.setAliases(Collections.singletonMap("trade", Trade.class));
 		//in XStreamMarshaller.marshalSaxHandlers() method is used SaxWriter, which is configured
 		//to include enclosing document (SaxWriter.includeEnclosingDocument is always set to TRUE) 
 		return marshaller;
diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/XStreamUnmarshallingTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/XStreamUnmarshallingTests.java
index cf4a87ef8..3786cfee9 100644
--- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/XStreamUnmarshallingTests.java
+++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/XStreamUnmarshallingTests.java
@@ -1,6 +1,8 @@
 package org.springframework.batch.item.xml;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.springframework.batch.item.xml.domain.Trade;
 import org.springframework.oxm.Unmarshaller;
@@ -10,10 +12,16 @@ public class XStreamUnmarshallingTests extends AbstractStaxEventReaderItemReader
 
 	protected Unmarshaller getUnmarshaller() throws Exception {
 		XStreamMarshaller unmarshaller = new XStreamMarshaller();
-		unmarshaller.addAlias("trade", Trade.class);
+		Map<String,Class> aliasesMap = new HashMap<String,Class>();
+		aliasesMap.put("trade", Trade.class);
+		aliasesMap.put("isin", String.class);
+		aliasesMap.put("customer", String.class);
+		aliasesMap.put("price", BigDecimal.class);
+		/*unmarshaller.addAlias("trade", Trade.class);
 		unmarshaller.addAlias("isin", String.class);
 		unmarshaller.addAlias("customer", String.class);
-		unmarshaller.addAlias("price", BigDecimal.class);
+		unmarshaller.addAlias("price", BigDecimal.class);*/
+		unmarshaller.setAliases(aliasesMap);
 		return unmarshaller;
 	}