diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/EnvironmentBeansTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
similarity index 88%
rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/EnvironmentBeansTests.java
rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
index 7d4a0f00b6..2bd47474f5 100644
--- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/EnvironmentBeansTests.java
+++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
@@ -33,13 +33,13 @@ import org.springframework.core.io.ClassPathResource;
  *
  * @author Chris Beams
  */
-public class EnvironmentBeansTests {
+public class ProfileXmlBeanDefinitionTests {
 
-	private static final String PROD_ELIGIBLE_XML = "environmentBeans-prodProfile.xml";
-	private static final String DEV_ELIGIBLE_XML = "environmentBeans-devProfile.xml";
-	private static final String ALL_ELIGIBLE_XML = "environmentBeans-noProfile.xml";
-	private static final String MULTI_ELIGIBLE_XML = "environmentBeans-multiProfile.xml";
-	private static final String UNKOWN_ELIGIBLE_XML = "environmentBeans-unknownProfile.xml";
+	private static final String PROD_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-prodProfile.xml";
+	private static final String DEV_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-devProfile.xml";
+	private static final String ALL_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-noProfile.xml";
+	private static final String MULTI_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-multiProfile.xml";
+	private static final String UNKOWN_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-unknownProfile.xml";
 
 	private static final String PROD_ACTIVE = "prod";
 	private static final String DEV_ACTIVE = "dev";
@@ -51,7 +51,7 @@ public class EnvironmentBeansTests {
 	private static final String TARGET_BEAN = "foo";
 
 	@Test
-	public void test() {
+	public void testProfilePermutations() {
 		assertThat(beanFactoryFor(PROD_ELIGIBLE_XML, NONE_ACTIVE), not(containsTargetBean()));
 		assertThat(beanFactoryFor(PROD_ELIGIBLE_XML, NULL_ACTIVE), not(containsTargetBean()));
 		assertThat(beanFactoryFor(PROD_ELIGIBLE_XML, DEV_ACTIVE), not(containsTargetBean()));
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-devProfile.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-devProfile.xml
rename to org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-multiProfile.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-multiProfile.xml
rename to org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-noProfile.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-noProfile.xml
rename to org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-prodProfile.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-prodProfile.xml
rename to org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-unknownProfile.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml
similarity index 100%
rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-unknownProfile.xml
rename to org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml