diff --git a/spring-test-mvc/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java
similarity index 89%
rename from spring-test-mvc/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java
index b21c65469a..647b0960ee 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799AnnotationConfigTests.java
@@ -27,11 +27,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 /**
  * Integration tests used to assess claims raised in
  * <a href="https://jira.springsource.org/browse/SPR-9799" target="_blank">SPR-9799</a>.
- * 
- * <p>Note: this test class would normally reside in the {@code spring-test} source
- * tree; however, due to classpath issues with slf4j, this class must reside in
- * the {@code spring-test-mvc} source tree.
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  * @see Spr9799XmlConfigTests
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java
similarity index 86%
rename from spring-test-mvc/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java
rename to spring-test/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java
index 0b0245366b..4e93b67ce5 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests.java
@@ -24,11 +24,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 /**
  * Integration tests used to assess claims raised in
  * <a href="https://jira.springsource.org/browse/SPR-9799" target="_blank">SPR-9799</a>.
- * 
- * <p>Note: this test class would normally reside in the {@code spring-test} source
- * tree; however, due to classpath issues with slf4j, this class must reside in
- * the {@code spring-test-mvc} source tree.
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  * @see Spr9799AnnotationConfigTests
diff --git a/spring-test-mvc/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml
similarity index 100%
rename from spring-test-mvc/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml
rename to spring-test/src/test/resources/org/springframework/test/context/junit4/spr9799/Spr9799XmlConfigTests-context.xml