diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests-context.xml
new file mode 100644
index 0000000000..fbd26e442c
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests-context.xml
@@ -0,0 +1,23 @@
+<?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"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/context
+			http://www.springframework.org/schema/context/spring-context.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<context:property-placeholder
+		location="/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests.properties"/>
+
+	<gateway id="gateway"
+		service-interface="org.springframework.integration.channel.config.ChannelCapacityPlaceholderTests$TestService"/>
+
+	<channel id="channel">
+		<queue capacity="${capacity}"/>
+	</channel>
+
+</beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests.java
new file mode 100644
index 0000000000..9aa9b30c21
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2002-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.
+ */
+
+package org.springframework.integration.channel.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.message.MessageBuilder;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class ChannelCapacityPlaceholderTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+	@Test
+	public void verifyCapacityValueChanges() {
+		QueueChannel channel = context.getBean("channel", QueueChannel.class);
+		assertNotNull(channel);
+		assertEquals(99, channel.getRemainingCapacity());
+		channel.send(MessageBuilder.withPayload("test1").build());
+		channel.send(MessageBuilder.withPayload("test2").build());
+		assertEquals(97, channel.getRemainingCapacity());
+		assertNotNull(channel.receive(0));
+		assertEquals(98, channel.getRemainingCapacity());
+	}
+
+
+	public static interface TestService {
+
+		@org.springframework.integration.annotation.Gateway(requestChannel="channel")
+		void test();
+
+	}
+
+}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests.properties b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests.properties
new file mode 100644
index 0000000000..2c595667af
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests.properties
@@ -0,0 +1 @@
+capacity=99