diff --git a/build.xml b/build.xml
index 986c4b2d8..0579028a1 100644
--- a/build.xml
+++ b/build.xml
@@ -190,7 +190,16 @@
   </selector>
 
   <selector id="needs.junit">
-    <filename name="${optional.package}/junit/"/>
+    <and>
+      <filename name="${optional.package}/junit/"/>
+      <not>
+        <filename name="${optional.package}/junit/JUnit4TestMethodAdapter*"/>
+      </not>
+    </and>
+  </selector>
+
+  <selector id="needs.junit4">
+    <filename name="${optional.package}/junit/JUnit4TestMethodAdapter*"/>
   </selector>
 
   <selector id="needs.apache-regexp">
@@ -349,10 +358,12 @@
     <available property="recent.xalan2.present"
       classname="org.apache.xalan.trace.TraceListenerEx3"
       classpathref="classpath" ignoresystemclasses="true"/>
-    <condition property="junit.present">
+    <available property="junit.present"
+      classname="junit.framework.TestCase"
+      classpathref="classpath" ignoresystemclasses="true"/>
+    <condition property="junit4.present">
       <and>
         <!-- Need JDK 5+ to compile since junit-4*.jar uses new bytecode format -->
-        <!-- (could also try to compile all but JUnit4TestMethodAdapter but you would need to add junit-3*.jar to CP yourself) -->
         <available classname="java.net.Proxy"/>
         <available
           classname="org.junit.Test"
@@ -539,6 +550,7 @@
 
             <selector refid="needs.apache-resolver" unless="apache.resolver.present"/>
             <selector refid="needs.junit" unless="junit.present"/>
+            <selector refid="needs.junit4" unless="junit4.present"/>
             <selector refid="needs.apache-regexp"
               unless="apache.regexp.present"/>
             <selector refid="needs.apache-oro" unless="apache.oro.present"/>
@@ -664,6 +676,7 @@
           <selector refid="needs.jmf"/>
           <selector refid="needs.jsch"/>
           <selector refid="needs.junit"/>
+          <selector refid="needs.junit4"/>
           <selector refid="needs.netrexx"/>
           <selector refid="needs.swing"/>
           <selector refid="ant.launcher"/>
@@ -727,6 +740,7 @@
 
     <optional-jar dep="apache-resolver"/>
     <optional-jar dep="junit"/>
+    <optional-jar dep="junit4"/>
     <optional-jar dep="apache-regexp"/>
     <optional-jar dep="apache-oro"/>
     <optional-jar dep="apache-bcel"/>
diff --git a/lib/optional/README b/lib/optional/README
index 3310d4afc..a7f22222a 100644
--- a/lib/optional/README
+++ b/lib/optional/README
@@ -1,3 +1,4 @@
-The file junit-4.8.1.jar is version 4.8.1 of JUnit, see the file LICENSE.junit.html
-for the terms of distribution.  For more information about JUnit or
-the latest release, see <http://www.junit.org/>.
+The file junit-3.8.2.jar is version 3.8.2 of JUnit, whereas junit-4.8.1.jar is
+version 4.8.1 with the junit.** classes removed (except for the 3.x -> 4.x
+adapter); see the file LICENSE.junit.html for the terms of distribution. For
+more information about JUnit or the latest release, see <http://www.junit.org/>.
diff --git a/lib/optional/junit-3.8.2.jar b/lib/optional/junit-3.8.2.jar
new file mode 100644
index 000000000..c8f711d05
Binary files /dev/null and b/lib/optional/junit-3.8.2.jar differ
diff --git a/lib/optional/junit-4.8.1.jar b/lib/optional/junit-4.8.1.jar
index 524cd65ce..c466ab688 100644
Binary files a/lib/optional/junit-4.8.1.jar and b/lib/optional/junit-4.8.1.jar differ
diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml
index 4a1bb1011..1a7ec3b69 100644
--- a/src/etc/poms/ant-junit/pom.xml
+++ b/src/etc/poms/ant-junit/pom.xml
@@ -82,6 +82,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/junit/*</include>
           </includes>
+          <excludes>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter*</exclude>
+          </excludes>
         </configuration>
       </plugin>
     </plugins>
diff --git a/src/etc/poms/ant-junit4/pom.xml b/src/etc/poms/ant-junit4/pom.xml
new file mode 100644
index 000000000..644348777
--- /dev/null
+++ b/src/etc/poms/ant-junit4/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!--
+  This POM has been created manually by the Ant Development Team.
+  Please contact us if you are not satisfied with the data contained in this POM.
+  URL : http://ant.apache.org
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.ant</groupId>
+    <artifactId>ant-parent</artifactId>
+    <relativePath>../pom.xml</relativePath>
+    <version>1.8.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.ant</groupId>
+  <artifactId>ant-junit4</artifactId>
+  <version>1.8.2-SNAPSHOT</version>
+  <description>contains JUnit 4.x support</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.8.2-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+          <includes>
+            <include>org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter*</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+    <sourceDirectory>../../../../src/main</sourceDirectory>
+    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
+    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
+    <directory>../../../../target/${project.artifactId}</directory>
+  </build>
+</project>
diff --git a/src/etc/poms/pom.xml b/src/etc/poms/pom.xml
index 5fce47c1e..a7c37072d 100644
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@ -85,6 +85,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <module>ant-jmf</module>
     <module>ant-jsch</module>
     <module>ant-junit</module>
+    <module>ant-junit4</module>
     <module>ant-launcher</module>
     <module>ant-netrexx</module>
     <module>ant-swing</module>