diff --git a/org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/InstrumentableClassLoaderTests.java b/org.springframework.context/src/test/java/org/springframework/instrument/classloading/InstrumentableClassLoaderTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/InstrumentableClassLoaderTests.java
rename to org.springframework.context/src/test/java/org/springframework/instrument/classloading/InstrumentableClassLoaderTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java b/org.springframework.context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java
rename to org.springframework.context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java b/org.springframework.context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java
rename to org.springframework.context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java b/org.springframework.context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
rename to org.springframework.context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapterTests.java b/org.springframework.context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapterTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapterTests.java
rename to org.springframework.context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapterTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaverTests.java b/org.springframework.context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaverTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaverTests.java
rename to org.springframework.context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaverTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/testResource.xml b/org.springframework.context/src/test/java/org/springframework/instrument/classloading/testResource.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/instrument/classloading/testResource.xml
rename to org.springframework.context/src/test/java/org/springframework/instrument/classloading/testResource.xml