diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml
index d8ba69549..bb50976ac 100644
--- a/src/etc/poms/ant-junit/pom.xml
+++ b/src/etc/poms/ant-junit/pom.xml
@@ -48,6 +48,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
       <version>4.12</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -55,16 +61,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>create-timestamp-file</id>
-            <phase>generate-resources</phase>
+            <id>copy-junit-xsl</id>
+            <phase>process-classes</phase>
             <goals>
               <goal>run</goal>
             </goals>
             <configuration>
               <tasks>
-                <mkdir dir="${project.build.outputDirectory}"/>
                 <copy todir="${project.build.outputDirectory}/org/apache/tools/ant/taskdefs/optional/junit/xsl">
-                  <fileset dir="${project.build.sourceDirectory}/../etc">
+                  <fileset dir="${project.build.scriptSourceDirectory}">
                     <include name="junit-frames.xsl"/>
                     <include name="junit-noframes.xsl"/>
                     <include name="junit-frames-saxon.xsl"/>
@@ -84,11 +89,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
             <include>org/apache/tools/ant/taskdefs/optional/junit/*</include>
           </includes>
           <excludes>
-              <exclude>org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter*</exclude>
-              <exclude>org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache*</exclude>
           </excludes>
           <testIncludes>
             <include>org/apache/tools/ant/taskdefs/optional/junit/</include>
+            <include>org/example/junit/</include>
+            <include>org/example/tasks/*.java</include>
+            <include>org/example/types/</include>
           </testIncludes>
         </configuration>
       </plugin>
@@ -112,7 +120,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <configuration>
           <basedir>../../../..</basedir>
           <workingDirectory>../../../..</workingDirectory>
-          <skipTests>true</skipTests>
+          <systemProperties>
+            <property>
+              <name>build.tests.value</name>
+              <value>${project.basedir}/../../../../target/${project.artifactId}/testcases</value>
+            </property>
+            <property>
+              <name>ant.test.basedir.ignore</name>
+              <value>true</value>
+            </property>
+          </systemProperties>
+          <excludes>
+            <exclude>org/example/junit/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/*$*</exclude>
+          </excludes>
         </configuration>
       </plugin>
     </plugins>
@@ -126,8 +147,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         </includes>
       </resource>
     </resources>
+    <testResources>
+      <testResource>
+        <directory>../../../../src/tests/junit</directory>
+        <includes>
+          <include>org/example/tasks/*.xml</include>
+        </includes>
+      </testResource>
+    </testResources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
+    <scriptSourceDirectory>../../../../src/etc</scriptSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>
diff --git a/src/etc/poms/ant-junitlauncher/pom.xml b/src/etc/poms/ant-junitlauncher/pom.xml
index 16b931191..02d5a70aa 100644
--- a/src/etc/poms/ant-junitlauncher/pom.xml
+++ b/src/etc/poms/ant-junitlauncher/pom.xml
@@ -68,10 +68,11 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <includes>
-                        <include>org/apache/tools/ant/taskdefs/optional/junitlauncher/*</include>
+                        <include>org/apache/tools/ant/taskdefs/optional/junitlauncher/</include>
                     </includes>
                     <testIncludes>
-                        <include>org/apache/tools/ant/taskdefs/optional/junitlauncher/*</include>
+                        <include>org/apache/tools/ant/taskdefs/optional/junitlauncher/</include>
+                        <include>org/example/junitlauncher/</include>
                     </testIncludes>
                 </configuration>
             </plugin>
@@ -95,7 +96,19 @@
                 <configuration>
                     <basedir>../../../..</basedir>
                     <workingDirectory>../../../..</workingDirectory>
-                    <skipTests>true</skipTests>
+                    <systemProperties>
+                        <property>
+                            <name>build.tests.value</name>
+                            <value>${project.basedir}/../../../../target/${project.artifactId}/testcases</value>
+                        </property>
+                        <property>
+                            <name>ant.test.basedir.ignore</name>
+                            <value>true</value>
+                        </property>
+                    </systemProperties>
+                    <excludes>
+                        <exclude>org/example/junitlauncher/**</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/etc/testcases/taskdefs/optional/junit.xml b/src/etc/testcases/taskdefs/optional/junit.xml
index 40bfda6f5..eeef7cd8d 100644
--- a/src/etc/testcases/taskdefs/optional/junit.xml
+++ b/src/etc/testcases/taskdefs/optional/junit.xml
@@ -20,85 +20,85 @@
   <import file="../../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <mkdir dir="${output}" />
+    <mkdir dir="${output}"/>
   </target>
 
-  <property name="showoutput" value="false" />
+  <property name="showoutput" value="false"/>
+
   <path id="test">
-    <pathelement path="${java.class.path}" />
-    <pathelement location="../../../../../build/testcases" />
+    <pathelement path="${java.class.path}"/>
+    <pathelement location="${build.tests.value}"/>
   </path>
 
   <target name="testForkedOutput">
     <junit fork="yes" haltonerror="true" haltonfailure="true" 
            showoutput="${showoutput}">
-      <test name="org.example.junit.Output" />
-      <classpath refid="test" />
+      <test name="org.example.junit.Output"/>
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="testNonForkedOutput">
     <junit fork="false" haltonerror="true" haltonfailure="true"
            showoutput="${showoutput}">
-      <test name="org.example.junit.Output" />
-      <classpath refid="test" />
+      <test name="org.example.junit.Output"/>
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="testForkedThreadedOutput">
     <junit fork="yes" haltonerror="true" haltonfailure="true"
            showoutput="${showoutput}">
-      <test name="org.example.junit.ThreadedOutput" />
-      <classpath refid="test" />
+      <test name="org.example.junit.ThreadedOutput"/>
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="testNonForkedThreadedOutput">
     <junit fork="false" haltonerror="true" haltonfailure="true"
            showoutput="${showoutput}">
-      <test name="org.example.junit.ThreadedOutput" />
-      <classpath refid="test" />
+      <test name="org.example.junit.ThreadedOutput"/>
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="outputTests" 
-          depends="testForkedOutput,testNonForkedOutput,testForkedThreadedOutput,testNonForkedThreadedOutput" />
+          depends="testForkedOutput,testNonForkedOutput,testForkedThreadedOutput,testNonForkedThreadedOutput"/>
 
   <target name="crash">
     <junit fork="true" errorproperty="crashed">
       <test name="org.apache.tools.ant.taskdefs.optional.junit.VmCrash"/>
-      <classpath refid="test" />
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="nocrash">
     <junit fork="true" errorproperty="crashed">
       <test name="org.apache.tools.ant.taskdefs.optional.junit.NoVmCrash"/>
-      <classpath refid="test" />
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="timeout">
     <junit fork="true" errorproperty="timeout" timeout="1000">
       <test name="org.apache.tools.ant.taskdefs.optional.junit.Sleeper"/>
-      <classpath refid="test" />
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="notimeout">
     <junit fork="true" errorproperty="timeout" timeout="15000">
       <test name="org.apache.tools.ant.taskdefs.optional.junit.Sleeper"/>
-      <classpath refid="test" />
+      <classpath refid="test"/>
     </junit>
   </target>
 
   <target name="capture" depends="setUp">
     <property name="fork" value="false"/>
     <junit fork="${fork}">
-      <test
-        name="org.apache.tools.ant.taskdefs.optional.junit.Printer"
-        todir="${output}"
-        outfile="testlog"/>
+      <test name="org.apache.tools.ant.taskdefs.optional.junit.Printer"
+            todir="${output}"
+            outfile="testlog"/>
       <formatter type="plain"/>
       <classpath refid="test"/>
     </junit>
@@ -120,8 +120,7 @@
       <classpath refid="test"/>
       <batchtest todir="${output}">
         <fileset dir="../../../../tests/junit">
-          <include
-            name="org/apache/tools/ant/taskdefs/optional/junit/*Test.java"/>
+          <include name="org/apache/tools/ant/taskdefs/optional/junit/*Test.java"/>
           <!-- tests remove out-dir on tearDown -->
           <exclude name="**/JUnitTestListenerTest.java"/>
           <exclude name="**/JUnitTaskTest.java"/>
