diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowClientNamespaceTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/FlowClientNamespaceTests-context.xml
index 59d38ac..b1dcbc0 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/FlowClientNamespaceTests-context.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowClientNamespaceTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
     <!-- Instantiate the flow (folded into its own application context) -->
     <int-flow:flow id="subflow1" />
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowConfigNamespaceTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/FlowConfigNamespaceTests-context.xml
index 0acbf32..ac00274 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/FlowConfigNamespaceTests-context.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowConfigNamespaceTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 	<int-flow:flow-configuration>
 
 		<int-flow:port-mapping>
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTests-context.xml
index 8827133..71d315e 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTests-context.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTests-context.xml
@@ -3,9 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:int="http://www.springframework.org/schema/integration"
     xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
-    xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
  
 	<!-- Instantiate the flow -->
 	<int-flow:flow id="subflow" flow-id="flow-with-channel-conflict"/>
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTests-jmx-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTests-jmx-context.xml
index 7692902..9ec6d2f 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTests-jmx-context.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTests-jmx-context.xml
@@ -6,12 +6,12 @@
     xmlns:context="http://www.springframework.org/schema/context"
     xmlns:int-jmx="http://www.springframework.org/schema/integration/jmx"
     xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/jmx https://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
     
     
     <context:mbean-server/>
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithAutowireTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithAutowireTests-context.xml
index 3d62532..1281533 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithAutowireTests-context.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithAutowireTests-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <int-flow:flow id="autowired" 
     	referenced-bean-locations="/org/springframework/integration/flow/config/xml/autowired-referenced-beans.xml"/>
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithErrorTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithErrorTests-context.xml
index 351e5cb..7c9a750 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithErrorTests-context.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithErrorTests-context.xml
@@ -4,10 +4,10 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
 
 	<int-flow:flow id="subflow4"/>
 	<int-flow:flow id="subflow5"/>
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithOptionalResponseTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithOptionalResponseTests-context.xml
index 5ab4dce..9e54842 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithOptionalResponseTests-context.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithOptionalResponseTests-context.xml
@@ -4,10 +4,10 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
 
  <!-- Instantiate the flow -->
     <int-flow:flow id="no-response"/>
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithReferencesTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithReferencesTests-context.xml
index 134e9b2..904994b 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithReferencesTests-context.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithReferencesTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
  
 
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/NestedFlowTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/NestedFlowTests-context.xml
index d938be2..8e07ca0 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/NestedFlowTests-context.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/NestedFlowTests-context.xml
@@ -3,9 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:int="http://www.springframework.org/schema/integration"
     xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
-    xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
  
  
 	<int-flow:flow id="nested"/>
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/TransactionalFlowTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/TransactionalFlowTests-context.xml
index 14da99e..7ed1196 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/TransactionalFlowTests-context.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/TransactionalFlowTests-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
  	
 	<int-flow:flow id="transactional-flow"/>
 	
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/autowired-referenced-beans.xml b/src/test/java/org/springframework/integration/flow/config/xml/autowired-referenced-beans.xml
index c34e251..9b13849 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/autowired-referenced-beans.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/autowired-referenced-beans.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean class="org.springframework.integration.flow.config.xml.FooFactory"/>
     <bean class="org.springframework.integration.flow.config.xml.Bar"/>
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/ref-bean-config.xml b/src/test/java/org/springframework/integration/flow/config/xml/ref-bean-config.xml
index 88efa47..23b1db4 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/ref-bean-config.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/ref-bean-config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 	
 	<bean id="refbean" class="org.springframework.integration.flow.config.xml.RefBean">
 		<property name="value" value="it works!"/>
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/txmanager-config.xml b/src/test/java/org/springframework/integration/flow/config/xml/txmanager-config.xml
index c4a7b36..91df5a1 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/txmanager-config.xml
+++ b/src/test/java/org/springframework/integration/flow/config/xml/txmanager-config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="transactionManager" class="org.springframework.integration.flow.Transaction.StubTransactionManager"/>    
 </beans>
diff --git a/src/test/resources/META-INF/spring/integration/flows/autowired/autowired-flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/autowired/autowired-flow-context.xml
index e4bbc18..30edefa 100644
--- a/src/test/resources/META-INF/spring/integration/flows/autowired/autowired-flow-context.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/autowired/autowired-flow-context.xml
@@ -4,10 +4,10 @@
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 
     <context:annotation-config/>
     
diff --git a/src/test/resources/META-INF/spring/integration/flows/basic1/flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/basic1/flow-context.xml
index e8a11c6..66e9c0f 100644
--- a/src/test/resources/META-INF/spring/integration/flows/basic1/flow-context.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/basic1/flow-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
     
     <int-flow:flow-configuration>
      <int-flow:port-mapping input-channel="basic1.inputChannel" output-channel="basic1.outputChannel"/>
diff --git a/src/test/resources/META-INF/spring/integration/flows/basic2/flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/basic2/flow-context.xml
index c738b3a..b2cf535 100644
--- a/src/test/resources/META-INF/spring/integration/flows/basic2/flow-context.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/basic2/flow-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
     
     <int-flow:flow-configuration>
      <int-flow:port-mapping input-channel="basic2.inputChannel" output-channel="basic2.outputChannel"/>
