diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/SecurityEndpointInterceptorTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/SecurityEndpointInterceptorTests.java
index 8fefef845d..a8c6c59a72 100644
--- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/SecurityEndpointInterceptorTests.java
+++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/SecurityEndpointInterceptorTests.java
@@ -49,12 +49,13 @@ public class SecurityEndpointInterceptorTests {
 
 	@Before
 	public void createEndpoint() throws Exception {
-		this.endpoint = new HandlerEndpoint(new MessageHandler() {
+		HandlerEndpoint endpoint = new HandlerEndpoint(new MessageHandler() {
 			public Message<?> handle(Message<?> message) {
 				return null;
 			}
 		});
-		this.endpoint.afterPropertiesSet();
+		endpoint.afterPropertiesSet();
+		this.endpoint = endpoint;
 	}
 
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java
index e2886e9885..46f7b1f88f 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.BeanNameAware;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.MessageChannel;
@@ -42,7 +43,7 @@ import org.springframework.integration.scheduling.Schedule;
  * 
  * @author Mark Fisher
  */
-public abstract class AbstractEndpoint implements MessageEndpoint, BeanNameAware {
+public abstract class AbstractEndpoint implements MessageEndpoint, ChannelRegistryAware, InitializingBean, BeanNameAware {
 
 	protected final Log logger = LogFactory.getLog(this.getClass());
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java
index 8f6ab4714e..2458d1d79b 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java
@@ -16,8 +16,6 @@
 
 package org.springframework.integration.endpoint;
 
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.MessageTarget;
@@ -28,7 +26,7 @@ import org.springframework.integration.scheduling.Schedule;
  * 
  * @author Mark Fisher
  */
-public interface MessageEndpoint extends MessageTarget, ChannelRegistryAware, InitializingBean {
+public interface MessageEndpoint extends MessageTarget {
 
 	void setName(String name);