diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppEndpointTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppEndpointTests-context.xml
index b418821d1c..5d329251c3 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppEndpointTests-context.xml
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppEndpointTests-context.xml
@@ -6,7 +6,7 @@
 			 xmlns:tool="http://www.springframework.org/schema/tool" xmlns:lang="http://www.springframework.org/schema/lang"
 			 xsi:schemaLocation="http://www.springframework.org/schema/integration/xmpp http://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd
                         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
+						http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 					 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
                         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
 						http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.0.xsd
@@ -18,16 +18,15 @@
                 class="org.springframework.integration.xmpp.ignore.XmppMessageProducer"
                 p:recipient="${user.2.login}"/>
 
-	<poller default="true">
-		<interval-trigger fixed-rate="true" interval="10" time-unit="SECONDS"/>
-	</poller>
     <xmpp:xmpp-connection id="testConnection"
             user="${user.1.login}"
             password="${user.1.password}"
             host="${user.1.host}"
             service-name="${user.1.service}"/>
 
-	<inbound-channel-adapter ref="xmppProducer" channel="outboundChannel"/>
+	<inbound-channel-adapter ref="xmppProducer" channel="outboundChannel">
+		<poller fixed-rate="1000"/>
+	</inbound-channel-adapter>
 
 	<channel id="outboundChannel"/>
 
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppRosterEventsEndpointTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppRosterEventsEndpointTests-context.xml
index a26994b502..1022a494f2 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppRosterEventsEndpointTests-context.xml
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppRosterEventsEndpointTests-context.xml
@@ -1,57 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-		~ Copyright 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.
-	-->
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 			 xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 			 xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context"
 			 xmlns:util="http://www.springframework.org/schema/util" xmlns:xmpp="http://www.springframework.org/schema/integration/xmpp"
 			 xmlns:tool="http://www.springframework.org/schema/tool" xmlns:lang="http://www.springframework.org/schema/lang"
 			 xmlns:console="http://www.springframework.org/schema/integration/stream"
-			 xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+			 xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 		http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.0.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration/xmpp http://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd
+		http://www.springframework.org/schema/integration/xmpp http://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.0.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
 		http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
 		http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
-
-	<beans:bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" p:ignoreUnresolvablePlaceholders="false">
-		<beans:property name="location">
-			<beans:bean class="org.springframework.core.io.FileSystemResource">
-				<beans:constructor-arg value="#{ systemProperties['user.home'] }/Desktop/test.properties"/>
-			</beans:bean>
-		</beans:property>
+	<beans:bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<beans:property name="location" value="classpath:test.properties"/>
 	</beans:bean>
 
-
 	<xmpp:xmpp-connection
 			id="testConnection"
 			user="${user.1.login}"
 			password="${user.1.password}"
 			host="${user.1.host}"
-			port="${user.1.port}"
-			resource="${user.1.resource}"
-			service-name="${user.1.service}"
-			/>
-
+			service-name="${user.1.service}"/>
 
 	<beans:bean id="eventProducer" class="org.springframework.integration.xmpp.presence.XmppRosterEventProducer"/>
 
 	<inbound-channel-adapter ref="eventProducer" channel="rosterPresenceUpdatingProducerChannel">
-		<poller>
-			<interval-trigger interval="10000"/>
-		</poller>
+		<poller fixed-rate="1000">
 	</inbound-channel-adapter>
 
 	<channel id="rosterPresenceUpdatingProducerChannel"/>
diff --git a/spring-integration-xmpp/src/test/java/test.properties b/spring-integration-xmpp/src/test/java/test.properties
index dbdaca6ebc..a053e85a69 100644
--- a/spring-integration-xmpp/src/test/java/test.properties
+++ b/spring-integration-xmpp/src/test/java/test.properties
@@ -1,6 +1,6 @@
-user.2.login=user2@gmail.com
+user.2.login=springintegration@gmail.com
 
-user.1.login=suser1@gmail.com
-user.1.password=foo
+user.1.login=springintegration.eip@gmail.com
+user.1.password=spr1ng1p
 user.1.host=talk.google.com
 user.1.service=gmail.com
\ No newline at end of file