diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerParserTests.java
index 46f44a4f37..66343ade6d 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerParserTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerParserTests.java
@@ -20,6 +20,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import java.util.concurrent.TimeUnit;
+
 import org.junit.Test;
 
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
@@ -28,6 +30,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.config.TestTrigger;
 import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.scheduling.PollerMetadata;
+import org.springframework.integration.test.util.TestUtils;
+import org.springframework.scheduling.support.PeriodicTrigger;
 
 /**
  * @author Mark Fisher
@@ -81,13 +85,15 @@ public class PollerParserTests {
 	}
 
 	@Test
-	public void pollerWithReceiveTimeout() {
+	public void pollerWithReceiveTimeoutAndTimeunit() {
 		ApplicationContext context = new ClassPathXmlApplicationContext(
 				"pollerWithReceiveTimeout.xml", PollerParserTests.class);
 		Object poller = context.getBean("poller");
 		assertNotNull(poller);
 		PollerMetadata metadata = (PollerMetadata) poller;
 		assertEquals(1234, metadata.getReceiveTimeout());
+		PeriodicTrigger trigger = (PeriodicTrigger) metadata.getTrigger();
+		assertEquals(TimeUnit.SECONDS.toString(), TestUtils.getPropertyValue(trigger, "timeUnit").toString());
 	}
 
     @Test
@@ -99,5 +105,10 @@ public class PollerParserTests {
 		PollerMetadata metadata = (PollerMetadata) poller;
 		assertTrue(metadata.getTrigger() instanceof TestTrigger);
 	}
-
+    
+    @Test(expected=BeanDefinitionParsingException.class)
+	public void pollerWithCronTriggerAndTimeUnit() {
+		new ClassPathXmlApplicationContext(
+				"cronTriggerWithTimeUnit-fail.xml", PollerParserTests.class);
+	}
 }
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/cronTriggerWithTimeUnit-fail.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/cronTriggerWithTimeUnit-fail.xml
new file mode 100644
index 0000000000..727df4f411
--- /dev/null
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/cronTriggerWithTimeUnit-fail.xml
@@ -0,0 +1,12 @@
+<?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-2.0.xsd">
+
+	 <poller id="pollerWithAttribute" cron="*/10 * 9-17 * * MON-FRI" receive-timeout="1234" time-unit="MILLISECONDS"/>
+		
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/pollerWithReceiveTimeout.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/pollerWithReceiveTimeout.xml
index b8ee2498f3..10b3f30de1 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/pollerWithReceiveTimeout.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/pollerWithReceiveTimeout.xml
@@ -5,10 +5,8 @@
 	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">
-
-	<poller id="poller" receive-timeout="1234">
-		<interval-trigger interval="5" time-unit="SECONDS"/>
-	</poller>
+			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
 
+	<poller id="poller" receive-timeout="1234" fixed-rate="5" time-unit="SECONDS"/>
+		
 </beans:beans>