diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java
index 08893a0bee..858ca5cc1d 100644
--- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java
+++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java
@@ -115,7 +115,7 @@ public class GroovyCommandMessageProcessor extends AbstractScriptExecutingMessag
 		if (this.beanFactory != null) {
 			factory.setBeanFactory(this.beanFactory);
 		}
-		Object result = factory.getScriptedObject(scriptSource, null);
+		Object result = factory.getScriptedObject(scriptSource);
 		return (result instanceof GString) ? result.toString() : result;
 	}
 
diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java
index 7c7c6656bd..8f4cf33414 100644
--- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java
+++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java
@@ -158,8 +158,8 @@ public class ImapMailReceiverTests {
 		adapter.setTaskScheduler(taskScheduler);
 		adapter.start();
 		@SuppressWarnings("unchecked")
-		org.springframework.messaging.Message<MimeMessage> received =
-				(org.springframework.messaging.Message<MimeMessage>) channel.receive(6000);
+		org.springframework.integration.Message<MimeMessage> received =
+				(org.springframework.integration.Message<MimeMessage>) channel.receive(6000);
 		assertNotNull(received);
 		assertNotNull(received.getPayload().getReceivedDate());
 		assertTrue(received.getPayload().getLineCount() > -1);