diff --git a/src/tests/antunit/taskdefs/javadoc-test.xml b/src/tests/antunit/taskdefs/javadoc-test.xml
index 01907477e..a6946075c 100644
--- a/src/tests/antunit/taskdefs/javadoc-test.xml
+++ b/src/tests/antunit/taskdefs/javadoc-test.xml
@@ -19,20 +19,31 @@
   <import file="../antunit-base.xml" />
 
   <target name="-makeTestClass">
-    <mkdir dir="${input}/test"/>
-    <echo file="${input}/test/A.java"><![CDATA[
-package test;
+    <macrodef name="mktest">
+      <attribute name="package"/>
+      <attribute name="class"/>
+      <sequential>
+    <mkdir dir="${input}/@{package}"/>
+    <echo file="${input}/@{package}/@{class}.java"><![CDATA[
+package @{package};
 
 /**
  * This is a test class.
  */
-public class A {
+public class @{class} {
     /**
      * With a test method.
      */
     public void foo(String bar) {}
 }
 ]]></echo>
+      </sequential>
+    </macrodef>
+    <mktest package="test" class="A"/>
+  </target>
+
+  <target name="-makeTwoTestClasses" depends="-makeTestClass">
+    <mktest package="test2" class="B"/>
   </target>
 
   <target name="testBottomWithLineBreaksWithFile" depends="-makeTestClass">
@@ -60,6 +71,26 @@ Hello World
     <mkfoo file="${input}/test/doc-files/b/foo.html"/>
   </target>
 
+  <target name="testPackageSetNoExcludes" depends="-makeTwoTestClasses">
+    <javadoc destdir="${output}">
+      <packageset dir="${input}"/>
+    </javadoc>
+    <au:assertFileExists file="${output}/test/A.html"/>
+    <au:assertFileExists file="${output}/test2/B.html"/>
+  </target>
+
+  <target name="testPackageSetWithExcludes"
+          depends="-makeTwoTestClasses"
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=47196">
+    <javadoc destdir="${output}">
+      <packageset dir="${input}">
+        <exclude name="test2"/>
+      </packageset>
+    </javadoc>
+    <au:assertFileExists file="${output}/test/A.html"/>
+    <au:assertFileDoesntExist file="${output}/test2/B.html"/>
+  </target>
+
   <target name="XtestNoDocFiles" depends="-setUpDocFilesTests">
     <javadoc destdir="${output}">
       <packageset dir="${input}"/>