diff --git a/dev-tools/testjar/testfiles b/dev-tools/testjar/testfiles
new file mode 100755
index 00000000000..84d8bfb2eab
--- /dev/null
+++ b/dev-tools/testjar/testfiles
@@ -0,0 +1,24 @@
+core.test.files=\
+	org/apache/lucene/util/_TestUtil.java,\
+	org/apache/lucene/util/LineFileDocs.java,\
+	org/apache/lucene/util/LuceneJUnitDividingSelector.java,\
+	org/apache/lucene/util/LuceneJUnitResultFormatter.java,\
+	org/apache/lucene/util/LuceneTestCase.java,\
+	org/apache/lucene/util/automaton/AutomatonTestUtil.java,\
+	org/apache/lucene/search/QueryUtils.java,\
+	org/apache/lucene/analysis/BaseTokenStreamTestCase.java,\
+	org/apache/lucene/analysis/MockAnalyzer.java,\
+	org/apache/lucene/analysis/MockPayloadAnalyzer.java,\
+	org/apache/lucene/analysis/MockTokenFilter.java,\
+	org/apache/lucene/analysis/MockTokenizer.java,\
+	org/apache/lucene/index/MockIndexInput.java,\
+	org/apache/lucene/index/RandomIndexWriter.java,\
+	org/apache/lucene/index/DocHelper.java,\
+	org/apache/lucene/codecs/preflexrw/PreFlexFieldsWriter.java,\
+	org/apache/lucene/codecs/preflexrw/PreFlexRWCodec.java,\
+	org/apache/lucene/codecs/preflexrw/TermInfosWriter.java,\
+	org/apache/lucene/codecs/mockrandom/MockRandomCodec.java,\
+	org/apache/lucene/store/_TestHelper.java,\
+	org/apache/lucene/store/MockDirectoryWrapper.java,\
+	org/apache/lucene/store/MockIndexInputWrapper.java,\
+	org/apache/lucene/store/MockIndexOutputWrapper.java,\
diff --git a/lucene/build.xml b/lucene/build.xml
index 7827695aa9d..4205d3c756d 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -618,4 +618,16 @@
     </rat:report>
   </target>
 
+  <target name="jar-core-test" depends="compile-test">
+    <!-- load the list of test files into a property named core.test.files -->
+  	<property file="../dev-tools/testjar/testfiles" />
+    <!-- copy the files so that we can compile and include both .java and .class in the jar --> 
+    <copy todir="${build.dir}/testjar" >
+        <fileset dir="src/test" includes="${core.test.files}" />
+    </copy>
+  	<compile-test-macro srcdir="${build.dir}/testjar" destdir="${build.dir}/testjar"
+						test.classpath="test.classpath"/>
+    <jarify basedir="${build.dir}/testjar" destfile="${build.dir}/${final.name}-tests.jar"/>
+  </target>
+
 </project>
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index fe93b40b62b..be42d5bd648 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -308,10 +308,6 @@
     <jarify/>
   </target>
 
- <target name="jar-core-test" depends="compile-test">
-    <jarify basedir="${build.dir}/classes/test" destfile="${build.dir}/${final.name}-tests.jar"/>
-  </target>
-
   <target name="maven.ant.tasks-check">
 	<fail unless="maven.ant.tasks.present">
 	  ##################################################################