diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java
index ea5f7b59a..5c506a699 100644
--- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java
+++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java
@@ -43,8 +43,6 @@ public class BatchMessageListenerContainerTests {
 
 	BatchMessageListenerContainer container;
 
-	int count = 0;
-
 	@Test
 	public void testReceiveAndExecuteWithCallback() throws Exception {
 		RepeatTemplate template = new RepeatTemplate();
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java
index bf9d69e86..d8dba01c9 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java
@@ -76,7 +76,7 @@ public class CustomItemReaderTests extends TestCase {
 		assertEquals("2", itemReader.read());
 	}
 
-	public class CustomItemReader<T> implements ItemReader<T>, ItemStream {
+	public static class CustomItemReader<T> implements ItemReader<T>, ItemStream {
 
 		List<T> items;
 		int currentIndex = 0;
@@ -97,7 +97,7 @@ public class CustomItemReaderTests extends TestCase {
 		
 		public void open(ExecutionContext executionContext) throws ItemStreamException {
 			if(executionContext.containsKey(CURRENT_INDEX)){
-				currentIndex = new Long(executionContext.getLong(CURRENT_INDEX)).intValue();
+				currentIndex = executionContext.getInt(CURRENT_INDEX);
 			}
 			else{
 				currentIndex = 0;
@@ -107,7 +107,7 @@ public class CustomItemReaderTests extends TestCase {
 		public void close(ExecutionContext executionContext) throws ItemStreamException {}
 
 		public void update(ExecutionContext executionContext) throws ItemStreamException {
-			executionContext.putLong(CURRENT_INDEX, new Long(currentIndex).longValue());
+			executionContext.putInt(CURRENT_INDEX, currentIndex);
 		};
 		
 	}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java
index ad3d690a6..66dff1a53 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java
@@ -45,7 +45,7 @@ public class CustomItemWriterTests {
 		assertEquals(3, itemWriter.getOutput().size());
 	}
 
-	public class CustomItemWriter<T> implements ItemWriter<T> {
+	public static class CustomItemWriter<T> implements ItemWriter<T> {
 
 		List<T> output = TransactionAwareProxyFactory.createTransactionalList();
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java
index d7c8423c2..84e4b4571 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java
@@ -52,7 +52,6 @@ public class AggregateItemReaderTests {
 		Object result = provider.read();
 
 		// it should be collection of 3 strings "line"
-		assertTrue(result instanceof Collection);
 		Collection<?> lines = (Collection<?>) result;
 		assertEquals(3, lines.size());
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java
index f32209533..27198592f 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java
@@ -106,8 +106,6 @@ public class OrderItemReaderTests {
 
 		// verify result
 		assertNotNull(result);
-		// result should be Order
-		assertTrue(result instanceof Order);
 
 		// verify whether order is constructed correctly
 		// Order object should contain same instances as returned by mapper