diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobListenerAnnotationBeanPostProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobListenerAnnotationBeanPostProcessor.java
index 1d5fb05e8..da49d4cca 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobListenerAnnotationBeanPostProcessor.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/JobListenerAnnotationBeanPostProcessor.java
@@ -55,7 +55,7 @@ public class JobListenerAnnotationBeanPostProcessor implements BeanPostProcessor
 		return null;
 	}
 	
-	private class BeforeJobProxy extends JobExecutionListenerSupport{
+	private static class BeforeJobProxy extends JobExecutionListenerSupport{
 		
 		Method method;
 		Object bean;
@@ -83,7 +83,7 @@ public class JobListenerAnnotationBeanPostProcessor implements BeanPostProcessor
 		}
 	}
 	
-	private class AfterJobProxy extends JobExecutionListenerSupport{
+	private static class AfterJobProxy extends JobExecutionListenerSupport{
 		
 		Method method;
 		Object bean;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerFactoryBean.java
index 5141d58f5..7a12e17b2 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerFactoryBean.java
@@ -129,7 +129,7 @@ public class StepListenerFactoryBean implements FactoryBean, InitializingBean{
 	 * Extension of HashSet that ignores nulls, rather than putting them into
 	 * the set.
 	 */
-	private class NullIgnoringSet<E> extends HashSet<E>{
+	private static class NullIgnoringSet<E> extends HashSet<E>{
 		
 		@Override
 		public boolean add(E e) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java
index 62ca2cbd3..20ed662d6 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java
@@ -266,7 +266,7 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements
 	 * @author Dave Syer
 	 * 
 	 */
-	private class JobExecutionRowMapper implements ParameterizedRowMapper<JobExecution> {
+	private static class JobExecutionRowMapper implements ParameterizedRowMapper<JobExecution> {
 
 		private JobInstance jobInstance;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
index 38c40d5bd..dbccc3c36 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
@@ -210,7 +210,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement
 		return executions;
 	}
 
-	private class StepExecutionRowMapper implements ParameterizedRowMapper<StepExecution> {
+	private static class StepExecutionRowMapper implements ParameterizedRowMapper<StepExecution> {
 
 		private final JobExecution jobExecution;
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleChunkOrientedTaskletTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleChunkOrientedTaskletTests.java
index 17e18a6aa..7c4b36a02 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleChunkOrientedTaskletTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleChunkOrientedTaskletTests.java
@@ -146,7 +146,7 @@ public class SimpleChunkOrientedTaskletTests {
 	 * @author Dave Syer
 	 * 
 	 */
-	private final class StubItemWriter implements ItemWriter<String> {
+	private static final class StubItemWriter implements ItemWriter<String> {
 		private String values = "";
 
 		public void write(List<? extends String> items) throws Exception {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java
index 6ea30c6c6..af12dc9ed 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java
@@ -671,7 +671,7 @@ public class TaskletStepTests {
 		String msg = stepExecution.getExitStatus().getExitDescription();
 		assertEquals("", msg);
 		Throwable ex = stepExecution.getFailureExceptions().get(0);
-		msg = ex.getMessage();
+
 		// The original rollback was caused by this one:
 		assertEquals("Bar", ex.getMessage());
 	}
@@ -701,7 +701,6 @@ public class TaskletStepTests {
 		String msg = stepExecution.getExitStatus().getExitDescription();
 		assertEquals("", msg);
 		Throwable ex = stepExecution.getFailureExceptions().get(0);
-		msg = ex.getMessage();
 		// The original rollback was caused by this one:
 		assertEquals("Bar", ex.getMessage());
 	}