diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTest.java b/org.springframework.core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
similarity index 96%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTest.java
rename to org.springframework.core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
index 93e86865fed..f13cf00318f 100644
--- a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTest.java
+++ b/org.springframework.core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
@@ -27,7 +27,7 @@ import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.AttributesImpl;
 
-public class StaxEventXMLReaderTest extends AbstractStaxXMLReaderTestCase {
+public class StaxEventXMLReaderTests extends AbstractStaxXMLReaderTestCase {
 
 	public static final String CONTENT = "<root xmlns='http://springframework.org/spring-ws'><child/></root>";
 
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxSourceTest.java b/org.springframework.core/src/test/java/org/springframework/util/xml/StaxSourceTests.java
similarity index 98%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/StaxSourceTest.java
rename to org.springframework.core/src/test/java/org/springframework/util/xml/StaxSourceTests.java
index 843384cc6dd..61089718b1d 100644
--- a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxSourceTest.java
+++ b/org.springframework.core/src/test/java/org/springframework/util/xml/StaxSourceTests.java
@@ -29,7 +29,7 @@ import static org.custommonkey.xmlunit.XMLAssert.*;
 import org.junit.Before;
 import org.junit.Test;
 
-public class StaxSourceTest {
+public class StaxSourceTests {
 
 	private static final String XML = "<root xmlns='namespace'><child/></root>";
 
diff --git a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTest.java b/org.springframework.core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
similarity index 97%
rename from org.springframework.core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTest.java
rename to org.springframework.core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
index 74f3e527bef..980764e3ef1 100644
--- a/org.springframework.core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTest.java
+++ b/org.springframework.core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
@@ -30,7 +30,7 @@ import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.AttributesImpl;
 
-public class StaxStreamXMLReaderTest extends AbstractStaxXMLReaderTestCase {
+public class StaxStreamXMLReaderTests extends AbstractStaxXMLReaderTestCase {
 
 	public static final String CONTENT = "<root xmlns='http://springframework.org/spring-ws'><child/></root>";