diff --git a/src/tests/antunit/taskdefs/optional/javah-test.xml b/src/tests/antunit/taskdefs/optional/javah-test.xml
index e85293e2d..a51eae39a 100644
--- a/src/tests/antunit/taskdefs/optional/javah-test.xml
+++ b/src/tests/antunit/taskdefs/optional/javah-test.xml
@@ -62,4 +62,52 @@ public class Adapter implements JavahAdapter {
     </javah>
     <au:assertLogContains text="adapter called" />
   </target>
+
+  <target name="-setupForRealJavahTests">
+    <condition property="sunjavah.present">
+      <or>
+        <available classname="com.sun.tools.javah.oldjavah.Main"/>
+        <available classname="com.sun.tools.javah.Main"/>
+      </or>
+    </condition>
+    <mkdir dir="${input}/org/example"/>
+    <mkdir dir="${output}/org/example"/>
+    <echo file="${input}/org/example/Foo.java">
+      <![CDATA[
+package org.example;
+public class Foo {
+    public Foo() {}
+    public native String bar(Object baz);
+}
+]]></echo>
+    <javac srcdir="${input}" destdir="${output}"/>
+    <presetdef name="javah-single">
+      <javah destdir="${output}">
+        <class name="org.example.Foo"/>
+        <classpath>
+          <pathelement location="${output}"/>
+        </classpath>
+      </javah>
+    </presetdef>
+    <presetdef name="javah-fileset">
+      <javah destdir="${output}">
+        <fileset dir="${output}">
+  	  <include name="**/*.class"/>
+        </fileset>
+        <classpath>
+  	  <pathelement location="${output}"/>
+        </classpath>
+      </javah>
+    </presetdef>
+  </target>
+
+  <target name="testSimpleCompile" depends="-setupForRealJavahTests">
+    <javah-single/>
+    <au:assertFileExists file="${output}/org_example_Foo.h"/>
+  </target>
+
+  <target name="testCompileUsingFileset" depends="-setupForRealJavahTests">
+    <javah-fileset/>
+    <au:assertFileExists file="${output}/org_example_Foo.h"/>
+  </target>
 </project>