diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests-context.xml
new file mode 100644
index 0000000000..0ad011ce13
--- /dev/null
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests-context.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<channel id="output">
+		<queue capacity="5" message-store="messageStore" />
+	</channel>
+
+	<channel id="input" />
+
+	<service-activator id="activator" ref="bean" input-channel="input" output-channel="output"/>
+
+	<beans:bean id="messageStore" class="org.springframework.integration.store.SimpleMessageStore" />
+
+	<beans:bean id="bean" class="org.springframework.integration.config.TestHandler">
+		<beans:property name="replyMessageText" value="hello"/>
+	</beans:bean>
+
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests.java
new file mode 100644
index 0000000000..c2dc4e33ed
--- /dev/null
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2002-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.config;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.integration.channel.PollableChannel;
+import org.springframework.integration.core.Message;
+import org.springframework.integration.core.MessageChannel;
+import org.springframework.integration.message.MessageBuilder;
+import org.springframework.integration.store.MessageGroupStore;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Dave Syer
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class ChannelWithMessageStoreParserTests {
+
+	@Autowired
+	@Qualifier("input")
+	private MessageChannel input;
+
+	@Autowired
+	@Qualifier("output")
+	private PollableChannel output;
+
+	@Autowired
+	private TestHandler handler;
+
+	@Autowired
+	private MessageGroupStore messageGroupStore;
+
+	@Test
+	@DirtiesContext
+	public void testAggregation() throws Exception {
+
+		input.send(createMessage("123", "id1", 3, 1, null));
+		assertEquals(1, messageGroupStore.getMessageGroup("id1").size());
+		handler.getLatch().await(100, TimeUnit.MILLISECONDS);
+		assertEquals("The message payload is not correct", "123", handler.getMessageString());
+		assertEquals(0, messageGroupStore.getMessageGroup("id1").size());
+		
+		Message<?> result = output.receive(100);
+		assertEquals("hello", result.getPayload());
+
+	}
+
+	private static <T> Message<T> createMessage(T payload, Object correlationId, int sequenceSize, int sequenceNumber,
+			MessageChannel outputChannel) {
+		return MessageBuilder.withPayload(payload).setCorrelationId(correlationId).setSequenceSize(sequenceSize)
+				.setSequenceNumber(sequenceNumber).setReplyChannel(outputChannel).build();
+	}
+
+}