diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppRosterEventInboundEndpointParser.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppRosterEventInboundEndpointParser.java
index 6c27c84142..f282ee6022 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppRosterEventInboundEndpointParser.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppRosterEventInboundEndpointParser.java
@@ -19,7 +19,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
-import org.springframework.util.Assert;
 import org.w3c.dom.Element;
 
 /**
diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd
index 59e25d5a41..7ce5dbfcc1 100644
--- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd
+++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd
@@ -57,7 +57,7 @@
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
 			</xsd:sequence>
 			<xsd:attribute name="id" type="xsd:string"/>
-			<xsd:attribute name="channel" use="required" type="xsd:string">
+			<xsd:attribute name="channel"  type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
@@ -151,7 +151,7 @@
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
 			</xsd:sequence>
 			<xsd:attribute name="id" type="xsd:string"/>
-			<xsd:attribute name="channel" use="required" type="xsd:string">
+			<xsd:attribute name="channel"  type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppMessageOutboundEndpointParserTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppMessageOutboundEndpointParserTests-context.xml
index 6c24f132a1..d0c23a6cd0 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppMessageOutboundEndpointParserTests-context.xml
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppMessageOutboundEndpointParserTests-context.xml
@@ -26,5 +26,10 @@
 						xmpp-connection="testConnection">
 		<int:poller fixed-rate="1000" max-messages-per-poll="1"/>
 	</int-xmpp:message-outbound-channel-adapter>
+	
+	<int-xmpp:message-outbound-channel-adapter id="outboundNoChannelAdapter" 
+						xmpp-connection="testConnection">
+<!--		<int:poller fixed-rate="1000" max-messages-per-poll="1"/>-->
+	</int-xmpp:message-outbound-channel-adapter>
 
 </beans>
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppMessageOutboundEndpointParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppMessageOutboundEndpointParserTests.java
index 7aeaf0a34c..5c248954e1 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppMessageOutboundEndpointParserTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppMessageOutboundEndpointParserTests.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.integration.xmpp.config;
 
+import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -31,9 +32,12 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
+import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.core.SubscribableChannel;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.integration.test.util.TestUtils;
 import org.springframework.integration.xmpp.XmppHeaders;
 
 /**
@@ -47,15 +51,25 @@ public class XmppMessageOutboundEndpointParserTests {
 		ApplicationContext context = 
 			new ClassPathXmlApplicationContext("XmppMessageOutboundEndpointParserTests-context.xml", XmppMessageOutboundEndpointParserTests.class);
 		Object pollingConsumer = context.getBean("outboundPollingAdapter");
+		QueueChannel channel = (QueueChannel) TestUtils.getPropertyValue(pollingConsumer, "inputChannel");
+		assertEquals("outboundPollingChannel", channel.getComponentName());
 		assertTrue(pollingConsumer instanceof PollingConsumer);
 	}
 	
+	@Test
+	public void testEventConsumerWithNoChannel(){
+		ApplicationContext context = 
+			new ClassPathXmlApplicationContext("XmppMessageOutboundEndpointParserTests-context.xml", XmppMessageOutboundEndpointParserTests.class);
+		Object eventConsumer = context.getBean("outboundNoChannelAdapter");
+		assertTrue(eventConsumer instanceof SubscribableChannel);
+	}
+	
 	@Test
 	public void testEventConsumer(){
 		ApplicationContext context = 
 			new ClassPathXmlApplicationContext("XmppMessageOutboundEndpointParserTests-context.xml", XmppMessageOutboundEndpointParserTests.class);
-		Object pollingConsumer = context.getBean("outboundEventAdapter");
-		assertTrue(pollingConsumer instanceof EventDrivenConsumer);
+		Object eventConsumer = context.getBean("outboundEventAdapter");
+		assertTrue(eventConsumer instanceof EventDrivenConsumer);
 	}
 	
 	@Test
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppRosterEventOutboundChannelAdapterParserTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppRosterEventOutboundChannelAdapterParserTests-context.xml
index 53da9d7e89..b00f6cd031 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppRosterEventOutboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppRosterEventOutboundChannelAdapterParserTests-context.xml
@@ -28,5 +28,8 @@
 					xmpp-connection="testConnection" 
 					channel="eventChannel"/>
 					
+	<int-xmpp:roster-event-outbound-channel-adapter id="eventOutboundRosterChannel" 
+					xmpp-connection="testConnection"/>
+					
 	
 </beans>
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppRosterEventOutboundChannelAdapterParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppRosterEventOutboundChannelAdapterParserTests.java
index 0129e08518..0ae6a793cb 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppRosterEventOutboundChannelAdapterParserTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppRosterEventOutboundChannelAdapterParserTests.java
@@ -20,6 +20,7 @@ import static junit.framework.Assert.assertTrue;
 import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.integration.core.SubscribableChannel;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.endpoint.PollingConsumer;
 
@@ -44,4 +45,12 @@ public class XmppRosterEventOutboundChannelAdapterParserTests {
 		Object eventConsumer = ac.getBean("eventOutboundRosterAdapter");
 		assertTrue(eventConsumer instanceof EventDrivenConsumer);
 	}
+	
+	@Test
+	public void testRosterEventOutboundChannel(){
+		ApplicationContext ac = 
+			new ClassPathXmlApplicationContext("XmppRosterEventOutboundChannelAdapterParserTests-context.xml", this.getClass());
+		Object channel = ac.getBean("eventOutboundRosterChannel");
+		assertTrue(channel instanceof SubscribableChannel);
+	}
 }