diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java
index af898448c5..c5c251eae5 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java
@@ -27,6 +27,7 @@ import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.SmartLifecycle;
 import org.springframework.core.serializer.Deserializer;
 import org.springframework.core.serializer.Serializer;
+import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory;
 import org.springframework.integration.ip.tcp.connection.AbstractConnectionFactory;
 import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory;
 import org.springframework.integration.ip.tcp.connection.DefaultTcpNetSSLSocketFactorySupport;
@@ -121,6 +122,14 @@ public class TcpConnectionFactoryFactoryBean extends AbstractFactoryBean<Abstrac
 
 	private volatile BeanFactory beanFactory;
 
+
+	public TcpConnectionFactoryFactoryBean() {
+	}
+
+	public TcpConnectionFactoryFactoryBean(String type) {
+		setType(type);
+	}
+
 	@Override
 	public final void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
@@ -128,8 +137,11 @@ public class TcpConnectionFactoryFactoryBean extends AbstractFactoryBean<Abstrac
 
 	@Override
 	public Class<?> getObjectType() {
-		return this.connectionFactory != null ? this.connectionFactory.getClass()
-											  : AbstractConnectionFactory.class;
+		return this.connectionFactory != null ? this.connectionFactory.getClass() :
+			this.type == null ? AbstractConnectionFactory.class :
+				isServer() ? AbstractServerConnectionFactory.class :
+					isClient() ? AbstractClientConnectionFactory.class :
+						AbstractConnectionFactory.class;
 	}
 
 	@Override
@@ -138,14 +150,15 @@ public class TcpConnectionFactoryFactoryBean extends AbstractFactoryBean<Abstrac
 			this.mapper.setBeanFactory(this.beanFactory);
 		}
 		if (this.usingNio) {
-			if ("server".equals(this.type)) {
+			if (isServer()) {
 				TcpNioServerConnectionFactory connectionFactory = new TcpNioServerConnectionFactory(this.port);
 				this.setCommonAttributes(connectionFactory);
 				this.setServerAttributes(connectionFactory);
 				connectionFactory.setUsingDirectBuffers(this.usingDirectBuffers);
 				connectionFactory.setTcpNioConnectionSupport(this.obtainNioConnectionSupport());
 				this.connectionFactory = connectionFactory;
-			} else {
+			}
+			else {
 				TcpNioClientConnectionFactory connectionFactory = new TcpNioClientConnectionFactory(
 						this.host, this.port);
 				this.setCommonAttributes(connectionFactory);
@@ -155,13 +168,14 @@ public class TcpConnectionFactoryFactoryBean extends AbstractFactoryBean<Abstrac
 			}
 		}
 		else {
-			if ("server".equals(this.type)) {
+			if (isServer()) {
 				TcpNetServerConnectionFactory connectionFactory = new TcpNetServerConnectionFactory(this.port);
 				this.setCommonAttributes(connectionFactory);
 				this.setServerAttributes(connectionFactory);
 				connectionFactory.setTcpSocketFactorySupport(this.obtainSocketFactorySupport());
 				this.connectionFactory = connectionFactory;
-			} else {
+			}
+			else {
 				TcpNetClientConnectionFactory connectionFactory = new TcpNetClientConnectionFactory(
 						this.host, this.port);
 				this.setCommonAttributes(connectionFactory);
@@ -258,8 +272,9 @@ public class TcpConnectionFactoryFactoryBean extends AbstractFactoryBean<Abstrac
 	/**
 	 * @param type the type to set
 	 */
-	public void setType(String type) {
+	public final void setType(String type) {
 		this.type = type;
+		Assert.isTrue(isServer() || isClient(), "type must be 'server' or 'client'");
 	}
 
 	/**
@@ -509,5 +524,13 @@ public class TcpConnectionFactoryFactoryBean extends AbstractFactoryBean<Abstrac
 		this.applicationEventPublisher = applicationEventPublisher;
 	}
 
+	private boolean isClient() {
+		return "client".equals(this.type);
+	}
+
+	private boolean isServer() {
+		return "server".equals(this.type);
+	}
+
 }
 
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryParser.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryParser.java
index f2fa79affa..d057d5beb3 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryParser.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryParser.java
@@ -45,7 +45,7 @@ public class TcpConnectionFactoryParser extends AbstractBeanDefinitionParser {
 					" must be 'client' or 'server' for a TCP Connection Factory", element);
 		}
 		builder = BeanDefinitionBuilder.genericBeanDefinition(TcpConnectionFactoryFactoryBean.class);
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "type");
+		IpAdapterParserUtils.addConstructorValueIfAttributeDefined(builder, element, "type");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
 				IpAdapterParserUtils.HOST);
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java
index 945a29ba49..185fe6b941 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java
@@ -55,6 +55,7 @@ import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.integration.channel.NullChannel;
 import org.springframework.integration.context.IntegrationContextUtils;
+import org.springframework.integration.ip.config.TcpConnectionFactoryFactoryBean;
 import org.springframework.integration.ip.event.IpIntegrationEvent;
 import org.springframework.integration.ip.tcp.TcpReceivingChannelAdapter;
 import org.springframework.integration.test.support.LogAdjustingTestSupport;
@@ -71,6 +72,16 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
  */
 public class ConnectionFactoryTests extends LogAdjustingTestSupport {
 
+	@Test
+	public void factoryBeanTests() {
+		TcpConnectionFactoryFactoryBean fb = new TcpConnectionFactoryFactoryBean("client");
+		assertEquals(AbstractClientConnectionFactory.class, fb.getObjectType());
+		fb = new TcpConnectionFactoryFactoryBean("server");
+		assertEquals(AbstractServerConnectionFactory.class, fb.getObjectType());
+		fb = new TcpConnectionFactoryFactoryBean();
+		assertEquals(AbstractConnectionFactory.class, fb.getObjectType());
+	}
+
 	@Test
 	public void testObtainConnectionIdsNet() throws Exception {
 		TcpNetServerConnectionFactory serverFactory = new TcpNetServerConnectionFactory(0);