diff --git a/src/tests/antunit/taskdefs/javadoc-test.xml b/src/tests/antunit/taskdefs/javadoc-test.xml
index 5d35fafa8..200082bab 100644
--- a/src/tests/antunit/taskdefs/javadoc-test.xml
+++ b/src/tests/antunit/taskdefs/javadoc-test.xml
@@ -71,6 +71,24 @@ Hello World
     <mkfoo file="${input}/test/doc-files/b/foo.html"/>
   </target>
 
+  <target name="-create-file-with-warning">
+    <mkdir dir="${input}/test"/>
+        <echo file="${input}/test/Foo.java"><![CDATA[
+package test;
+
+/**
+ * This is a test class.
+ */
+public class Foo {
+    /**
+     * With a test method.
+     * @param baz wrong parameter name should cause warning.
+     */
+    public void foo(String bar) {}
+}
+]]></echo>
+  </target>
+
   <target name="testPackageSetNoExcludes" depends="-makeTwoTestClasses">
     <javadoc destdir="${output}">
       <packageset dir="${input}"/>
@@ -91,6 +109,24 @@ Hello World
     <au:assertFileDoesntExist file="${output}/test2/B.html"/>
   </target>
 
+  <!-- basically tests no exception is thrown -->
+  <target name="testDontFailOnWarning"
+          depends="-create-file-with-warning">
+    <javadoc destdir="${output}">
+      <packageset dir="${input}"/>
+    </javadoc>
+  </target>
+
+  <target name="testFailOnWarning"
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=55015"
+          depends="-create-file-with-warning">
+    <au:expectfailure>
+      <javadoc destdir="${output}" failonwarning="true">
+        <packageset dir="${input}"/>
+      </javadoc>
+    </au:expectfailure>
+  </target>
+
   <target name="XtestNoDocFiles" depends="-setUpDocFilesTests">
     <javadoc destdir="${output}">
       <packageset dir="${input}"/>