diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PNamespaceTest-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PNamespaceTests-context.xml
similarity index 89%
rename from org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PNamespaceTest-context.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PNamespaceTests-context.xml
index 81f02dc9fa..284151ebbc 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PNamespaceTest-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PNamespaceTests-context.xml
@@ -1,30 +1,31 @@
 <?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
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"
 	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:si="http://www.springframework.org/schema/integration">
+	xmlns:si="http://www.springframework.org/schema/integration"
+	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-1.0.xsd">
 	
 	<si:channel id="input"/>
 	
 	<si:service-activator id="sa" input-channel="input" method="printWithPrefix">
-		<bean class="org.springframework.integration.config.xml.PNamespaceTest$TestBean" 
+		<bean class="org.springframework.integration.config.xml.PNamespaceTests$TestBean" 
 																p:fname="paris" p:lname="hilton"/>
 	</si:service-activator>
 	
 	<si:splitter id="sp" input-channel="input" method="printWithPrefix">
-		<bean class="org.springframework.integration.config.xml.PNamespaceTest$TestBean" 
+		<bean class="org.springframework.integration.config.xml.PNamespaceTests$TestBean" 
 																p:fname="paris" p:lname="hilton"/>
 	</si:splitter>
 	
 	<si:transformer id="tr" input-channel="input" method="printWithPrefix">
-		<bean class="org.springframework.integration.config.xml.PNamespaceTest$TestBean" 
+		<bean class="org.springframework.integration.config.xml.PNamespaceTests$TestBean" 
 																p:fname="paris" p:lname="hilton"/>
 	</si:transformer>
 	
 	<si:router id="rt" input-channel="input" method="printWithPrefix">
-		<bean class="org.springframework.integration.config.xml.PNamespaceTest$TestBean" 
+		<bean class="org.springframework.integration.config.xml.PNamespaceTests$TestBean" 
 																p:fname="paris" p:lname="hilton"/>
 	</si:router>
+
 </beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PNamespaceTest.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PNamespaceTests.java
similarity index 85%
rename from org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PNamespaceTest.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PNamespaceTests.java
index 879aaea26b..0f0062f95a 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PNamespaceTest.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PNamespaceTests.java
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.config.xml;
 
-import junit.framework.Assert;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-public class PNamespaceTest {
+public class PNamespaceTests {
 
 	@Autowired
 	@Qualifier("sa")
@@ -57,32 +57,29 @@ public class PNamespaceTest {
 	@Test
 	public void testPNamespaceServiceActivator() {	
 		TestBean bean =  prepare(serviceActivator);
-		Assert.assertEquals("paris", bean.getFname());
-		Assert.assertEquals("hilton", bean.getLname());
+		assertEquals("paris", bean.getFname());
+		assertEquals("hilton", bean.getLname());
 	}
 
 	@Test
 	public void testPNamespaceSplitter() {		
 		TestBean bean =  prepare(splitter);
-
-		Assert.assertEquals("paris", bean.getFname());
-		Assert.assertEquals("hilton", bean.getLname());
+		assertEquals("paris", bean.getFname());
+		assertEquals("hilton", bean.getLname());
 	}
 
 	@Test
 	public void testPNamespaceRouter() {
 		TestBean bean =  prepare(router);
-
-		Assert.assertEquals("paris", bean.getFname());
-		Assert.assertEquals("hilton", bean.getLname());
+		assertEquals("paris", bean.getFname());
+		assertEquals("hilton", bean.getLname());
 	}
 
 	@Test
 	public void testPNamespaceTransformer() {		
 		TestBean bean =  prepare(transformer);
-
-		Assert.assertEquals("paris", bean.getFname());
-		Assert.assertEquals("hilton", bean.getLname());
+		assertEquals("paris", bean.getFname());
+		assertEquals("hilton", bean.getLname());
 	}