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 1922cfe6c..d67b0cc41 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
@@ -97,10 +97,14 @@ public class TaskletStepTests {
 	}
 
 	private TaskletStep getStep(String[] strings) throws Exception {
+		return getStep(strings, 1);
+	}
+	
+	private TaskletStep getStep(String[] strings, int commitInterval) throws Exception {
 		TaskletStep step = new TaskletStep("stepName");
 		// Only process one item:
 		RepeatTemplate template = new RepeatTemplate();
-		template.setCompletionPolicy(new SimpleCompletionPolicy(1));
+		template.setCompletionPolicy(new SimpleCompletionPolicy(commitInterval));
 		step.setTasklet(new TestingChunkOrientedTasklet<String>(getReader(strings), itemWriter, template));
 		step.setJobRepository(new JobRepositorySupport());
 		step.setTransactionManager(transactionManager);
@@ -138,6 +142,32 @@ public class TaskletStepTests {
 		assertEquals(1, stepExecution.getCommitCount());
 	}
 
+	@Test
+	public void testCommitCount_Even() throws Exception {
+		JobExecution jobExecutionContext = new JobExecution(jobInstance);
+		step = getStep(new String[] { "foo", "bar", "spam", "eggs" }, 2);
+		step.setTransactionManager(transactionManager);
+		StepExecution stepExecution = new StepExecution(step.getName(), jobExecutionContext);
+		step.execute(stepExecution);
+		assertEquals(4, processed.size());
+		assertEquals(4, stepExecution.getReadCount());
+		assertEquals(4, stepExecution.getWriteCount());
+		assertEquals(3, stepExecution.getCommitCount()); //the empty chunk is the 3rd commit
+	}
+
+	@Test
+	public void testCommitCount_Uneven() throws Exception {
+		JobExecution jobExecutionContext = new JobExecution(jobInstance);
+		step = getStep(new String[] { "foo", "bar", "spam" }, 2);
+		step.setTransactionManager(transactionManager);
+		StepExecution stepExecution = new StepExecution(step.getName(), jobExecutionContext);
+		step.execute(stepExecution);
+		assertEquals(3, processed.size());
+		assertEquals(3, stepExecution.getReadCount());
+		assertEquals(3, stepExecution.getWriteCount());
+		assertEquals(2, stepExecution.getCommitCount());
+	}
+
 	@Test
 	public void testEmptyReader() throws Exception {
 		JobExecution jobExecutionContext = new JobExecution(jobInstance);