diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java
similarity index 100%
rename from spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsTransportException.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpsTransportException.java
similarity index 100%
rename from spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsTransportException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpsTransportException.java
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java
similarity index 100%
rename from spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java
similarity index 100%
rename from spring-ws-support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java
similarity index 100%
rename from spring-ws-support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java
similarity index 100%
rename from spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java
similarity index 100%
rename from spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java
similarity index 100%
rename from spring-ws-support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java
diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/FaultEndpoint.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/FaultEndpoint.java
similarity index 100%
rename from spring-ws-support/src/test/java/org/springframework/ws/transport/http/FaultEndpoint.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/FaultEndpoint.java
diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/NoResponseEndpoint.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/NoResponseEndpoint.java
similarity index 100%
rename from spring-ws-support/src/test/java/org/springframework/ws/transport/http/NoResponseEndpoint.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/NoResponseEndpoint.java
diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/ResponseEndpoint.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/ResponseEndpoint.java
similarity index 100%
rename from spring-ws-support/src/test/java/org/springframework/ws/transport/http/ResponseEndpoint.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/ResponseEndpoint.java
diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/SimpleHttpServerFactoryBean.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/SimpleHttpServerFactoryBean.java
similarity index 100%
rename from spring-ws-support/src/test/java/org/springframework/ws/transport/http/SimpleHttpServerFactoryBean.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/SimpleHttpServerFactoryBean.java
diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java
similarity index 100%
rename from spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java
diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/support/FreePortScanner.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/test/FreePortScanner.java
similarity index 97%
rename from spring-ws-support/src/test/java/org/springframework/ws/transport/support/FreePortScanner.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/test/FreePortScanner.java
index be0dcfd7..1a07e907 100644
--- a/spring-ws-support/src/test/java/org/springframework/ws/transport/support/FreePortScanner.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/test/FreePortScanner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.transport.support;
+package org.springframework.ws.transport.http.test;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/spring-ws-support/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml
similarity index 96%
rename from spring-ws-support/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml
index 51016692..91013500 100644
--- a/spring-ws-support/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml
+++ b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml
@@ -6,7 +6,7 @@
 	<bean id="port"
 		  class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
 		<property name="targetClass"
-				  value="org.springframework.ws.transport.support.FreePortScanner"/>
+				  value="org.springframework.ws.transport.http.test.FreePortScanner"/>
 		<property name="targetMethod" value="getFreePort"/>
 	</bean>
 
diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/support/EchoPayloadEndpoint.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/test/EchoPayloadEndpoint.java
similarity index 94%
rename from spring-ws-support/src/test/java/org/springframework/ws/transport/support/EchoPayloadEndpoint.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/test/EchoPayloadEndpoint.java
index af41173f..93eea8b3 100644
--- a/spring-ws-support/src/test/java/org/springframework/ws/transport/support/EchoPayloadEndpoint.java
+++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/test/EchoPayloadEndpoint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.transport.support;
+package org.springframework.ws.transport.test;
 
 import javax.xml.transform.Source;
 
diff --git a/spring-ws-support/src/test/resources/org/springframework/ws/transport/http/soapRequest.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/http/soapRequest.xml
deleted file mode 100644
index ce13d0d9..00000000
--- a/spring-ws-support/src/test/resources/org/springframework/ws/transport/http/soapRequest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<SOAP-ENV:Envelope xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
-	<SOAP-ENV:Body>
-		<m:GetLastTradePrice xmlns:m='http://www.springframework.org/spring-ws'>
-			<symbol>DIS</symbol>
-		</m:GetLastTradePrice>
-	</SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
\ No newline at end of file
diff --git a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml
index f5f24999..774bd86f 100644
--- a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml
+++ b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml
@@ -37,7 +37,7 @@
 		<property name="endpointMappings">
 			<bean class="org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping">
 				<property name="defaultEndpoint">
-					<bean class="org.springframework.ws.transport.support.EchoPayloadEndpoint"/>
+					<bean class="org.springframework.ws.transport.test.EchoPayloadEndpoint"/>
 				</property>
 			</bean>
 		</property>
diff --git a/spring-ws-support/src/test/resources/org/springframework/ws/transport/mail/mail-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/mail/mail-applicationContext.xml
index 97800f91..7c7308e2 100644
--- a/spring-ws-support/src/test/resources/org/springframework/ws/transport/mail/mail-applicationContext.xml
+++ b/spring-ws-support/src/test/resources/org/springframework/ws/transport/mail/mail-applicationContext.xml
@@ -44,7 +44,7 @@
 		<property name="endpointMappings">
 			<bean class="org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping">
 				<property name="defaultEndpoint">
-					<bean class="org.springframework.ws.transport.support.EchoPayloadEndpoint"/>
+					<bean class="org.springframework.ws.transport.test.EchoPayloadEndpoint"/>
 				</property>
 			</bean>
 		</property>
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index 60133e12..eb2c567f 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -8,6 +8,4 @@
 	<suppress files="." checks="SpringMethodVisibility"/>
 
 	<suppress files=".+TransportConstants\.java" checks="InterfaceIsType"/>
-	<suppress files="spring-ws-support[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]ws[\\/]transport[\\/]http[\\/]" checks="JavadocPackage"/>
-	<suppress files="spring-ws-support[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]ws[\\/]transport[\\/]support[\\/]" checks="JavadocPackage"/>
 </suppressions>
\ No newline at end of file