diff --git a/WHATSNEW b/WHATSNEW
index 17e6e3481..4e45aec10 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -20,6 +20,8 @@ Changes that could break older environments:
 
  * Setting the default encoding of StringResource to UTF-8 instead of null
 
+ * Upgrade JUnit 4 to JUnit 4.11
+
 Fixed bugs:
 -----------
 
diff --git a/lib/optional/hamcrest-core-1.3.jar b/lib/optional/hamcrest-core-1.3.jar
new file mode 100644
index 000000000..9d5fe16e3
Binary files /dev/null and b/lib/optional/hamcrest-core-1.3.jar differ
diff --git a/src/etc/poms/ant-junit4/pom.xml b/src/etc/poms/ant-junit4/pom.xml
index d21d1823f..1d512ab5e 100644
--- a/src/etc/poms/ant-junit4/pom.xml
+++ b/src/etc/poms/ant-junit4/pom.xml
@@ -45,7 +45,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.11</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/src/etc/testcases/taskdefs/optional/junit.xml b/src/etc/testcases/taskdefs/optional/junit.xml
index 70b5ee0bf..17acdfea3 100644
--- a/src/etc/testcases/taskdefs/optional/junit.xml
+++ b/src/etc/testcases/taskdefs/optional/junit.xml
@@ -294,6 +294,7 @@
   </target>
 
   <target name="testTestMethods" >
+    <property name="tmp.dir" value="out"/>
     <echo file="${tmp.dir}/T1.java">public class T1 extends
       junit.framework.TestCase {
       public void testOK() {}