diff --git a/buildSrc b/buildSrc
index 1aa2ac99e8..2e7df56522 160000
--- a/buildSrc
+++ b/buildSrc
@@ -1 +1 @@
-Subproject commit 1aa2ac99e88cb108d4996cde527c5449ef24c6e3
+Subproject commit 2e7df565220081896699549b48ebe102b4ac164e
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml
index 5247b60953..cd836df5fe 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml
@@ -74,6 +74,15 @@
 		</payload-type-router>
 	</chain>
 
+  <chain id="chainWithClaimChecks" input-channel="claimCheckInput" output-channel="claimCheckOutput">
+     <claim-check-in/>
+     <claim-check-out/>
+  </chain>
+  
+  <channel id="claimCheckOutput">
+    <queue/>
+  </channel>
+
 	<chain id="chainWithSendTimeout" input-channel="chainWithSendTimeoutInput" output-channel="output" send-timeout="9876">
 		<filter ref="typeSelector" />
 		<service-activator ref="testHandler" />
@@ -104,5 +113,7 @@
 		<beans:constructor-arg value="1" />
 		<beans:property name="replyMessageText" value="foo" />
 	</beans:bean>
+	
+	<beans:bean id="messageStore" class="org.springframework.integration.store.SimpleMessageStore"/>
 
 </beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java
index 93fba18161..81b319bb55 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java
@@ -85,6 +85,13 @@ public class ChainParserTests {
 
 	@Autowired
 	private MessageChannel payloadTypeRouterInput;
+	
+	@Autowired
+	@Qualifier("claimCheckInput")
+	private MessageChannel claimCheckInput;
+	@Autowired
+	@Qualifier("claimCheckOutput")
+	private PollableChannel claimCheckOutput;
 
 	@Autowired
 	private PollableChannel strings;
@@ -190,6 +197,13 @@ public class ChainParserTests {
 		assertEquals(9876, sendTimeout);
 	}
 
+	@Test //INT-1622
+	public void chainWithClaimChecks() {
+		Message<?> message = MessageBuilder.withPayload("test").build();
+		this.claimCheckInput.send(message);
+		Message<?> reply = this.claimCheckOutput.receive(0);
+		assertEquals(message.getPayload(), reply.getPayload());
+	}
 
 	public static class StubHandler extends AbstractReplyProducingMessageHandler {
 		@Override