@@ -139,8 +138,7 @@
       <classpath refid="test"/>
       <batchtest todir="${output}">
         <fileset dir="../../../../tests/junit">
-          <include
-            name="org/apache/tools/ant/taskdefs/optional/junit/*Test.java"/>
+          <include name="org/apache/tools/ant/taskdefs/optional/junit/*Test.java"/>
           <!-- tests remove out-dir on tearDown -->
           <exclude name="**/JUnitTestListenerTest.java"/>
           <exclude name="**/JUnitTaskTest.java"/>
@@ -154,12 +152,11 @@
     <mkdir dir="${output}"/>
     <junit fork="true" forkmode="once">
       <formatter extension="foo"
-        classname="org.apache.tools.ant.taskdefs.optional.junit.TestFormatter"/>
+                 classname="org.apache.tools.ant.taskdefs.optional.junit.TestFormatter"/>
       <classpath refid="test"/>
       <batchtest todir="${output}">
         <fileset dir="../../../../tests/junit">
-          <include
-            name="org/apache/tools/ant/taskdefs/optional/junit/*Test.java"/>
+          <include name="org/apache/tools/ant/taskdefs/optional/junit/*Test.java"/>
           <!-- tests remove out-dir on tearDown -->
           <exclude name="**/JUnitTestListenerTest.java"/>
           <exclude name="**/JUnitTaskTest.java"/>
