diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
index 649c305013..4882381548 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
@@ -214,9 +214,9 @@
 	
 	<bean id="interceptors" class="org.springframework.integration.ip.tcp.connection.TcpConnectionInterceptorFactoryChain" />
 	
-	<bean id="defaultSerializer" class="org.springframework.core.serializer.support.DefaultSerializer" />
+	<bean id="defaultSerializer" class="org.springframework.core.serializer.DefaultSerializer" />
 	
-	<bean id="defaultDeserializer" class="org.springframework.core.serializer.support.DefaultDeserializer" />
+	<bean id="defaultDeserializer" class="org.springframework.core.serializer.DefaultDeserializer" />
 
 	<ip:tcp-outbound-channel-adapter id="tcpNewOut1"
 		channel="tcpChannel"
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
index 40345b63db..af04d0963a 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
@@ -9,9 +9,9 @@
 
 	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
 	
-	<bean id="serializer" class="org.springframework.core.serializer.support.DefaultSerializer" />
+	<bean id="serializer" class="org.springframework.core.serializer.DefaultSerializer" />
 
-	<bean id="deserializer" class="org.springframework.core.serializer.support.DefaultDeserializer" />
+	<bean id="deserializer" class="org.springframework.core.serializer.DefaultDeserializer" />
 	
 	<bean id="helloWorldInterceptors" class="org.springframework.integration.ip.tcp.connection.TcpConnectionInterceptorFactoryChain">
 		<property name="interceptors">
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
index efdc10666c..742a3d9349 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
@@ -11,9 +11,9 @@
 	
 	<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
 	
-	<bean id="serializer" class="org.springframework.core.serializer.support.DefaultSerializer" />
+	<bean id="serializer" class="org.springframework.core.serializer.DefaultSerializer" />
 
-	<bean id="deserializer" class="org.springframework.core.serializer.support.DefaultDeserializer" />
+	<bean id="deserializer" class="org.springframework.core.serializer.DefaultDeserializer" />
 
 	<int-ip:tcp-connection-factory id="server"
 		type="server"
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
index 1e281caa12..9a8f5512d8 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
@@ -15,8 +15,8 @@
 	<bean id="crLfSerializer" class="org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer" />
 	<bean id="stxEtxSerializer" class="org.springframework.integration.ip.tcp.serializer.ByteArrayStxEtxSerializer" />
 	<bean id="lengthHeaderSerializer" class="org.springframework.integration.ip.tcp.serializer.ByteArrayLengthHeaderSerializer" />
-	<bean id="javaSerializer" class="org.springframework.core.serializer.support.DefaultSerializer" />
-	<bean id="javaDeserializer" class="org.springframework.core.serializer.support.DefaultDeserializer" />
+	<bean id="javaSerializer" class="org.springframework.core.serializer.DefaultSerializer" />
+	<bean id="javaDeserializer" class="org.springframework.core.serializer.DefaultDeserializer" />
 
 	<ip:tcp-connection-factory id="crLfServer"
 		type="server"