diff --git a/src/test/resources/META-INF/spring/integration/flows/flow-with-channel-conflict/invalid-flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/flow-with-channel-conflict/invalid-flow-context.xml
index 58e27e3..1c2f3fb 100644
--- a/src/test/resources/META-INF/spring/integration/flows/flow-with-channel-conflict/invalid-flow-context.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/flow-with-channel-conflict/invalid-flow-context.xml
@@ -5,11 +5,11 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 	
 	<int-flow:flow-configuration>
 		<int-flow:port-mapping input-channel="inputC" output-channel="outputC"/>	 
diff --git a/src/test/resources/META-INF/spring/integration/flows/nested/flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/nested/flow-context.xml
index abe0e0f..0f05f38 100644
--- a/src/test/resources/META-INF/spring/integration/flows/nested/flow-context.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/nested/flow-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <int-flow:flow-configuration>
      <int-flow:port-mapping input-channel="nested.inputChannel" output-channel="nested.outputChannel"/>
diff --git a/src/test/resources/META-INF/spring/integration/flows/no-response/flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/no-response/flow-context.xml
index 855f00e..9cb3187 100644
--- a/src/test/resources/META-INF/spring/integration/flows/no-response/flow-context.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/no-response/flow-context.xml
@@ -4,10 +4,10 @@
 	xmlns:util="http://www.springframework.org/schema/util"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
 
 	<int-flow:flow-configuration> 
 		<int-flow:port-mapping input-channel="flow-input"/>  
diff --git a/src/test/resources/META-INF/spring/integration/flows/optional-response/flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/optional-response/flow-context.xml
index ba08c18..3b65121 100644
--- a/src/test/resources/META-INF/spring/integration/flows/optional-response/flow-context.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/optional-response/flow-context.xml
@@ -4,10 +4,10 @@
 	xmlns:util="http://www.springframework.org/schema/util"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
 
 	<int-flow:flow-configuration> 
 		<int-flow:port-mapping input-channel="flow-input" output-channel="flow-output"/> 
diff --git a/src/test/resources/META-INF/spring/integration/flows/subflow1-bean-config.xml b/src/test/resources/META-INF/spring/integration/flows/subflow1-bean-config.xml
index d69dc0e..c35cc9c 100644
--- a/src/test/resources/META-INF/spring/integration/flows/subflow1-bean-config.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/subflow1-bean-config.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:util="http://www.springframework.org/schema/util"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
 
       
      
diff --git a/src/test/resources/META-INF/spring/integration/flows/subflow1/subflow1-context.xml b/src/test/resources/META-INF/spring/integration/flows/subflow1/subflow1-context.xml
index 52ab3b4..0653e82 100644
--- a/src/test/resources/META-INF/spring/integration/flows/subflow1/subflow1-context.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/subflow1/subflow1-context.xml
@@ -4,10 +4,10 @@
 	xmlns:util="http://www.springframework.org/schema/util"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
 
 	<int-flow:flow-configuration> 
 		<int-flow:port-mapping>
diff --git a/src/test/resources/META-INF/spring/integration/flows/subflow2/subflow2-context.xml b/src/test/resources/META-INF/spring/integration/flows/subflow2/subflow2-context.xml
index 07c818e..c90428a 100644
--- a/src/test/resources/META-INF/spring/integration/flows/subflow2/subflow2-context.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/subflow2/subflow2-context.xml
@@ -5,11 +5,11 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 
 	<!-- Need to set ignore-unresolvable true or provide defaults for required properties -->
 	<context:property-placeholder/> 
diff --git a/src/test/resources/META-INF/spring/integration/flows/subflow4/subflow4-context.xml b/src/test/resources/META-INF/spring/integration/flows/subflow4/subflow4-context.xml
index 6c47bc7..30e608c 100644
--- a/src/test/resources/META-INF/spring/integration/flows/subflow4/subflow4-context.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/subflow4/subflow4-context.xml
@@ -5,11 +5,11 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 	
 	<int-flow:flow-configuration>
         <int-flow:port-mapping input-channel="subflow-input" output-channel="subflow-output"/> 
diff --git a/src/test/resources/META-INF/spring/integration/flows/subflow5/subflow5-context.xml b/src/test/resources/META-INF/spring/integration/flows/subflow5/subflow5-context.xml
index fd44bca..8c0c905 100644
--- a/src/test/resources/META-INF/spring/integration/flows/subflow5/subflow5-context.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/subflow5/subflow5-context.xml
@@ -5,11 +5,11 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 	
 	<int-flow:flow-configuration>
 		<int-flow:port-mapping>
diff --git a/src/test/resources/META-INF/spring/integration/flows/transactional-flow/flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/transactional-flow/flow-context.xml
index 830bbea..286659a 100644
--- a/src/test/resources/META-INF/spring/integration/flows/transactional-flow/flow-context.xml
+++ b/src/test/resources/META-INF/spring/integration/flows/transactional-flow/flow-context.xml
@@ -5,11 +5,11 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
 	xmlns:int-script="http://www.springframework.org/schema/integration/scripting"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration/scripting http://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/flow https://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration/scripting https://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd
+		http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
 	
 	<int-flow:flow-configuration>
 		<int-flow:port-mapping input-channel="inputChannel" output-channel="outputChannel"/>