diff --git a/build.gradle b/build.gradle
index 5085bc1bae..9bc2aec37e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -123,7 +123,7 @@ configure(javaprojects) {
     mockitoVersion = '1.8.4'
     springVersion = '3.0.5.RELEASE'
     springSecurityVersion = '3.0.5.RELEASE'
-    springWsVersion = '1.5.9'
+    springWsVersion = '2.0.2.RELEASE'
 
     sourceSets {
         test {
diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml
index 8d6d12e2b8..4904b302f8 100644
--- a/spring-integration-ws/pom.xml
+++ b/spring-integration-ws/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.integration</groupId>
   <artifactId>spring-integration-ws</artifactId>
-  <version>2.0.4.RELEASE</version>
+  <version>2.0.5.BUILD-SNAPSHOT</version>
   <name>Spring Integration Web Services Support</name>
   <licenses>
     <license>
@@ -119,18 +119,18 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.ws</groupId>
-      <artifactId>spring-ws-core</artifactId>
-      <version>1.5.9</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.ws</groupId>
+      <artifactId>spring-ws-core</artifactId>
+      <version>2.0.2.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
@@ -171,7 +171,7 @@
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-test</artifactId>
-      <version>2.0.4.RELEASE</version>
+      <version>2.0.5.BUILD-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -202,7 +202,7 @@
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
-      <version>2.0.4.RELEASE</version>
+      <version>2.0.5.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml
index 02f4b53f71..b744082a69 100644
--- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml
+++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml
@@ -41,7 +41,7 @@
 			header-mapper="testHeaderMapper"/>
 
 	<bean id="marshaller" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.springframework.oxm.AbstractMarshaller" />
+		<constructor-arg value="org.springframework.oxm.support.AbstractMarshaller" />
 	</bean>
 
 	<bean id="testHeaderMapper" class="org.springframework.integration.ws.config.WebServiceInboundGatewayParserTests$TestHeaderMapper"/>
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java
index ee51dd554c..9e9b864d03 100644
--- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java
+++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java
@@ -47,8 +47,8 @@ import org.springframework.integration.mapping.HeaderMapper;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.integration.ws.MarshallingWebServiceInboundGateway;
 import org.springframework.integration.ws.SimpleWebServiceInboundGateway;
-import org.springframework.oxm.AbstractMarshaller;
 import org.springframework.oxm.Unmarshaller;
+import org.springframework.oxm.support.AbstractMarshaller;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.ws.context.DefaultMessageContext;