diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/MultiValueRequestPropertyMapTest.java b/spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/MultiValueRequestPropertyMapTests.java
similarity index 93%
rename from spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/MultiValueRequestPropertyMapTest.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/MultiValueRequestPropertyMapTests.java
index ba116e72..fcd4d93e 100644
--- a/spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/MultiValueRequestPropertyMapTest.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/MultiValueRequestPropertyMapTests.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import org.springframework.mock.web.portlet.MockPortletRequest;
 
-public class MultiValueRequestPropertyMapTest extends TestCase {
+public class MultiValueRequestPropertyMapTests extends TestCase {
 
 	private MultiValueRequestPropertyMap requestMap;
 
diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/SingleValueRequestPropertyMapTest.java b/spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/SingleValueRequestPropertyMapTests.java
similarity index 92%
rename from spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/SingleValueRequestPropertyMapTest.java
rename to spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/SingleValueRequestPropertyMapTests.java
index b28f7ca4..7a5e866a 100644
--- a/spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/SingleValueRequestPropertyMapTest.java
+++ b/spring-faces/src/test/java/org/springframework/faces/webflow/context/portlet/SingleValueRequestPropertyMapTests.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import org.springframework.mock.web.portlet.MockPortletRequest;
 
-public class SingleValueRequestPropertyMapTest extends TestCase {
+public class SingleValueRequestPropertyMapTests extends TestCase {
 
 	private SingleValueRequestPropertyMap requestMap;