--- a/nashorn/make/build.xml	Fri Apr 03 16:35:42 2015 -0700
+++ b/nashorn/make/build.xml	Tue Apr 07 00:13:18 2015 +0530
@@ -402,14 +402,14 @@
   <!-- only to be invoked as dependency of "test" target -->
   <target name="-test-classes-all" depends="jar" unless="test.class">
       <fileset id="test.classes" dir="${build.test.classes.dir}">
-          <include name="**/api/javaaccess/*Test.class"/>
-          <include name="**/api/scripting/*Test.class"/>
-          <include name="**/api/tree/*Test.class"/>
-          <include name="**/codegen/*Test.class"/>
-          <include name="**/parser/*Test.class"/>
-          <include name="**/runtime/*Test.class"/>
-          <include name="**/runtime/regexp/*Test.class"/>
-          <include name="**/runtime/regexp/joni/*Test.class"/>
+          <include name="**/api/javaaccess/test/*Test.class"/>
+          <include name="**/api/scripting/test/*Test.class"/>
+          <include name="**/api/tree/test/*Test.class"/>
+          <include name="**/codegen/test/*Test.class"/>
+          <include name="**/parser/test/*Test.class"/>
+          <include name="**/runtime/test/*Test.class"/>
+          <include name="**/runtime/regexp/test/*Test.class"/>
+          <include name="**/runtime/regexp/joni/test/*Test.class"/>
           <include name="**/framework/*Test.class"/>
      </fileset>
   </target>