diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml
index 3dbba9958f..662ff043a8 100644
--- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml
@@ -5,13 +5,13 @@
 	xmlns:mail="http://www.springframework.org/schema/integration/mail"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	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/util
-			http://www.springframework.org/schema/util/spring-util-2.5.xsd
+			http://www.springframework.org/schema/util/spring-util.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/mail
-			http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd">
+			http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd">
 
 	<integration:channel id="channel"/>
 
diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml
index 9cc0cc9c68..55f5a7e4f1 100644
--- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	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/mail
 			http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd">
 
diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml
index 47041656c0..b0e439c02a 100644
--- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml
@@ -5,13 +5,13 @@
 	xmlns:mail="http://www.springframework.org/schema/integration/mail"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	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/util
-			http://www.springframework.org/schema/util/spring-util-2.5.xsd
+			http://www.springframework.org/schema/util/spring-util.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/mail
-			http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd">
+			http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd">
 
 	<integration:channel id="channel"/>
 
diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailOutboundChannelAdapterParserTests.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailOutboundChannelAdapterParserTests.xml
index d3fdb8cf70..1f46118cea 100644
--- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailOutboundChannelAdapterParserTests.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailOutboundChannelAdapterParserTests.xml
@@ -4,11 +4,11 @@
 	xmlns:mail="http://www.springframework.org/schema/integration/mail"
 	xmlns:integration="http://wwww.springframework.org/schema/integration"
 	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/mail
-			http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd">
+			http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd">
 
 	<mail:outbound-channel-adapter id="adapterWithMailSenderReference"
 			mail-sender="mailSender"/>
diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailToStringTransformerParserTests.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailToStringTransformerParserTests.xml
index a99d56e945..c2d8cfc91a 100644
--- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailToStringTransformerParserTests.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailToStringTransformerParserTests.xml
@@ -4,11 +4,11 @@
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	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/mail
-			http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd">
+			http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd">
 
 	<integration:channel id="input"/>
 
diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailToStringTransformerWithinChain.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailToStringTransformerWithinChain.xml
index b1c4752176..eb0b38c755 100644
--- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailToStringTransformerWithinChain.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailToStringTransformerWithinChain.xml
@@ -4,11 +4,11 @@
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	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/mail
-			http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd">
+			http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd">
 
 	<integration:channel id="input"/>
 
diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailToStringTransformerWithoutInputChannel.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailToStringTransformerWithoutInputChannel.xml
index acb0450a7c..106b569824 100644
--- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailToStringTransformerWithoutInputChannel.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailToStringTransformerWithoutInputChannel.xml
@@ -4,11 +4,11 @@
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	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/mail
-			http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd">
+			http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd">
 
 	<integration:channel id="output">
 		<integration:queue capacity="1"/>
diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/mailSendingMessageHandlerContextTests.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/mailSendingMessageHandlerContextTests.xml
index 0684a13af0..dc1d8b70e2 100644
--- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/mailSendingMessageHandlerContextTests.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/mailSendingMessageHandlerContextTests.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	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/util
-			http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+			http://www.springframework.org/schema/util/spring-util.xsd">
 
 	<bean id="javaMailSender" class="org.springframework.integration.mail.StubJavaMailSender">
 		<constructor-arg>