diff --git a/spring-beans/src/test/java/com/foo/Component.java b/src/test/java/com/foo/Component.java
similarity index 100%
rename from spring-beans/src/test/java/com/foo/Component.java
rename to src/test/java/com/foo/Component.java
diff --git a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java b/src/test/java/com/foo/ComponentBeanDefinitionParser.java
similarity index 100%
rename from spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java
rename to src/test/java/com/foo/ComponentBeanDefinitionParser.java
diff --git a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java b/src/test/java/com/foo/ComponentBeanDefinitionParserTests.java
similarity index 97%
rename from spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
rename to src/test/java/com/foo/ComponentBeanDefinitionParserTests.java
index 97e77c5740..b28d1d4160 100644
--- a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
+++ b/src/test/java/com/foo/ComponentBeanDefinitionParserTests.java
@@ -30,7 +30,7 @@ import org.springframework.core.io.ClassPathResource;
 /**
  * @author Costin Leau
  */
-public class ComponentBeanDefinitionParserTest {
+public class ComponentBeanDefinitionParserTests {
 
 	private static DefaultListableBeanFactory bf;
 
diff --git a/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java b/src/test/java/com/foo/ComponentFactoryBean.java
similarity index 100%
rename from spring-beans/src/test/java/com/foo/ComponentFactoryBean.java
rename to src/test/java/com/foo/ComponentFactoryBean.java
diff --git a/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java b/src/test/java/com/foo/ComponentNamespaceHandler.java
similarity index 100%
rename from spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java
rename to src/test/java/com/foo/ComponentNamespaceHandler.java
diff --git a/spring-beans/src/test/resources/META-INF/spring.handlers b/src/test/resources/META-INF/spring.handlers
similarity index 100%
rename from spring-beans/src/test/resources/META-INF/spring.handlers
rename to src/test/resources/META-INF/spring.handlers
diff --git a/spring-beans/src/test/resources/META-INF/spring.schemas b/src/test/resources/META-INF/spring.schemas
similarity index 100%
rename from spring-beans/src/test/resources/META-INF/spring.schemas
rename to src/test/resources/META-INF/spring.schemas
diff --git a/spring-beans/src/test/resources/com/foo/component-config.xml b/src/test/resources/com/foo/component-config.xml
similarity index 100%
rename from spring-beans/src/test/resources/com/foo/component-config.xml
rename to src/test/resources/com/foo/component-config.xml
diff --git a/spring-beans/src/test/resources/com/foo/component.xsd b/src/test/resources/com/foo/component.xsd
similarity index 100%
rename from spring-beans/src/test/resources/com/foo/component.xsd
rename to src/test/resources/com/foo/component.xsd