diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/MultipleColumnJdbcKeyCollector.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/MultipleColumnJdbcKeyCollector.java
index 93f7fb153..fd5fecf4f 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/MultipleColumnJdbcKeyCollector.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/MultipleColumnJdbcKeyCollector.java
@@ -154,7 +154,7 @@ public class MultipleColumnJdbcKeyCollector extends ExecutionContextUserSupport
 		this.preparedStatementSetter = preparedStatementSetter;
 	}
 	
-	private class PreparedStatementSetterKeyWrapper implements PreparedStatementSetter{
+	private static class PreparedStatementSetterKeyWrapper implements PreparedStatementSetter{
 		
 		private Object key;
 		private ItemPreparedStatementSetter pss;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
index efa510945..605f0539e 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
@@ -91,12 +91,13 @@ public class StaxEventItemReader extends ExecutionContextUserSupport implements
 
 	public void close(ExecutionContext executionContext) {
 		initialized = false;
-		if (fragmentReader == null && inputStream == null) {
-			return;
-		}
 		try {
-			fragmentReader.close();
-			inputStream.close();
+			if (fragmentReader != null) {
+				fragmentReader.close();
+			}
+			if (inputStream != null) {
+				inputStream.close();
+			}
 		}
 		catch (XMLStreamException e) {
 			throw new DataAccessResourceFailureException("Error while closing event reader", e);
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderBasicTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderBasicTests.java
index 82f74aa5e..542cf625b 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderBasicTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderBasicTests.java
@@ -319,7 +319,7 @@ public class FlatFileItemReaderBasicTests extends TestCase {
 		return str.indexOf(searchStr) != -1;
 	}
 
-	private class NonExistentResource extends AbstractResource {
+	private static class NonExistentResource extends AbstractResource {
 
 		public NonExistentResource() {
 		}
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java
index 4f2426b49..b49cef499 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java
@@ -10,7 +10,7 @@ import org.springframework.core.io.Resource;
 
 public class FlatFileItemReaderCommonTests extends CommonItemStreamItemReaderTests {
 
-	private final String FOOS = "1 \n 2 \n 3 \n 4 \n 5 \n"; 
+	private static final String FOOS = "1 \n 2 \n 3 \n 4 \n 5 \n"; 
 	
 	protected ItemReader getItemReader() throws Exception {
 		FlatFileItemReader tested = new FlatFileItemReader();
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java
index 2c74f0a52..955109755 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java
@@ -54,16 +54,16 @@ public class ItemTransformerItemWriterFunctionalTests extends TestCase {
 		itemTransformerItemWriter.write(new Foo());
 	}
 	
-	public class Foo {
+	private static class Foo {
 		
 	}
 	
-	public class Bar {
+	private static class Bar {
 		public Bar(Foo foo) {
 		}
 	}
 	
-	public class Foobar{
+	private static class Foobar{
 		public Foobar(Bar bar){}
 	}
 	
@@ -85,7 +85,7 @@ public class ItemTransformerItemWriterFunctionalTests extends TestCase {
 		}
 	}
 	
-	public class BarWriter implements ItemWriter{
+	private static class BarWriter implements ItemWriter{
 
 		public void write(Object item) throws Exception {
 		  assertTrue(item instanceof Bar);
@@ -99,7 +99,7 @@ public class ItemTransformerItemWriterFunctionalTests extends TestCase {
 		
 	}
 	
-	public class FoobarWriter implements ItemWriter{
+	private static class FoobarWriter implements ItemWriter{
 
 		public void write(Object item) throws Exception {
 		  assertTrue(item instanceof Foobar);
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java
index 2bad8a762..09344f0eb 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java
@@ -222,7 +222,7 @@ public class StaxEventItemReaderTests extends TestCase {
 		newSource.setOpenCalled(false);
 		// calling read again should require re-initialization because of close
 		try {
-			item = newSource.read();
+			newSource.read();
 			fail("Expected ReaderNotOpenException");
 		} catch (ReaderNotOpenException e) {
 			// expected
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetrySynchronizationManagerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetrySynchronizationManagerTests.java
index 8f6902345..5455891c7 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetrySynchronizationManagerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetrySynchronizationManagerTests.java
@@ -29,8 +29,6 @@ import org.springframework.batch.retry.support.RetryTemplate;
  */
 public class RetrySynchronizationManagerTests extends TestCase {
 
-	int count = 0;
-
 	RetryTemplate template = new RetryTemplate();
 
 	protected void setUp() throws Exception {