diff --git a/org.springframework.integration/src/main/resources/org/springframework/integration/config/xml/spring-integration-1.0.xsd b/org.springframework.integration/src/main/resources/org/springframework/integration/config/xml/spring-integration-1.0.xsd
index 71fa015759..733b5da508 100644
--- a/org.springframework.integration/src/main/resources/org/springframework/integration/config/xml/spring-integration-1.0.xsd
+++ b/org.springframework.integration/src/main/resources/org/springframework/integration/config/xml/spring-integration-1.0.xsd
@@ -1061,9 +1061,11 @@
 			</xsd:annotation>
 			<xsd:complexContent>
 				<xsd:extension base="handlerEndpointType">
-					<xsd:choice>
-						<xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" />
-					</xsd:choice>
+					<xsd:sequence>            
+                    	<xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" />
+                     	<xsd:any processContents="strict" namespace="http://www.springframework.org/schema/integration"
+                            minOccurs="0" maxOccurs="unbounded" />
+               		</xsd:sequence>
 					<xsd:attribute name="completion-strategy" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
@@ -1285,9 +1287,11 @@
 	<xsd:complexType name="innerEndpointDefinitionAware">
 		<xsd:complexContent>
 			<xsd:extension base="handlerEndpointType">
-				<xsd:choice>
-					<xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" />
-				</xsd:choice>
+				<xsd:sequence>            
+                    <xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" />
+                     <xsd:any processContents="strict" namespace="http://www.springframework.org/schema/integration"
+                            minOccurs="0" maxOccurs="unbounded" />
+                </xsd:sequence>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java
index 34179c1e61..5b284f5311 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java
@@ -136,6 +136,11 @@ public class InnerDefinitionHandlerAwareEndpointParserTests {
 		this.testAggregatorDefinitionSuccess(configProperty);
 	}
 	@Test
+	public void testInnerConcurrentAggregatorDefinitionSuccessReorderBeanPoller(){
+		String configProperty = testConfigurations.getProperty("aggregator-inner-concurrent-success-reorder-bean-poller");
+		this.testAggregatorDefinitionSuccess(configProperty);
+	}
+	@Test
 	public void testRefAggregatorDefinitionSuccess(){
 		String configProperty = testConfigurations.getProperty("aggregator-ref-success");
 		this.testAggregatorDefinitionSuccess(configProperty);
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
index 437eea0f3f..56a1aade99 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
@@ -247,6 +247,28 @@ aggregator-inner-concurrent-success=\
 	</aggregator> \
 	<thread-pool-task-executor id="executor" core-size="5" /> \
 </beans:beans>
+aggregator-inner-concurrent-success-reorder-bean-poller=\
+<?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-2.5.xsd \
+			http://www.springframework.org/schema/integration \
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
+	<channel id="inChannel"> \
+		<queue capacity="5" /> \
+	</channel> \
+	<channel id="outChannel"> \
+		<queue capacity="5" /> \
+	</channel> \
+	<aggregator input-channel="inChannel" method="sum" output-channel="outChannel"> \
+		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestAggregator"/> \
+	    <poller task-executor="executor" max-messages-per-poll="5"> \
+			<interval-trigger interval="20" /> \
+		</poller> \
+	</aggregator> \
+	<thread-pool-task-executor id="executor" core-size="5" /> \
+</beans:beans>
 aggregator-failure-refAndBean=\
 <?xml version="1.0" encoding="UTF-8"?> \
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \