diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests-context.xml b/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests-context.xml
index 657d110538..c06ced2a36 100644
--- a/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests-context.xml
+++ b/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests-context.xml
@@ -23,8 +23,6 @@
 
     <bean id="directory" class="org.junit.rules.TemporaryFolder" init-method="create" destroy-method="delete"/>
 
-    <si:poller default="true">
-        <si:interval-trigger interval="100000000"/>
-    </si:poller>
+    <si:poller default="true" fixed-delay="100000000"/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/testIp-out-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/testIp-out-context.xml
index ea69b4e3cd..14591693fe 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/testIp-out-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/testIp-out-context.xml
@@ -14,9 +14,7 @@
 			http://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd">
 
 	<stream:stdin-channel-adapter id="stdin" channel="outputChannel" >
-		<poller>
-			<interval-trigger interval="100" time-unit="MILLISECONDS"/>
-		</poller>
+		<poller fixed-delay="100"/>
 	</stream:stdin-channel-adapter>
 
 	<channel id="inputChannel"/>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml
index 7d675e0202..0411793089 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml
@@ -30,9 +30,7 @@
     	<int:queue capacity="2"/>
     </int:channel>
     
-    <int:poller id="poller" default="true">
-		<int:interval-trigger interval="10"/>
-	</int:poller>
+    <int:poller id="poller" default="true" fixed-delay="10"/>
 
 	<bean id="connectionFactory" class="org.springframework.jms.connection.CachingConnectionFactory">
 		<property name="targetConnectionFactory">
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestination.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestination.xml
index f231a89f24..d15818e15f 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestination.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestination.xml
@@ -28,8 +28,6 @@
 
 	<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
 
-	<integration:poller id="poller" default="true">
-		<integration:interval-trigger interval="500"/>
-	</integration:poller>
+	<integration:poller id="poller" default="true" fixed-delay="500"/>
 
 </beans>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestinationName.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestinationName.xml
index 6a1286a251..2c3c669367 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestinationName.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestinationName.xml
@@ -26,8 +26,6 @@
 		</constructor-arg>
 	</bean>
 
-	<integration:poller id="poller" default="true">
-		<integration:interval-trigger interval="3000"/>
-	</integration:poller>
+	<integration:poller id="poller" default="true" fixed-delay="3000"/>
 
 </beans>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryOnly.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryOnly.xml
index 8aae4b0cca..eb51b0af86 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryOnly.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryOnly.xml
@@ -20,8 +20,6 @@
 		</constructor-arg>
 	</bean>
 
-	<integration:poller id="poller" default="true">
-		<integration:interval-trigger interval="500"/>
-	</integration:poller>
+	<integration:poller id="poller" default="true" fixed-delay="500"/>
 
 </beans>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationAndDefaultConnectionFactory.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationAndDefaultConnectionFactory.xml
index 65c7f75f39..06c7524d5e 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationAndDefaultConnectionFactory.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationAndDefaultConnectionFactory.xml
@@ -26,8 +26,6 @@
 		</constructor-arg>
 	</bean>
 
-	<integration:poller id="poller" default="true">
-		<integration:interval-trigger interval="3000"/>
-	</integration:poller>
+	<integration:poller id="poller" default="true" fixed-delay="3000"/>
 
 </beans>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationNameAndDefaultConnectionFactory.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationNameAndDefaultConnectionFactory.xml
index d255d8aa5e..f2204a253f 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationNameAndDefaultConnectionFactory.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationNameAndDefaultConnectionFactory.xml
@@ -24,8 +24,6 @@
 		</constructor-arg>
 	</bean>
 
-	<integration:poller id="poller" default="true">
-		<integration:interval-trigger interval="500"/>
-	</integration:poller>
+	<integration:poller id="poller" default="true" fixed-delay="500"/>
 
 </beans>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithHeaderMapper.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithHeaderMapper.xml
index 57fbeea05e..43e6a3e73d 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithHeaderMapper.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithHeaderMapper.xml
@@ -31,8 +31,6 @@
 		</constructor-arg>
 	</bean>
 
-	<integration:poller id="poller" default="true">
-		<integration:interval-trigger interval="500"/>
-	</integration:poller>
+	<integration:poller id="poller" default="true" fixed-delay="500"/>
 
 </beans>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml
index 956cb91ee5..6e1c3a1a5f 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml
@@ -36,8 +36,6 @@
 		</constructor-arg>
 	</bean>
 
-	<integration:poller id="poller" default="true">
-		<integration:interval-trigger interval="500"/>
-	</integration:poller>
+	<integration:poller id="poller" default="true" fixed-delay="500"/>
 
 </beans>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageConverter.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageConverter.xml
index 661eac3539..f1e0157535 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageConverter.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageConverter.xml
@@ -32,8 +32,6 @@
 
 	<bean id="testConverter" class="org.springframework.integration.jms.config.TestMessageConverter"/>
 
-	<integration:poller id="poller" default="true">
-		<integration:interval-trigger interval="500"/>
-	</integration:poller>
+	<integration:poller id="poller" default="true" fixed-delay="500"/>
 
 </beans>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageSelector.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageSelector.xml
index ef72def7b6..c13349b119 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageSelector.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageSelector.xml
@@ -24,9 +24,7 @@
 			destination="testDestination"
 			selector="TestProperty = 'foo'"
 			channel="output1">
-		<si:poller max-messages-per-poll="1">
-			<si:interval-trigger interval="10000"/>
-		</si:poller>
+		<si:poller max-messages-per-poll="1" fixed-delay="10000"/>
 	</jms:inbound-channel-adapter>
 
 	<jms:message-driven-channel-adapter id="messageDrivenAdapter"
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithReceiveTimeout.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithReceiveTimeout.xml
index 5d6ccdf7a5..4514204e43 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithReceiveTimeout.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithReceiveTimeout.xml
@@ -26,8 +26,6 @@
 
 	<bean id="testConverter" class="org.springframework.integration.jms.config.TestMessageConverter"/>
 
-	<integration:poller id="poller" default="true">
-		<integration:interval-trigger interval="500"/>
-	</integration:poller>
+	<integration:poller id="poller" default="true" fixed-delay="500"/>
 
 </beans>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithConverter.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithConverter.xml
index 8da2cda0b4..4820294779 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithConverter.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithConverter.xml
@@ -18,13 +18,9 @@
 	                      request-destination="requestQueue"
 	                      request-channel="requestChannel"
 	                      message-converter="converter">
-		<si:poller>
-			<si:interval-trigger interval="1000"/>
-		</si:poller>
+		<si:poller fixed-delay="1000"/>
 	</jms:outbound-gateway>
 
-
-
 	<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
 		<constructor-arg>
 			<bean class="org.springframework.integration.jms.StubConnection">
diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-context.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-context.xml
index 1b79cdd497..ab5f299125 100644
--- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-context.xml
@@ -5,8 +5,8 @@
 	xmlns:si="http://www.springframework.org/schema/integration"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
@@ -56,9 +56,7 @@
 	<mail:inbound-channel-adapter id="pop3WithMaxFetchSize" store-uri="pop3:test" max-fetch-size="11" channel="testChannel" should-delete-messages="false" auto-startup="false"/>
 
 	<mail:inbound-channel-adapter id="pop3WithMaxFetchSizeFallsBackToPollerMax" store-uri="pop3:test" channel="testChannel" should-delete-messages="false" auto-startup="false">
-		<si:poller max-messages-per-poll="99">
-			<si:interval-trigger interval="30" time-unit="SECONDS"/>
-		</si:poller>
+		<si:poller max-messages-per-poll="99" fixed-rate="30000"/>
 	</mail:inbound-channel-adapter>
 
 	<mail:inbound-channel-adapter id="imapWithMaxFetchSize" store-uri="imap:test" max-fetch-size="22" channel="testChannel" should-delete-messages="false" auto-startup="false"/>
@@ -105,8 +103,6 @@
 
 	<si:channel id="testChannel"/>
 
-	<si:poller default="true" max-messages-per-poll="1">
-		<si:interval-trigger interval="60" time-unit="SECONDS"/>
-	</si:poller>
+	<si:poller default="true" max-messages-per-poll="1" fixed-rate="60000"/>
 
 </beans>
diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-invalidContext.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-invalidContext.xml
index 3f3e56b120..21fe859a0e 100644
--- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-invalidContext.xml
+++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-invalidContext.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:mail="http://www.springframework.org/schema/integration/mail"
 	xmlns:si="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
-		http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<!-- INT-1163 -->
 
@@ -13,8 +13,6 @@
 
 	<si:channel id="testChannel"/>
 
-	<si:poller default="true" max-messages-per-poll="1">
-		<si:interval-trigger interval="60" time-unit="SECONDS"/>
-	</si:poller>
+	<si:poller default="true" max-messages-per-poll="1" fixed-delay="60000"/>
 
 </beans>
diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml
index 0a78386636..bf877cca72 100644
--- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml
+++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml
@@ -25,8 +25,6 @@
 		<prop key="foo">bar</prop>
 	</util:properties>
 
-	<integration:poller default="true">
-		<integration:interval-trigger interval="60" time-unit="SECONDS"/>
-	</integration:poller>
+	<integration:poller default="true" fixed-rate="60000"/>
 
 </beans>
diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/consoleInboundChannelAdapterParserTests.xml b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/consoleInboundChannelAdapterParserTests.xml
index 5d234a7606..4d9857597f 100644
--- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/consoleInboundChannelAdapterParserTests.xml
+++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/consoleInboundChannelAdapterParserTests.xml
@@ -16,8 +16,6 @@
 
 	<stdin-channel-adapter id="adapterWithProvidedCharset" charset="UTF-8" auto-startup="false"/>
 
-	<integration:poller id="poller" default="true">
-		<integration:interval-trigger interval="3000"/>
-	</integration:poller>
+	<integration:poller id="poller" default="true" fixed-rate="3000"/>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml
index a44673fd73..ce5176bcba 100644
--- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml
+++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml
@@ -86,9 +86,7 @@
 	<ws:outbound-gateway id="gatewayWithPoller"
 		                 request-channel="pollableInputChannel"
 	                     uri="http://example.org">
-    	<si:poller>
-			<si:interval-trigger interval="5000"/>
-		</si:poller>
+    	<si:poller fixed-delay="5000"/>
 	</ws:outbound-gateway>
 
 	<ws:outbound-gateway id="gatewayWithOrderAndAutoStartupFalse"
diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests-context.xml b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests-context.xml
index b80cf35cd9..e9b591a530 100644
--- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests-context.xml
+++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests-context.xml
@@ -16,7 +16,6 @@
 		<si:queue capacity="1"/>
 	</si:channel>
 	
-
 	<si:channel id="output">
 		<si:queue capacity="1"/>
 	</si:channel>
@@ -26,14 +25,11 @@
 			output-channel="output"
 			unmarshaller="unmarshaller"/>
 			
-			
 	<si-xml:unmarshalling-transformer id="unmrshallerWithPoller"
 			input-channel="pollableInput"
 			output-channel="output"
 			unmarshaller="unmarshaller">
-		<si:poller>
-			<si:interval-trigger interval="500" />
-		</si:poller>		
+		<si:poller fixed-delay="500"/>
 	</si-xml:unmarshalling-transformer>		
 
 	<bean id="unmarshaller" class="org.springframework.integration.xml.config.StubUnmarshaller"/>