@@ -244,8 +241,7 @@
     <ant target="failureRecorder.internal"
          antfile="junit.xml" 
          inheritAll="false"
-         inheritRefs="false" 
-    />
+         inheritRefs="false"/>
   </target>
   
   <target name="failureRecorder.fixing">
@@ -281,47 +277,46 @@
   <target name="testSkippableTests">
     <mkdir dir="${output}"/>
     <junit>
-            <formatter type="xml"/>
-            <classpath refid="test"/>
-            <batchtest todir="${output}">
-                <fileset dir="../../../../tests/junit">
-                    <include name="org/example/junit/JUnit4Skippable.java"/>
-                    <!-- tests remove out-dir on tearDown -->
-                </fileset>
-            </batchtest>
+      <formatter type="xml"/>
+      <classpath refid="test"/>
+      <batchtest todir="${output}">
+        <fileset dir="../../../../tests/junit">
+          <include name="org/example/junit/JUnit4Skippable.java"/>
+          <!-- tests remove out-dir on tearDown -->
+        </fileset>
+      </batchtest>
     </junit>
   </target>
 
-
   <!-- Skipping classes that are not tests -->
   <target name="testNonTests">
     <mkdir dir="${output}"/>
-        <junit>
-            <formatter type="xml"/>
-            <classpath refid="test"/>
-            <batchtest todir="${output}" skipNonTests="true">
-                <fileset dir="../../../../tests/junit">
-                    <include name="org/example/junit/*Missed.java"/>
-                    <!-- tests remove out-dir on tearDown -->
-                </fileset>
-            </batchtest>
+    <junit>
+      <formatter type="xml"/>
+      <classpath refid="test"/>
+      <batchtest todir="${output}" skipNonTests="true">
+        <fileset dir="../../../../tests/junit">
+          <include name="org/example/junit/*Missed.java"/>
+          <!-- tests remove out-dir on tearDown -->
+        </fileset>
+      </batchtest>
     </junit>
   </target>
 
-    <!-- Not skipping classes that are not tests -->
-    <target name="testNonTestsRun">
-        <mkdir dir="${output}"/>
-        <junit>
-            <formatter type="xml"/>
-            <classpath refid="test"/>
-            <batchtest todir="${output}" skipNonTests="false">
-                <fileset dir="../../../../tests/junit">
-                    <include name="org/example/junit/*Missed.java"/>
-                    <!-- tests remove out-dir on tearDown -->
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
+  <!-- Not skipping classes that are not tests -->
+  <target name="testNonTestsRun">
+    <mkdir dir="${output}"/>
+    <junit>
+      <formatter type="xml"/>
+      <classpath refid="test"/>
+      <batchtest todir="${output}" skipNonTests="false">
+        <fileset dir="../../../../tests/junit">
+          <include name="org/example/junit/*Missed.java"/>
+          <!-- tests remove out-dir on tearDown -->
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
 
   <target name="testTestMethods" >
     <property name="tmp.dir" value="${output}"/>
@@ -342,29 +337,28 @@
     <property name="source" value="8"/>
     <javac srcdir="${tmp.dir}" destdir="${tmp.dir}" includes="T1.java,T2.java"
            source="${source}">
-
     </javac>
     <junit fork="false" printsummary="true" haltonerror="true">
       <classpath>
