diff --git a/spring-eai-core/src/test/java/org/springframework/integration/channel/consumer/EventDrivenConsumerTests.java b/spring-eai-core/src/test/java/org/springframework/integration/channel/consumer/EventDrivenConsumerTests.java
new file mode 100644
index 0000000000..a6eb4c0b17
--- /dev/null
+++ b/spring-eai-core/src/test/java/org/springframework/integration/channel/consumer/EventDrivenConsumerTests.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2002-2007 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.
+ */
+
+package org.springframework.integration.channel.consumer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+
+import org.springframework.integration.channel.PointToPointChannel;
+import org.springframework.integration.handler.MessageHandler;
+import org.springframework.integration.message.DocumentMessage;
+import org.springframework.integration.message.Message;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+/**
+ * @author Mark Fisher
+ */
+public class EventDrivenConsumerTests {
+
+	@Test
+	public void testDynamicConcurrency() throws Exception {
+		int messagesToSend = 200;
+		int concurrency = 1;
+		int maxConcurrency = 10;
+		final AtomicInteger counter = new AtomicInteger(0);
+		final CountDownLatch latch = new CountDownLatch(messagesToSend);
+		final ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+		final AtomicInteger maxActive = new AtomicInteger(0);
+		final AtomicInteger activeSum = new AtomicInteger(0);
+		executor.setCorePoolSize(concurrency);
+		executor.setMaxPoolSize(maxConcurrency);
+		executor.setQueueCapacity(0);
+		PointToPointChannel channel = new PointToPointChannel();
+		MessageHandler handler = new MessageHandler() {
+			public Message handle(Message message) {
+				counter.incrementAndGet();
+				latch.countDown();
+				activeSum.set(activeSum.addAndGet(executor.getActiveCount()));
+				maxActive.set(Math.max(executor.getActiveCount(), maxActive.get()));
+				return null;
+			}
+		};
+		EventDrivenConsumer consumer = new EventDrivenConsumer(channel, handler);
+		consumer.setExecutor(executor);
+		consumer.setConcurrency(concurrency);
+		consumer.setMaxConcurrency(maxConcurrency);
+		consumer.setIdleTaskExecutionLimit(1);
+		consumer.setMaxMessagesPerTask(1);
+		consumer.setReceiveTimeout(100);
+		consumer.initialize();
+		for (int i = 0; i < messagesToSend - 110; i++) {
+			channel.send(new DocumentMessage(1, "fast-1." + (i+1)));
+		}
+		int activeCountAfterFirstBurst = executor.getActiveCount();
+		for (int i = 0; i < 10; i++) {
+			channel.send(new DocumentMessage(1, "slow-1." + (i+1)));
+			Thread.sleep(50);
+		}
+		int activeCountAfterSlowDown = executor.getActiveCount();
+		for (int i = 0; i < 100; i++) {
+			channel.send(new DocumentMessage(1, "fast-2." + (i+1)));
+		}
+		int activeCountAfterLastBurst = executor.getActiveCount();
+		latch.await(10, TimeUnit.SECONDS);
+		int averageActive = activeSum.get() / messagesToSend;
+		assertTrue(activeCountAfterSlowDown < activeCountAfterFirstBurst);
+		assertTrue(activeCountAfterLastBurst > activeCountAfterSlowDown);
+		assertEquals(messagesToSend, counter.get());
+		assertEquals(maxConcurrency, maxActive.get());
+		assertTrue(averageActive > concurrency);
+		assertTrue(averageActive < maxActive.get());
+	}
+
+}
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/channel/consumer/FixedDelayConsumerTests.java b/spring-eai-core/src/test/java/org/springframework/integration/channel/consumer/FixedDelayConsumerTests.java
new file mode 100644
index 0000000000..48edce2ec5
--- /dev/null
+++ b/spring-eai-core/src/test/java/org/springframework/integration/channel/consumer/FixedDelayConsumerTests.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2002-2007 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.
+ */
+
+package org.springframework.integration.channel.consumer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+
+import org.springframework.integration.channel.PointToPointChannel;
+import org.springframework.integration.handler.MessageHandler;
+import org.springframework.integration.message.DocumentMessage;
+import org.springframework.integration.message.Message;
+
+/**
+ * @author Mark Fisher
+ */
+public class FixedDelayConsumerTests {
+
+	@Test
+	public void testAllSentMessagesAreReceivedWithinTimeLimit() throws Exception {
+		int messagesToSend = 20;
+		final AtomicInteger counter = new AtomicInteger(0);
+		final CountDownLatch latch = new CountDownLatch(messagesToSend);
+		PointToPointChannel channel = new PointToPointChannel();
+		MessageHandler handler = new MessageHandler() {
+			public Message handle(Message message) {
+				counter.incrementAndGet();
+				latch.countDown();
+				return null;
+			}
+		};
+		FixedDelayConsumer consumer = new FixedDelayConsumer(channel, handler);
+		consumer.setPollInterval(10);
+		consumer.initialize();
+		for (int i = 0; i < messagesToSend; i++) {
+			channel.send(new DocumentMessage(1, "test " + (i+1)));
+		}
+		latch.await(250, TimeUnit.MILLISECONDS);
+		assertEquals(messagesToSend, counter.get());
+	}
+
+	@Test
+	public void testTimedOutMessagesAreNotReceived() throws Exception {
+		int messagesToSend = 20;
+		final AtomicInteger counter = new AtomicInteger(0);
+		final CountDownLatch latch = new CountDownLatch(messagesToSend);
+		PointToPointChannel channel = new PointToPointChannel();
+		MessageHandler handler = new MessageHandler() {
+			public Message handle(Message message) {
+				counter.incrementAndGet();
+				latch.countDown();
+				return null;
+			}
+		};
+		FixedDelayConsumer consumer = new FixedDelayConsumer(channel, handler);
+		consumer.setPollInterval(10);
+		consumer.initialize();
+		for (int i = 0; i < messagesToSend; i++) {
+			channel.send(new DocumentMessage(1, "test " + (i+1)));
+		}
+		latch.await(80, TimeUnit.MILLISECONDS);
+		assertTrue(counter.get() < 10);
+		assertTrue(counter.get() > 7);
+	}
+
+}
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/channel/consumer/FixedRateConsumerTests.java b/spring-eai-core/src/test/java/org/springframework/integration/channel/consumer/FixedRateConsumerTests.java
new file mode 100644
index 0000000000..82c0ca98bb
--- /dev/null
+++ b/spring-eai-core/src/test/java/org/springframework/integration/channel/consumer/FixedRateConsumerTests.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2002-2007 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.
+ */
+
+package org.springframework.integration.channel.consumer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+
+import org.springframework.integration.channel.PointToPointChannel;
+import org.springframework.integration.handler.MessageHandler;
+import org.springframework.integration.message.DocumentMessage;
+import org.springframework.integration.message.Message;
+
+/**
+ * @author Mark Fisher
+ */
+public class FixedRateConsumerTests {
+
+	@Test
+	public void testAllSentMessagesAreReceivedWithinTimeLimit() throws Exception {
+		int messagesToSend = 20;
+		final AtomicInteger counter = new AtomicInteger(0);
+		final CountDownLatch latch = new CountDownLatch(messagesToSend);
+		PointToPointChannel channel = new PointToPointChannel();
+		MessageHandler handler = new MessageHandler() {
+			public Message handle(Message message) {
+				counter.incrementAndGet();
+				latch.countDown();
+				return null;
+			}
+		};
+		FixedRateConsumer consumer = new FixedRateConsumer(channel, handler);
+		consumer.setPollInterval(10);
+		consumer.initialize();
+		for (int i = 0; i < messagesToSend; i++) {
+			channel.send(new DocumentMessage(1, "test " + (i+1)));
+		}
+		latch.await(250, TimeUnit.MILLISECONDS);
+		assertEquals(messagesToSend, counter.get());
+	}
+
+	@Test
+	public void testTimedOutMessagesAreNotReceived() throws Exception {
+		int messagesToSend = 20;
+		final AtomicInteger counter = new AtomicInteger(0);
+		final CountDownLatch latch = new CountDownLatch(messagesToSend);
+		PointToPointChannel channel = new PointToPointChannel();
+		MessageHandler handler = new MessageHandler() {
+			public Message handle(Message message) {
+				counter.incrementAndGet();
+				latch.countDown();
+				return null;
+			}
+		};
+		FixedRateConsumer consumer = new FixedRateConsumer(channel, handler);
+		consumer.setPollInterval(10);
+		consumer.initialize();
+		for (int i = 0; i < messagesToSend; i++) {
+			channel.send(new DocumentMessage(1, "test " + (i+1)));
+		}
+		latch.await(80, TimeUnit.MILLISECONDS);
+		assertTrue(counter.get() < 10);
+		assertTrue(counter.get() > 7);
+	}
+
+}