diff --git a/org.springframework.config.java/.classpath b/org.springframework.config.java/.classpath
index 793e1828ee..97db2030c1 100644
--- a/org.springframework.config.java/.classpath
+++ b/org.springframework.config.java/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="var" path="CLOVER_RUNTIME"/>
 	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -8,6 +7,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.2.RELEASE/com.springsource.org.aspectj.weaver-1.6.2.RELEASE.jar" sourcepath="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.2.RELEASE/com.springsource.org.aspectj.weaver-sources-1.6.2.RELEASE.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.context"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.beans"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.core"/>
diff --git a/org.springframework.config.java/.project b/org.springframework.config.java/.project
index 4607e560c8..d73d5ca3e5 100644
--- a/org.springframework.config.java/.project
+++ b/org.springframework.config.java/.project
@@ -10,21 +10,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>com.cenqua.clover.core.prejavabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>com.cenqua.clover.core.postjavabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
@@ -42,6 +32,5 @@
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>com.cenqua.clover.core.clovernature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.springframework.config.java/.springBeans b/org.springframework.config.java/.springBeans
index b8ae900a11..8073f9a782 100644
--- a/org.springframework.config.java/.springBeans
+++ b/org.springframework.config.java/.springBeans
@@ -7,8 +7,6 @@
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
-		<config>src/test/java/test/basic/AutowiredConfigurationTests.xml</config>
-		<config>src/test/java/test/basic/ValueInjectionTests.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/package-info.java b/org.springframework.config.java/src/test/java/org/springframework/config/java/support/package-info.java
index cb7b7c78ed..ed5d2dffe8 100644
--- a/org.springframework.config.java/src/test/java/org/springframework/config/java/support/package-info.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/config/java/support/package-info.java
@@ -1,5 +1,7 @@
 /**
- * Unit tests for classes in
- * {@literal org.springframework.context.annotation.support}
+ * Unit tests for support classes related to 
+ * {@link org.springframework.config.java.Configuration} class processing.
+ * 
+ * @author Chris Beams
  */
 package org.springframework.config.java.support;
\ No newline at end of file
diff --git a/org.springframework.config.java/src/test/java/test/basic/AbstractBeanDefinitionConfigurationClassTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java
similarity index 97%
rename from org.springframework.config.java/src/test/java/test/basic/AbstractBeanDefinitionConfigurationClassTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java
index 589f3f3713..0ad5f8de81 100644
--- a/org.springframework.config.java/src/test/java/test/basic/AbstractBeanDefinitionConfigurationClassTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package test.basic;
+package org.springframework.context.annotation.configuration;
 
 import static org.junit.Assert.*;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*;
diff --git a/org.springframework.config.java/src/test/java/test/basic/AbstractJavaConfigTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractJavaConfigTests.java
similarity index 67%
rename from org.springframework.config.java/src/test/java/test/basic/AbstractJavaConfigTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractJavaConfigTests.java
index f86769d258..101b0a2cca 100644
--- a/org.springframework.config.java/src/test/java/test/basic/AbstractJavaConfigTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractJavaConfigTests.java
@@ -1,4 +1,4 @@
-package test.basic;
+package org.springframework.context.annotation.configuration;
 
 import org.junit.Before;
 
diff --git a/org.springframework.config.java/src/test/java/test/basic/AspectTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java
similarity index 97%
rename from org.springframework.config.java/src/test/java/test/basic/AspectTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java
index 5b8f50da03..68772b322c 100644
--- a/org.springframework.config.java/src/test/java/test/basic/AspectTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java
@@ -1,4 +1,4 @@
-package test.basic;
+package org.springframework.context.annotation.configuration;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
diff --git a/org.springframework.config.java/src/test/java/test/basic/AutowiredConfigurationTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
similarity index 96%
rename from org.springframework.config.java/src/test/java/test/basic/AutowiredConfigurationTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
index 012615384f..0a97cc1fbb 100644
--- a/org.springframework.config.java/src/test/java/test/basic/AutowiredConfigurationTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
@@ -1,4 +1,4 @@
-package test.basic;
+package org.springframework.context.annotation.configuration;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
diff --git a/org.springframework.config.java/src/test/java/test/basic/AutowiredConfigurationTests.xml b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml
similarity index 100%
rename from org.springframework.config.java/src/test/java/test/basic/AutowiredConfigurationTests.xml
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml
diff --git a/org.springframework.config.java/src/test/java/test/basic/BasicTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java
similarity index 98%
rename from org.springframework.config.java/src/test/java/test/basic/BasicTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java
index b2d55549c1..ef9661195e 100644
--- a/org.springframework.config.java/src/test/java/test/basic/BasicTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java
@@ -1,4 +1,4 @@
-package test.basic;
+package org.springframework.context.annotation.configuration;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
diff --git a/org.springframework.config.java/src/test/java/test/feature/atimport/ImportTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
similarity index 99%
rename from org.springframework.config.java/src/test/java/test/feature/atimport/ImportTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
index 0b3243e11f..2d2b59d185 100644
--- a/org.springframework.config.java/src/test/java/test/feature/atimport/ImportTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package test.feature.atimport;
+package org.springframework.context.annotation.configuration;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
diff --git a/org.springframework.config.java/src/test/java/test/basic/PolymorphicConfigurationTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java
similarity index 96%
rename from org.springframework.config.java/src/test/java/test/basic/PolymorphicConfigurationTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java
index d340cc7088..b5430f9add 100644
--- a/org.springframework.config.java/src/test/java/test/basic/PolymorphicConfigurationTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package test.basic;
+package org.springframework.context.annotation.configuration;
 
 import java.lang.annotation.Inherited;
 
diff --git a/org.springframework.config.java/src/test/java/test/feature/lifecycle/scoping/ScopingTests.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
similarity index 99%
rename from org.springframework.config.java/src/test/java/test/feature/lifecycle/scoping/ScopingTests.java
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
index 09bc7c9b85..d7b4e22503 100644
--- a/org.springframework.config.java/src/test/java/test/feature/lifecycle/scoping/ScopingTests.java
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package test.feature.lifecycle.scoping;
+package org.springframework.context.annotation.configuration;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
diff --git a/org.springframework.config.java/src/test/java/test/basic/ValueInjectionTests.xml b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml
similarity index 100%
rename from org.springframework.config.java/src/test/java/test/basic/ValueInjectionTests.xml
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml
diff --git a/org.springframework.config.java/src/test/java/test/basic/aspectj-autoproxy-config.xml b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml
similarity index 100%
rename from org.springframework.config.java/src/test/java/test/basic/aspectj-autoproxy-config.xml
rename to org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml
diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/package-info.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/package-info.java
new file mode 100644
index 0000000000..66afa6d676
--- /dev/null
+++ b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/package-info.java
@@ -0,0 +1,10 @@
+/**
+ * Integration tests for {@link org.springframework.config.java.Configuration}
+ * class processing.
+ * 
+ * @author Chris Beams
+ * @see org.springframework.config.java.Configuration
+ * @see org.springframework.config.java.Bean
+ * @see org.springframework.config.java.support.ConfigurationClassPostProcessor
+ */
+package org.springframework.context.annotation.configuration;
\ No newline at end of file