diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java
index 3987d0461..213200d55 100644
--- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java
+++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java
@@ -16,27 +16,26 @@ import org.springframework.oxm.Unmarshaller;
 
 public abstract class AbstractStaxEventReaderItemReaderTests extends TestCase {
 
-	private StaxEventItemReader source = new StaxEventItemReader();
-
-	protected Resource resource = new ClassPathResource(
-	"org/springframework/batch/io/oxm/input.xml");
+	private StaxEventItemReader<Trade> source = new StaxEventItemReader<Trade>();
 
+	protected Resource resource = new ClassPathResource("org/springframework/batch/io/oxm/input.xml");
 
 	protected void setUp() throws Exception {
-		//TODO sensible resource allocation
+		// TODO sensible resource allocation
 		source.setResource(resource);
 
 		source.setFragmentRootElementName("trade");
-		UnmarshallingEventReaderDeserializer deserializer = new UnmarshallingEventReaderDeserializer(getUnmarshaller());
+		UnmarshallingEventReaderDeserializer<Trade> deserializer = new UnmarshallingEventReaderDeserializer<Trade>(
+				getUnmarshaller());
 		source.setFragmentDeserializer(deserializer);
-	
+
 		source.open(new ExecutionContext());
 
 	}
 
 	public void testRead() throws Exception {
-		Object result;
-		List<Object> results = new ArrayList<Object>();
+		Trade result;
+		List<Trade> results = new ArrayList<Trade>();
 		while ((result = source.read()) != null) {
 			results.add(result);
 		}
@@ -52,22 +51,22 @@ public abstract class AbstractStaxEventReaderItemReaderTests extends TestCase {
 	/**
 	 * @param results list of domain objects returned by input source
 	 */
-	protected void checkResults(List<Object> results){
+	protected void checkResults(List<Trade> results) {
 		assertEquals(3, results.size());
 
-		Trade trade1 = (Trade) results.get(0);
+		Trade trade1 = results.get(0);
 		assertEquals("XYZ0001", trade1.getIsin());
 		assertEquals(5, trade1.getQuantity());
 		assertEquals(new BigDecimal("11.39"), trade1.getPrice());
 		assertEquals("Customer1", trade1.getCustomer());
 
-		Trade trade2 = (Trade) results.get(1);
+		Trade trade2 = results.get(1);
 		assertEquals("XYZ0002", trade2.getIsin());
 		assertEquals(2, trade2.getQuantity());
 		assertEquals(new BigDecimal("72.99"), trade2.getPrice());
 		assertEquals("Customer2", trade2.getCustomer());
 
-		Trade trade3 = (Trade) results.get(2);
+		Trade trade3 = results.get(2);
 		assertEquals("XYZ0003", trade3.getIsin());
 		assertEquals(9, trade3.getQuantity());
 		assertEquals(new BigDecimal("99.99"), trade3.getPrice());
diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java
index 11e356608..2c4bd0978 100644
--- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java
+++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java
@@ -144,7 +144,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte
 
 		assertInitialState();
 
-		JmsItemReader provider = new JmsItemReader();
+		JmsItemReader<Object> provider = new JmsItemReader<Object>();
 		// provider.setItemType(Message.class);
 		provider.setJmsTemplate(jmsTemplate);
 		jmsTemplate.setDefaultDestinationName("queue");
diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/retry/jms/SynchronousTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/retry/jms/SynchronousTests.java
index aedfb4af7..e62ad837b 100644
--- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/retry/jms/SynchronousTests.java
+++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/retry/jms/SynchronousTests.java
@@ -137,7 +137,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte
 
 		assertInitialState();
 
-		JmsItemReader provider = new JmsItemReader();
+		JmsItemReader<Object> provider = new JmsItemReader<Object>();
 		// provider.setItemType(Message.class);
 		provider.setJmsTemplate(jmsTemplate);
 		jmsTemplate.setDefaultDestinationName("queue");