diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml
index f930fa1335..a2f1e4a78d 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml
@@ -9,7 +9,7 @@
 
 	<bean id="testBean" class="org.springframework.integration.aop.AnnotationConfigRegistrationTests$TestBean" />
 
-	<si:channel id="testChannel">
+	<si:channel id="annotationConfigRegistrationTest">
 		<si:queue />
 	</si:channel>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java
index 1e67b4335c..27eecdf3b0 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java
@@ -41,7 +41,7 @@ public class AnnotationConfigRegistrationTests {
 	private TestBean testBean;
 
 	@Autowired
-	private QueueChannel testChannel;
+	private QueueChannel annotationConfigRegistrationTest;
 
 	@Autowired
 	private QueueChannel defaultChannel;
@@ -51,7 +51,7 @@ public class AnnotationConfigRegistrationTests {
 	public void verifyInterception() {
 		String name = testBean.setName("John", "Doe", 123);
 		Assert.assertNotNull(name);
-		Message<?> message = testChannel.receive(0);
+		Message<?> message = annotationConfigRegistrationTest.receive(0);
 		Assert.assertNotNull(message);
 		Assert.assertEquals("John DoeDoe", message.getPayload());
 		Assert.assertEquals(123, message.getHeaders().get("x"));
@@ -70,7 +70,7 @@ public class AnnotationConfigRegistrationTests {
 
 	public static class TestBean {
 
-		@Publisher(channel="testChannel")
+		@Publisher(channel="annotationConfigRegistrationTest")
 		@Payload("#return + #args.lname")
 		public String setName(String fname, String lname, @Header("x") int num) {
 			return fname + " " + lname;
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests-context.xml
index b02bc7f49f..587fc5e513 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests-context.xml
@@ -10,7 +10,7 @@
 	<bean id="testBean"
 		class="org.springframework.integration.aop.MessagePublishingAnnotationUsageTests$TestBean" />
 
-	<si:channel id="testChannel">
+	<si:channel id="messagePublishingAnnotationUsageTestChannel">
 		<si:queue />
 	</si:channel>
 	
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java
index 901b4c02a7..15b4effb2b 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java
@@ -80,18 +80,18 @@ public class MessagePublishingAnnotationUsageTests {
 
 	public static class TestBean {
 
-		@Publisher(channel="testChannel")
+		@Publisher(channel="messagePublishingAnnotationUsageTestChannel")
 		public String defaultPayload(String fname, @Header("last") String lname) {
 			return fname + " " + lname;
 		}
 
-		@Publisher(channel="testChannel")
+		@Publisher(channel="messagePublishingAnnotationUsageTestChannel")
 		@Payload
 		public String defaultPayloadButExplicitAnnotation(String fname, @Header String lname) {
 			return fname + " " + lname;
 		}
 
-		@Publisher(channel="testChannel")
+		@Publisher(channel="messagePublishingAnnotationUsageTestChannel")
 		public String argumentAsPayload(@Payload String fname, @Header String lname) {
 			return fname + " " + lname;
 		}
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests-context.xml
index aeda6a916d..38fdfa20d4 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests-context.xml
@@ -10,7 +10,7 @@
 	<bean id="testBean"
 		class="org.springframework.integration.aop.MessagePublishingInterceptorUsageTests$TestBean" />
 
-	<si:channel id="testChannel">
+	<si:channel id="messagePublishingInterceptorUsageTestChannel">
 		<si:queue />
 	</si:channel>
 
@@ -47,7 +47,7 @@
 				class="org.springframework.integration.channel.MapBasedChannelResolver">
 				<property name="channelMap">
 					<map>
-						<entry key="channel" value-ref="testChannel" />
+						<entry key="channel" value-ref="messagePublishingInterceptorUsageTestChannel" />
 					</map>
 				</property>
 			</bean>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java
index 03feb8d9f3..17cb8db458 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java
@@ -37,7 +37,7 @@ public class EndpointParserTests {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"simpleEndpointTests.xml", this.getClass());
 		context.start();
-		MessageChannel channel = (MessageChannel) context.getBean("testChannel");
+		MessageChannel channel = (MessageChannel) context.getBean("endpointParserTestInput");
 		TestHandler handler = (TestHandler) context.getBean("testHandler");
 		assertNull(handler.getMessageString());
 		channel.send(new GenericMessage<String>("test"));
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
index 120a6ba36f..75d4a57464 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
@@ -6,12 +6,12 @@
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration.xsd">
-
-	<channel id="testChannel">
+
+	<channel id="endpointParserTestInput">
 		<queue capacity="50"/>
 	</channel>
 
-	<service-activator input-channel="testChannel" ref="testHandler">
+	<service-activator input-channel="endpointParserTestInput" ref="testHandler">
 		<poller>
 			<interval-trigger interval="100"/>
 		</poller>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ProducerAndConsumerAutoStartupTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ProducerAndConsumerAutoStartupTests-context.xml
index 3dc062809a..461183bc0a 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ProducerAndConsumerAutoStartupTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ProducerAndConsumerAutoStartupTests-context.xml
@@ -7,15 +7,15 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
 
-	<si:inbound-channel-adapter id="inboundEndpoint" ref="counter" method="next" channel="testChannel">
+	<si:inbound-channel-adapter id="inboundEndpoint" ref="counter" method="next" channel="producerAndConsumerAutoStartupTestChannel">
 		<si:poller max-messages-per-poll="1">
 			<si:interval-trigger interval="50"/>
 		</si:poller>
 	</si:inbound-channel-adapter>
 
-	<si:channel id="testChannel"/>
+	<si:channel id="producerAndConsumerAutoStartupTestChannel"/>
 
-	<si:service-activator id="consumerEndpoint" input-channel="testChannel" ref="consumer"/>
+	<si:service-activator id="consumerEndpoint" input-channel="producerAndConsumerAutoStartupTestChannel" ref="consumer"/>
 
 	<bean id="counter" class="org.springframework.integration.endpoint.ProducerAndConsumerAutoStartupTests$Counter"/>