diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml
index 70eadc0d..f9f3cad2 100644
--- a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml
+++ b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml
@@ -23,7 +23,7 @@
 	</int-jms:inbound-channel-adapter>
 
 	<bean id="jmsTemplate" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.springframework.jms.core.JmsTemplate"/>
+		<constructor-arg value="org.springframework.jms.core.JmsTemplate" type="java.lang.Class"/>
 	</bean>
 
 </beans>
diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml
index a01201aa..e1a1c255 100644
--- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml
+++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml
@@ -2,14 +2,12 @@
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns="http://www.springframework.org/schema/beans"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xmlns:int-stream="http://www.springframework.org/schema/integration/stream"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:int-file="http://www.springframework.org/schema/integration/file"
 	xmlns:int-ftp="http://www.springframework.org/schema/integration/ftp"
 	xsi:schemaLocation="http://www.springframework.org/schema/integration/ftp https://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd
 		http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/integration/file https://www.springframework.org/schema/integration/file/spring-integration-file.xsd
-		http://www.springframework.org/schema/integration/stream https://www.springframework.org/schema/integration/stream/spring-integration-stream.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">
 
@@ -41,7 +39,7 @@
 	</int-ftp:outbound-channel-adapter>
 
 	<bean id="mockSessionFactory" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.springframework.integration.file.remote.session.SessionFactory" />
+		<constructor-arg value="org.springframework.integration.file.remote.session.SessionFactory" type="java.lang.Class"/>
 	</bean>
 
 	<int:transformer input-channel="afterSuccessDeleteChannel" output-channel="goodResultChannel"