diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaPagingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaPagingItemReader.java
index bb82b5849..87cf6f5f0 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaPagingItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaPagingItemReader.java
@@ -16,21 +16,22 @@
 
 package org.springframework.batch.item.database;
 
-import org.springframework.batch.item.support.AbstractBufferedItemReaderItemStream;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.Assert;
-import org.springframework.orm.jpa.EntityManagerFactoryUtils;
-import org.springframework.dao.DataAccessResourceFailureException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
-import javax.persistence.EntityManager;
-import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Query;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.batch.item.support.AbstractBufferedItemReaderItemStream;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.orm.jpa.EntityManagerFactoryUtils;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 
 /**
  * {@link org.springframework.batch.item.ItemReader} for reading database records built on top of JPA.
@@ -59,7 +60,7 @@ public class JpaPagingItemReader<T> extends AbstractBufferedItemReaderItemStream
 
 	private EntityManagerFactory entityManagerFactory;
 
-	private final Map jpaPropertyMap = new HashMap();
+	private final Map<String,Object> jpaPropertyMap = new HashMap<String,Object>();
 
 	private String queryString;
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/CommonItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/CommonItemReaderTests.java
index 051457044..150256235 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/CommonItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/CommonItemReaderTests.java
@@ -1,11 +1,10 @@
 package org.springframework.batch.item;
 
-import static org.junit.Assert.*;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 import org.junit.Before;
-
-import junit.framework.TestCase;
-
+import org.junit.Test;
 import org.springframework.batch.item.sample.Foo;
 
 /**