diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests-context.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests-context.xml
index 3426615307..a3c0b00c6e 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests-context.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests-context.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns:si="http://www.springframework.org/schema/integration"
 	xmlns:ws="http://www.springframework.org/schema/integration/ws"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://www.springframework.org/schema/beans"
 	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
-		http://www.springframework.org/schema/integration/ws http://www.springframework.org/schema/integration/spring-integration-ws-1.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd
+			http://www.springframework.org/schema/integration/ws
+			http://www.springframework.org/schema/integration/spring-integration-ws.xsd">
 
 	<si:annotation-config />
 
-	<bean
-		class="org.springframework.integration.ws.MarshallingWebServiceInboundGateway"
+	<bean class="org.springframework.integration.ws.MarshallingWebServiceInboundGateway"
 		p:requestChannel-ref="requests" p:marshaller-ref="marshaller"
 		p:unmarshaller-ref="marshaller" />
+
 	<bean id="marshaller"
 		class="org.springframework.integration.ws.MarshallingWebServiceIntegrationTests$StubMarshaller" />
 
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/DefaultConfigurationTests-context.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/DefaultConfigurationTests-context.xml
index 8e9ff73957..e3c198792c 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/DefaultConfigurationTests-context.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/DefaultConfigurationTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:ws="http://www.springframework.org/schema/integration/ws"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration/ws
-			http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd">
+			http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd">
 
 	<ws:outbound-gateway request-channel="testChannel" uri="testUri" auto-startup="false"/>
 
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml
index 20fd8b5249..165ab0c9d1 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml
@@ -4,15 +4,14 @@
 	xmlns:ws="http://www.springframework.org/schema/integration/ws"
 	xmlns:util='http://www.springframework.org/schema/util'
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/ws
-			http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd
+			http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd
 			http://www.springframework.org/schema/util 
 			http://www.springframework.org/schema/util/spring-util.xsd">
 
-
 	<ws:inbound-gateway id="simple" request-channel="requests" />
 	
 	<ws:inbound-gateway id="extractsPayload" request-channel="requests" extract-payload="false"/>
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithBothUriAndDestinationProvider.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithBothUriAndDestinationProvider.xml
index e2a6e688b3..8d2ed8176a 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithBothUriAndDestinationProvider.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithBothUriAndDestinationProvider.xml
@@ -3,13 +3,13 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:si="http://www.springframework.org/schema/integration"
 	xmlns:ws="http://www.springframework.org/schema/integration/ws"
-	xmlns:util='http://www.springframework.org/schema/util'
+	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/ws
-			http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd
+			http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd
 			http://www.springframework.org/schema/util 
 			http://www.springframework.org/schema/util/spring-util.xsd">
 
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithNeitherUriNorDestinationProvider.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithNeitherUriNorDestinationProvider.xml
index 21325c8c89..a9f55b7107 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithNeitherUriNorDestinationProvider.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithNeitherUriNorDestinationProvider.xml
@@ -5,11 +5,11 @@
 	xmlns:ws="http://www.springframework.org/schema/integration/ws"
 	xmlns:util='http://www.springframework.org/schema/util'
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/ws
-			http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd
+			http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd
 			http://www.springframework.org/schema/util 
 			http://www.springframework.org/schema/util/spring-util.xsd">
 
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceOutboundGatewayParserTests.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceOutboundGatewayParserTests.xml
index 9c3ee14a1b..eb5ee228c4 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceOutboundGatewayParserTests.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceOutboundGatewayParserTests.xml
@@ -4,11 +4,11 @@
 	xmlns:si="http://www.springframework.org/schema/integration"
 	xmlns:ws="http://www.springframework.org/schema/integration/ws"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/ws
-			http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd">
+			http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd">
 
 	<si:channel id="requestChannel"/>
 
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml
index 5dbb8877a5..b7f9b6dd4a 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml
@@ -5,11 +5,11 @@
 	xmlns:ws="http://www.springframework.org/schema/integration/ws"
 	xmlns:util='http://www.springframework.org/schema/util'
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/ws
-			http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd
+			http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd
 			http://www.springframework.org/schema/util 
 			http://www.springframework.org/schema/util/spring-util.xsd">