diff --git a/solr/common-build.xml b/solr/common-build.xml
index 5efde953556..4edc6a585e0 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -530,6 +530,10 @@
     <contrib-crawl target="test" failonerror="true"/>
   </target>
 
+  <target name="compile-test-contrib" depends="build-contrib">
+    <contrib-crawl target="compileTests" failonerror="true"/>
+  </target>
+
   <target name="dist-contrib" description="Make the contribs ready for distribution">
   	<contrib-crawl target="dist" failonerror="true" />
   </target>
diff --git a/solr/contrib/dataimporthandler/build.xml b/solr/contrib/dataimporthandler/build.xml
index a173dc0c5a7..7115e1cfe57 100644
--- a/solr/contrib/dataimporthandler/build.xml
+++ b/solr/contrib/dataimporthandler/build.xml
@@ -118,7 +118,9 @@
               manifest="../../${dest}/META-INF/MANIFEST.MF" />
   </target>
 	
-  <target name="compileTests" depends="compile">
+  <target name="compileTests" depends="compileCoreTests,compileExtrasTests"/>
+  
+  <target name="compileCoreTests" depends="compile">
   	<solr-javac destdir="target/test-classes"
   	                classpathref="test.classpath">
   	  <src path="src/test/java" />
@@ -143,7 +145,7 @@
   <property name="tempDir" value="${junit.output.dir}/temp" />
   <target  name="test" depends="testCore,testExtras"/>
 	
-  <target name="testCore" depends="compileTests">
+  <target name="testCore" depends="compileCoreTests">
   	<mkdir dir="${junit.output.dir}"/>
     <!-- <mkdir dir="@{tempDir}/@{pattern}"/> 
        This is very loud and obnoxious. abuse touch instead for a "quiet" mkdir