diff --git a/solr/build.xml b/solr/build.xml
index 566002b3094..4d27e17d8d7 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -129,11 +129,11 @@
   <target name="compile" description="Compile the source code."
           depends="compile-core, compile-contrib"/>
   <target name="test" description="Validate, then run core, solrj, and contrib unit tests."
-          depends="validate-solr, test-core, test-jsp, test-contrib"/>
+          depends="validate-solr, test-core, test-contrib"/>
   <target name="test-core" description="Runs the core and solrj unit tests."
           depends="test-solr-core, test-solrj"/>
   <target name="compile-test" description="Compile unit tests."
-          depends="compile-solr-test-framework, compile-test-solr-core, compile-test-solrj"/>
+          depends="compile-solr-test-framework, compile-test-solr-core, compile-test-solrj, compile-test-contrib, test-jsp"/>
   <target name="javadocs" description="Calls javadocs-all" depends="javadocs-all"/>
   <target name="compile-core" depends="compile-solr-core" unless="solr.core.compiled"/>
   
diff --git a/solr/common-build.xml b/solr/common-build.xml
index ad9fdce2c49..3e030d74d27 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -294,6 +294,9 @@
   <target name="compile-contrib" description="Compile contrib modules">
   	<contrib-crawl target="compile-core"/>
   </target>
+  <target name="compile-test-contrib" description="Compile contrib modules' tests">
+  	<contrib-crawl target="compile-test"/>
+  </target>
 
   <target name="contribs-add-to-war">
     <mkdir dir="${dest}/web"/>