-        <pathelement location="${tmp.dir}" />
-        <path refid="test" />
+        <pathelement location="${tmp.dir}"/>
+        <path refid="test"/>
       </classpath>
-      <test name="T1" methods="testOK" />
-      <test name="T2" methods="ok" />
+      <test name="T1" methods="testOK"/>
+      <test name="T2" methods="ok"/>
     </junit>
   </target>
 
   <target name="testCheckForkedPath">
-    <property name="includeantruntime" value="yes" />
+    <property name="includeantruntime" value="yes"/>
     <!-- duplicate the Ant classes into a jar -->
-    <jar destfile="${output}/ant.jar" basedir="${antclasses}" />
+    <jar destfile="${output}/ant.jar" basedir="${antclasses}"/>
     <junit fork="yes" haltonerror="true" haltonfailure="true"
-             showoutput="${showoutput}" includeantruntime="${includeantruntime}">
-      <test name="org.example.junit.Output" />
+           showoutput="${showoutput}" includeantruntime="${includeantruntime}">
+      <test name="org.example.junit.Output"/>
       <classpath>
-        <pathelement location="../../../../../build/testcases" />
-        <pathelement location="${junitjar}" />
-        <pathelement location="${output}/ant.jar" />
+        <pathelement location="${build.tests.value}"/>
+        <pathelement location="${junitjar}"/>
+        <pathelement location="${output}/ant.jar"/>
       </classpath>
     </junit>
   </target>
diff --git a/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml b/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml
index abb6a4107..fde4f6b50 100644
--- a/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml
+++ b/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml
@@ -18,15 +18,15 @@
 <project>
 
   <path id="test">
-    <pathelement path="${java.class.path}" />
-    <pathelement location="../../../../../../build/testcases" />
+    <pathelement path="${java.class.path}"/>
+    <pathelement location="${build.tests.value}"/>
   </path>
 
   <target name="testNoTeardown">
     <junit haltonerror="false" errorproperty="error" fork="true" timeout="1000">
       <formatter type="plain" usefile="false"/>
       <batchtest>
-        <fileset dir="../../../../../../build/testcases">
+        <fileset dir="${build.tests.value}">
           <include name="org/example/junit/Timeout*"/>
         </fileset>
       </batchtest>
@@ -40,11 +40,12 @@
       <formatter classname="org.apache.tools.ant.taskdefs.optional.junit.TearDownOnVmCrash"
                  usefile="false"/>
       <batchtest>
-        <fileset dir="../../../../../../build/testcases">
+        <fileset dir="${build.tests.value}">
           <include name="org/example/junit/Timeout*"/>
         </fileset>
       </batchtest>
       <classpath refid="test"/>
     </junit>
   </target>
+
 </project>
diff --git a/src/etc/testcases/taskdefs/optional/junitlauncher.xml b/src/etc/testcases/taskdefs/optional/junitlauncher.xml
index 3daa397a0..6dd202d8a 100644
--- a/src/etc/testcases/taskdefs/optional/junitlauncher.xml
+++ b/src/etc/testcases/taskdefs/optional/junitlauncher.xml
@@ -19,7 +19,7 @@
 <project name="junitlauncher-test" basedir=".">
 
     <property name="output.dir" location="${java.io.tmpdir}"/>
-    <property name="build.classes.dir" value="../../../../../build/testcases"/>
+    <property name="build.classes.dir" value="${build.tests.value}"/>
     <target name="init">
         <mkdir dir="${output.dir}"/>
     </target>
diff --git a/src/tests/junit/org/apache/tools/ant/types/PathTest.java b/src/tests/junit/org/apache/tools/ant/types/PathTest.java
index 391242d62..79408b1ea 100644
--- a/src/tests/junit/org/apache/tools/ant/types/PathTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/PathTest.java
@@ -577,7 +577,8 @@ public class PathTest {
         d.setDir(project.resolveFile("."));
         String s = System.getProperty("build.tests.value");
         assertNotNull("build.tests.value not set", s);
-        String n = Paths.get(s).getParent().equals("ant") ? "ant" : "build";
+        String n = Paths.get(s).getParent().getFileName().toString().equals("ant")
+                ? "target" : "build";
         d.setIncludes(n);
         p.addDirset(d);
         String[] l = p.list();