diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EnpointSecurityIntegrationTest-context.xml b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTest-context.xml
similarity index 93%
rename from org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EnpointSecurityIntegrationTest-context.xml
rename to org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTest-context.xml
index aad15f3c3e..8ea896d13f 100644
--- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EnpointSecurityIntegrationTest-context.xml
+++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTest-context.xml
@@ -14,15 +14,15 @@
 	<message-bus auto-create-channels="false" />
 
 	<beans:bean id="testTarget"
-		class="org.springframework.integration.security.endpoint.TestTarget" />
+		class="org.springframework.integration.security.endpoint.TestTarget"/>
 
-	<direct-channel id="testChannel"></direct-channel>
+	<direct-channel id="testChannel"/>
 
-	<target-endpoint target="testTarget" input-channel="testChannel">
+	<channel-adapter target="testTarget" channel="testChannel">
 		<interceptors>
 			<si-security:endpoint-security-policy access="ROLE_ADMIN" />
 		</interceptors>
-	</target-endpoint>
+	</channel-adapter>
 
 
 	<beans:bean id="accessDecisionManager"
diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EnpointSecurityIntegrationTest.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTest.java
similarity index 96%
rename from org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EnpointSecurityIntegrationTest.java
rename to org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTest.java
index 68c48060f0..22c7c694a9 100644
--- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EnpointSecurityIntegrationTest.java
+++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTest.java
@@ -31,7 +31,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 
 @ContextConfiguration
-public class EnpointSecurityIntegrationTest extends AbstractJUnit4SpringContextTests {
+public class EndpointSecurityIntegrationTest extends AbstractJUnit4SpringContextTests {
 
 	@Autowired
 	MessageChannel channel;