diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/oxm/UnmarshallingFragmentDeserializerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/oxm/UnmarshallingFragmentDeserializerTests.java
index 47c2b8638..994c6deee 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/oxm/UnmarshallingFragmentDeserializerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/oxm/UnmarshallingFragmentDeserializerTests.java
@@ -4,10 +4,11 @@ import java.io.IOException;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
+import javax.xml.transform.Source;
 
 import junit.framework.TestCase;
 
-import org.easymock.MockControl;
+import static org.easymock.EasyMock.*;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.dao.DataAccessException;
@@ -27,15 +28,14 @@ public class UnmarshallingFragmentDeserializerTests extends TestCase {
 	private String xml = "<root> </root>";
 	
 	private Unmarshaller unmarshaller;
-	private MockControl unmarshallerControl = MockControl.createStrictControl(Unmarshaller.class);
 	
 	
 
 	protected void setUp() throws Exception {
 		Resource input = new ByteArrayResource(xml.getBytes());
 		eventReader = XMLInputFactory.newInstance().createXMLEventReader(input.getInputStream());
-		unmarshaller = (Unmarshaller) unmarshallerControl.getMock();
-		unmarshallerControl.setDefaultMatcher(MockControl.ALWAYS_MATCHER);
+		unmarshaller = createMock(Unmarshaller.class);
+		//unmarshallerControl.setDefaultMatcher(MockControl.ALWAYS_MATCHER);
 		deserializer = new UnmarshallingEventReaderDeserializer<Object>(unmarshaller);
 	}
 
@@ -44,24 +44,22 @@ public class UnmarshallingFragmentDeserializerTests extends TestCase {
 	 */
 	public void testSuccessfulDeserialization() throws Exception {
 		Object expectedResult = new Object();
-		unmarshaller.unmarshal(null);
-		unmarshallerControl.setReturnValue(expectedResult);
-		unmarshallerControl.replay();
+		expect(unmarshaller.unmarshal(isA(Source.class))).andReturn(expectedResult);
+		replay(unmarshaller);
 		
 		Object result = deserializer.deserializeFragment(eventReader);
 		
 		assertEquals(expectedResult, result);
 		
-		unmarshallerControl.verify();
+		verify(unmarshaller);
 	}
 	
 	/**
 	 * Appropriate exception rethrown in case of failure.
 	 */
 	public void testFailedDeserialization() throws Exception {
-		unmarshaller.unmarshal(null);
-		unmarshallerControl.setThrowable(new IOException());
-		unmarshallerControl.replay();
+		expect(unmarshaller.unmarshal(isA(Source.class))).andThrow(new IOException());
+		replay(unmarshaller);
 		
 		try {
 			deserializer.deserializeFragment(eventReader);
@@ -71,7 +69,7 @@ public class UnmarshallingFragmentDeserializerTests extends TestCase {
 			// expected
 		}
 		
-		unmarshallerControl.verify();
+		verify(unmarshaller);
 	}
 	
 	/**
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventReaderWrapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventReaderWrapperTests.java
index 54c76c04c..6aac51732 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventReaderWrapperTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventReaderWrapperTests.java
@@ -21,7 +21,7 @@ import javax.xml.stream.events.XMLEvent;
 
 import junit.framework.TestCase;
 
-import org.easymock.MockControl;
+import static org.easymock.EasyMock.*;
 
 import com.bea.xml.stream.events.StartDocumentEvent;
 
@@ -32,98 +32,92 @@ import com.bea.xml.stream.events.StartDocumentEvent;
 public class AbstractEventReaderWrapperTests extends TestCase {
 
 	AbstractEventReaderWrapper eventReaderWrapper;
-	MockControl mockEventReaderControl = MockControl.createControl(XMLEventReader.class);
 	XMLEventReader xmlEventReader;
 
 	protected void setUp() throws Exception {
 		super.setUp();
 
-		xmlEventReader = (XMLEventReader)mockEventReaderControl.getMock();
+		xmlEventReader = createMock(XMLEventReader.class);
 		eventReaderWrapper = new StubEventReader(xmlEventReader);
 	}
 
 	public void testClose() throws XMLStreamException {
 		xmlEventReader.close();
-		mockEventReaderControl.replay();
+		expectLastCall().once();
+		replay(xmlEventReader);
 		eventReaderWrapper.close();
-		mockEventReaderControl.verify();
+		verify(xmlEventReader);
 	}
 
 	public void testGetElementText() throws XMLStreamException {
 
 		String text = "text";
-		xmlEventReader.getElementText();
-		mockEventReaderControl.setReturnValue(text);
-		mockEventReaderControl.replay();
+		expect(xmlEventReader.getElementText()).andReturn(text);
+		replay(xmlEventReader);
 		assertEquals(eventReaderWrapper.getElementText(), text);
-		mockEventReaderControl.verify();
+		verify(xmlEventReader);
 	}
 
 	public void testGetProperty() throws IllegalArgumentException {
 
 		String text = "text";
-		xmlEventReader.getProperty("name");
-		mockEventReaderControl.setReturnValue(text);
-		mockEventReaderControl.replay();
+		expect(xmlEventReader.getProperty("name")).andReturn(text);
+		replay(xmlEventReader);
 		assertEquals(eventReaderWrapper.getProperty("name"), text);
-		mockEventReaderControl.verify();
+		verify(xmlEventReader);
 	}
 
 	public void testHasNext() {
 
-		xmlEventReader.hasNext();
-		mockEventReaderControl.setReturnValue(true);
-		mockEventReaderControl.replay();
+		expect(xmlEventReader.hasNext()).andReturn(true);
+		replay(xmlEventReader);
 		assertTrue(eventReaderWrapper.hasNext());
-		mockEventReaderControl.verify();
+		verify(xmlEventReader);
 	}
 
 	public void testNext() {
 
 		String text = "text";
-		xmlEventReader.next();
-		mockEventReaderControl.setReturnValue(text);
-		mockEventReaderControl.replay();
+		expect(xmlEventReader.next()).andReturn(text);
+		replay(xmlEventReader);
 		assertEquals(eventReaderWrapper.next(), text);
-		mockEventReaderControl.verify();
+		verify(xmlEventReader);
 	}
 
 	public void testNextEvent() throws XMLStreamException {
 
 		XMLEvent event = new StartDocumentEvent();
-		xmlEventReader.nextEvent();
-		mockEventReaderControl.setReturnValue(event);
-		mockEventReaderControl.replay();
+		expect(xmlEventReader.nextEvent()).andReturn(event);
+		replay(xmlEventReader);
 		assertEquals(eventReaderWrapper.nextEvent(), event);
-		mockEventReaderControl.verify();
+		verify(xmlEventReader);
 	}
 
 	public void testNextTag() throws XMLStreamException {
 
 		XMLEvent event = new StartDocumentEvent();
-		xmlEventReader.nextTag();
-		mockEventReaderControl.setReturnValue(event);
-		mockEventReaderControl.replay();
+		expect(xmlEventReader.nextTag()).andReturn(event);
+		replay(xmlEventReader);
 		assertEquals(eventReaderWrapper.nextTag(), event);
-		mockEventReaderControl.verify();
+		verify(xmlEventReader);
 	}
 
 	public void testPeek() throws XMLStreamException {
 
 		XMLEvent event = new StartDocumentEvent();
-		xmlEventReader.peek();
-		mockEventReaderControl.setReturnValue(event);
-		mockEventReaderControl.replay();
+		expect(xmlEventReader.peek()).andReturn(event);
+		replay(xmlEventReader);
 		assertEquals(eventReaderWrapper.peek(), event);
-		mockEventReaderControl.verify();
+		verify(xmlEventReader);
 	}
 
 	public void testRemove() {
 
 		xmlEventReader.remove();
-		mockEventReaderControl.replay();
+		expectLastCall().once();
+		replay(xmlEventReader);
 		eventReaderWrapper.remove();
-		mockEventReaderControl.verify();
+		verify(xmlEventReader);
 	}
 
 	private static class StubEventReader extends AbstractEventReaderWrapper{
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventWriterWrapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventWriterWrapperTests.java
index 0cc337c85..890717ad8 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventWriterWrapperTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventWriterWrapperTests.java
@@ -23,25 +23,25 @@ import javax.xml.stream.events.XMLEvent;
 
 import junit.framework.TestCase;
 
-import org.easymock.MockControl;
+import static org.easymock.EasyMock.*;
 
 import com.bea.xml.stream.events.StartDocumentEvent;
 import com.bea.xml.stream.util.NamespaceContextImpl;
 
 /**
  * @author Lucas Ward
- *
+ * 
  */
 public class AbstractEventWriterWrapperTests extends TestCase {
 
 	AbstractEventWriterWrapper eventWriterWrapper;
-	MockControl mockEventWriterControl = MockControl.createControl(XMLEventWriter.class);
+
 	XMLEventWriter xmlEventWriter;
 
 	protected void setUp() throws Exception {
 		super.setUp();
 
-		xmlEventWriter = (XMLEventWriter)mockEventWriterControl.getMock();
+		xmlEventWriter = createMock(XMLEventWriter.class);
 		eventWriterWrapper = new StubEventWriter(xmlEventWriter);
 	}
 
@@ -49,71 +49,72 @@ public class AbstractEventWriterWrapperTests extends TestCase {
 
 		XMLEvent event = new StartDocumentEvent();
 		xmlEventWriter.add(event);
-		mockEventWriterControl.replay();
+		expectLastCall();
+		replay(xmlEventWriter);
 		eventWriterWrapper.add(event);
-		mockEventWriterControl.verify();
+		verify(xmlEventWriter);
 
 	}
 
 	public void testAddReader() throws XMLStreamException {
 
-		MockControl readerControl = MockControl.createControl(XMLEventReader.class);
-		XMLEventReader reader = (XMLEventReader)readerControl.getMock();
+		XMLEventReader reader = createMock(XMLEventReader.class);
 		xmlEventWriter.add(reader);
-		mockEventWriterControl.replay();
+		expectLastCall().once();
+		replay(xmlEventWriter);
 		eventWriterWrapper.add(reader);
-		mockEventWriterControl.verify();
+		verify(xmlEventWriter);
 	}
 
 	public void testClose() throws XMLStreamException {
 		xmlEventWriter.close();
-		mockEventWriterControl.replay();
+		expectLastCall().once();
+		replay(xmlEventWriter);
 		eventWriterWrapper.close();
-		mockEventWriterControl.verify();
+		verify(xmlEventWriter);
 	}
 
 	public void testFlush() throws XMLStreamException {
 		xmlEventWriter.flush();
-		mockEventWriterControl.replay();
+		expectLastCall().once();
+		replay(xmlEventWriter);
 		eventWriterWrapper.flush();
-		mockEventWriterControl.verify();
+		verify(xmlEventWriter);
 	}
 
 	public void testGetNamespaceContext() {
 		NamespaceContext context = new NamespaceContextImpl();
-		xmlEventWriter.getNamespaceContext();
-		mockEventWriterControl.setReturnValue(context);
-		mockEventWriterControl.replay();
+		expect(xmlEventWriter.getNamespaceContext()).andReturn(context);
+		replay(xmlEventWriter);
 		assertEquals(eventWriterWrapper.getNamespaceContext(), context);
-		mockEventWriterControl.verify();
+		verify(xmlEventWriter);
 	}
 
 	public void testGetPrefix() throws XMLStreamException {
-
 		String uri = "uri";
-		xmlEventWriter.getPrefix(uri);
-		mockEventWriterControl.setReturnValue(uri);
-		mockEventWriterControl.replay();
+		expect(xmlEventWriter.getPrefix(uri)).andReturn(uri);
+		replay(xmlEventWriter);
 		assertEquals(eventWriterWrapper.getPrefix(uri), uri);
-		mockEventWriterControl.verify();
+		verify(xmlEventWriter);
 	}
 
 	public void testSetDefaultNamespace() throws XMLStreamException {
 		String uri = "uri";
 		xmlEventWriter.setDefaultNamespace(uri);
-		mockEventWriterControl.replay();
+		expectLastCall().once();
+		replay(xmlEventWriter);
 		eventWriterWrapper.setDefaultNamespace(uri);
-		mockEventWriterControl.verify();
+		verify(xmlEventWriter);
 	}
 
-	public void testSetNamespaceContext()
-			throws XMLStreamException {
+	public void testSetNamespaceContext() throws XMLStreamException {
 
 		NamespaceContext context = new NamespaceContextImpl();
 		xmlEventWriter.setNamespaceContext(context);
-		mockEventWriterControl.replay();
+		expectLastCall().once();
+		replay(xmlEventWriter);
 		eventWriterWrapper.setNamespaceContext(context);
-		mockEventWriterControl.verify();
+		verify(xmlEventWriter);
 	}
 
 	public void testSetPrefix() throws XMLStreamException {
@@ -121,12 +122,13 @@ public class AbstractEventWriterWrapperTests extends TestCase {
 		String uri = "uri";
 		String prefix = "prefix";
 		xmlEventWriter.setPrefix(prefix, uri);
-		mockEventWriterControl.replay();
+		expectLastCall().once();
+		replay(xmlEventWriter);
 		eventWriterWrapper.setPrefix(prefix, uri);
-		mockEventWriterControl.verify();
+		verify(xmlEventWriter);
 	}
 
-	private static class StubEventWriter extends AbstractEventWriterWrapper{
+	private static class StubEventWriter extends AbstractEventWriterWrapper {
 		public StubEventWriter(XMLEventWriter wrappedEventWriter) {
 			super(wrappedEventWriter);
 		}
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/NoStartEndDocumentWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/NoStartEndDocumentWriterTests.java
index d5c37a408..1a67550bf 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/NoStartEndDocumentWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/NoStartEndDocumentWriterTests.java
@@ -6,7 +6,7 @@ import javax.xml.stream.events.XMLEvent;
 
 import junit.framework.TestCase;
 
-import org.easymock.MockControl;
+import static org.easymock.EasyMock.*;
 
 /**
  * Tests for {@link NoStartEndDocumentStreamWriter}
@@ -17,34 +17,32 @@ public class NoStartEndDocumentWriterTests extends TestCase {
 
 	// object under test
 	private NoStartEndDocumentStreamWriter writer;
-	
+
 	private XMLEventWriter wrappedWriter;
-	private MockControl wrappedWriterControl = MockControl.createStrictControl(XMLEventWriter.class);
-	
+
 	private XMLEventFactory eventFactory = XMLEventFactory.newInstance();
-	
-	
+
 	protected void setUp() throws Exception {
-		wrappedWriter = (XMLEventWriter) wrappedWriterControl.getMock();
+		wrappedWriter = createStrictMock(XMLEventWriter.class);
 		writer = new NoStartEndDocumentStreamWriter(wrappedWriter);
 	}
 
-
 	/**
-	 * StartDocument and EndDocument events are not passed to the wrapped writer.
+	 * StartDocument and EndDocument events are not passed to the wrapped
+	 * writer.
 	 */
 	public void testNoStartEnd() throws Exception {
 		XMLEvent event = eventFactory.createComment("testEvent");
-		
-		//mock expects only a single event
+
+		// mock expects only a single event
 		wrappedWriter.add(event);
-		wrappedWriterControl.setVoidCallable();
-		wrappedWriterControl.replay();
-		
+		expectLastCall().once();
+		replay(wrappedWriter);
+
 		writer.add(eventFactory.createStartDocument());
 		writer.add(event);
 		writer.add(eventFactory.createEndDocument());
-		
-		wrappedWriterControl.verify();
+
+		verify(wrappedWriter);
 	}
 }