diff --git a/integration/src/main/java/org/springframework/plugin/integration/config/SpringPluginSpringIntegrationNamespaceHandler.java b/integration/src/main/java/org/springframework/plugin/integration/config/SpringPluginSpringIntegrationNamespaceHandler.java
index 8b0267c..a87a142 100644
--- a/integration/src/main/java/org/springframework/plugin/integration/config/SpringPluginSpringIntegrationNamespaceHandler.java
+++ b/integration/src/main/java/org/springframework/plugin/integration/config/SpringPluginSpringIntegrationNamespaceHandler.java
@@ -17,14 +17,14 @@ package org.springframework.plugin.integration.config;
 
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.NamespaceHandler;
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 
 /**
  * {@link NamespaceHandler} to register {@link BeanDefinitionParser}s.
  * 
  * @author Oliver Gierke
  */
-public class SpringPluginSpringIntegrationNamespaceHandler extends NamespaceHandlerSupport {
+public class SpringPluginSpringIntegrationNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	/*
 	 * (non-Javadoc)
diff --git a/integration/src/test/resources/dynamic-service-activator-test-context.xml b/integration/src/test/resources/dynamic-service-activator-test-context.xml
index 46ab2d3..318de7c 100644
--- a/integration/src/test/resources/dynamic-service-activator-test-context.xml
+++ b/integration/src/test/resources/dynamic-service-activator-test-context.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-plugin="http://www.springframework.org/schema/plugin/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+	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/plugin/integration http://www.springframework.org/schema/plugin/integration/spring-plugin-integration.xsd">
 	
@@ -19,7 +19,6 @@
 		invocation-arguments="payload" />
 		
 	<int:channel id="sampleChannel" />
-	
 	<int:channel id="foo" />
 	
 </beans>