diff --git a/build.gradle b/build.gradle
index 1ca1d52272..8c0a1b4245 100644
--- a/build.gradle
+++ b/build.gradle
@@ -587,7 +587,6 @@ project("spring-webmvc") {
 		testCompile("commons-io:commons-io:1.3")
 		testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
 		testCompile("org.apache.httpcomponents:httpclient:4.2")
-		testCompile(project(":spring-web").sourceSets.test.output)
 	}
 
 	// pick up DispatcherServlet.properties in src/main
@@ -599,6 +598,7 @@ project("spring-webmvc-tiles3") {
 	merge.into = project(":spring-webmvc")
 	dependencies {
 		compile(project(":spring-context"))
+		compile(project(":spring-web"))
 		provided("javax.el:el-api:1.0")
 		provided("javax.servlet:jstl:1.2")
 		provided("javax.servlet.jsp:jsp-api:2.1")
@@ -617,7 +617,6 @@ project("spring-webmvc-tiles3") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
 		provided("javax.servlet:javax.servlet-api:3.0.1")
-		compile(project(":spring-web").sourceSets*.output) // mock request & response
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 	}
 }
@@ -765,7 +764,6 @@ configure(rootProject) {
 
 	dependencies { // for integration tests
 		testCompile(project(":spring-core"))
-		testCompile(project(":spring-core").sourceSets.test.output)
 		testCompile(project(":spring-beans"))
 		testCompile(project(":spring-aop"))
 		testCompile(project(":spring-expression"))
@@ -801,18 +799,20 @@ configure(rootProject) {
 			project.sourceSets.main.allJava
 		}
 
-		classpath = files(
-			// ensure servlet 3.x and Hibernate 4.x have precedence on the Javadoc
-			// classpath over their respective 2.5 and 3.x variants
-			project(":spring-webmvc").sourceSets.main.compileClasspath.files.find { it =~ "servlet-api" },
-			rootProject.sourceSets.test.compileClasspath.files.find { it =~ "hibernate-core" },
-			// ensure the javadoc process can resolve types compiled from .aj sources
-			project(":spring-aspects").sourceSets.main.output
-		)
-		classpath += files(subprojects.collect { it.sourceSets.main.compileClasspath })
-
 		maxMemory = "1024m"
 		destinationDir = new File(buildDir, "api")
+
+		doFirst {
+			classpath = files(
+				// ensure servlet 3.x and Hibernate 4.x have precedence on the Javadoc
+				// classpath over their respective 2.5 and 3.x variants
+				project(":spring-webmvc").sourceSets.main.compileClasspath.files.find { it =~ "servlet-api" },
+				rootProject.sourceSets.test.compileClasspath.files.find { it =~ "hibernate-core" },
+				// ensure the javadoc process can resolve types compiled from .aj sources
+				project(":spring-aspects").sourceSets.main.output
+			)
+			classpath += files(subprojects.collect { it.sourceSets.main.compileClasspath })
+		}
 	}
 
 	task docsZip(type: Zip) {
diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
index e57b04dec2..1d6134ab59 100644
--- a/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
@@ -43,7 +43,7 @@ class TestSourceSetDependenciesPlugin implements Plugin<Project> {
 
 	private void collectProjectDependencies(Set<ProjectDependency> projectDependencies,
 			Project project) {
-		for(def configurationName in ["compile", "optional", "provided"]) {
+		for(def configurationName in ["compile", "optional", "provided", "testCompile"]) {
 			Configuration configuration = project.getConfigurations().findByName(configurationName)
 			if(configuration) {
 				configuration.dependencies.findAll { it instanceof ProjectDependency }.each {