diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/MessageOrientedStep.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/MessageOrientedStep.java
index 338c2d5db..41f99508f 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/MessageOrientedStep.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/job/MessageOrientedStep.java
@@ -44,7 +44,7 @@ public class MessageOrientedStep extends AbstractStep {
 
 	private PollableChannel source;
 
-	private static int MINUTE = 1000 * 60;
+	private static long MINUTE = 1000 * 60;
 
 	private long executionTimeout = 30*MINUTE ;
 
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java
index 4617f1f4b..84d38080f 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java
@@ -172,7 +172,7 @@ public class ChunkMessageItemWriterIntegrationTests {
 		stepExecution.getExecutionContext().putLong(ChunkMessageChannelItemWriter.EXPECTED, 3);
 		stepExecution.getExecutionContext().putLong(ChunkMessageChannelItemWriter.ACTUAL, 2);
 		// And make the back log real
-		requests.send(getSimpleMessage("foo", new Long(4321)));
+		requests.send(getSimpleMessage("foo", 4321L));
 		step.execute(stepExecution);
 		assertEquals(BatchStatus.FAILED, stepExecution.getStatus());
 		assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution.getExitStatus().getExitCode());
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java
index 6bb71f793..39a2694fb 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandlerTests.java
@@ -26,7 +26,7 @@ public class ChunkProcessorChunkHandlerTests {
 		ChunkResponse response = handler.handleChunk(new ChunkRequest<Object>(StringUtils
 				.commaDelimitedListToSet("foo,bar"), 12L, 10));
 		assertEquals(0, response.getSkipCount());
-		assertEquals(new Long(12L), response.getJobId());
+		assertEquals(12, response.getJobId().longValue());
 		assertTrue(response.isSuccessful());
 		assertEquals(2, count);
 	}