diff --git a/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGatewayTests-context.xml b/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGatewayTests-context.xml
index 38480d8c7a..1b83d5fea3 100644
--- a/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGatewayTests-context.xml
+++ b/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGatewayTests-context.xml
@@ -2,17 +2,26 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
+	xmlns:ip="http://www.springframework.org/schema/integration/ip"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans 
+		http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/integration/ip
+		http://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd
+		http://www.springframework.org/schema/integration 
+		http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<import resource="SimpleTcpNetInboundGatewayTests-context.xml" />
 	
-	<bean id="tcpOutGateway" class="org.springframework.integration.ip.tcp.SimpleTcpNetOutboundGateway">
-		<constructor-arg value="localhost"/>
-		<constructor-arg value="#{gatewayCrLf.port}"/>
-<!--		<property name="" value=""/>-->
-	</bean>
-	
-	
+	<ip:outbound-gateway id="tcpOutGateway" 
+		host="localhost"
+		port="#{gatewayCrLf.port}"
+		message-format="crlf"
+		request-channel="requestChannel"
+		reply-channel="replyChannel"
+		/>
 
+	<int:channel id="replyChannel" >
+		<int:queue />
+	</int:channel>
+	
 </beans>
diff --git a/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGatewayTests.java b/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGatewayTests.java
index ae24ff2da8..b58ea651bd 100644
--- a/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGatewayTests.java
+++ b/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGatewayTests.java
@@ -19,6 +19,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.integration.channel.PollableChannel;
+import org.springframework.integration.channel.SubscribableChannel;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.test.context.ContextConfiguration;
@@ -30,7 +32,7 @@ import static org.junit.Assert.assertEquals;
  * @author Gary Russell
  *
  */
-@ContextConfiguration(locations="SimpleTcpNetInboundGatewayTests-context.xml")
+@ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
 public class SimpleTcpNetOutboundGatewayTests {
 
@@ -49,6 +51,14 @@ public class SimpleTcpNetOutboundGatewayTests {
 	@Autowired
 	@Qualifier("gatewayCustom")
 	private SimpleTcpNetInboundGateway inboundGatewayCustom;
+	
+	@Autowired
+	@Qualifier("requestChannel")
+	SubscribableChannel requestChannel;
+
+	@Autowired
+	@Qualifier("replyChannel")
+	PollableChannel replyChannel;
 
 	@Test
 	public void testOutboundCrLf() throws Exception {
@@ -91,4 +101,12 @@ public class SimpleTcpNetOutboundGatewayTests {
 		byte[] bytes = (byte[]) gateway.handleRequestMessage(message);
 		assertEquals("echo:test", new String(bytes).trim());
 	}
+	
+	@Test
+	public void testOutboundUsingConfig() {
+		Message<String> message = MessageBuilder.withPayload("test").build();
+		requestChannel.send(message);
+		byte[] bytes = (byte[]) replyChannel.receive().getPayload();
+		assertEquals("echo:test", new String(bytes).trim());
+	}
 }