diff --git a/mozilla/js/rhino/testsrc/build.xml b/mozilla/js/rhino/testsrc/build.xml
index 8dda4db8abf..742bc9d8022 100644
--- a/mozilla/js/rhino/testsrc/build.xml
+++ b/mozilla/js/rhino/testsrc/build.xml
@@ -25,25 +25,47 @@
 	-->
 	<property name="test.vm.mx" value="256m" />
 	
-	<!--	
-		TODO	Currently JUnit is required in order to compile the test code, which ought not be necessary
+	<target name="junit-compile" if="test.junit.classpath">
+		<javac
+			srcdir="testsrc"
+			destdir="${test.classes}" debug="true"
+			target="${target-jvm}"
+			source="${source-level}"
+		>
+			<classpath>
+				<pathelement path="${test.junit.classpath}" />
+				<pathelement path="${classes}" />
+				<pathelement path="${test-classes}" />
+			</classpath>
+			<include name="org/mozilla/javascript/StandardTests.java" />
+		</javac>
+	</target>
+	
+	<!--
+		Set the property test.junit.classpath to the path to the junit classes in order 
+		to compile the JUnit version of the tests.  Otherwise, just the 
+		command-line JsDriver tests will be compiled.
 	-->
 	<target name="compile">
 		<mkdir dir="${test.classes}" />
-		<javac destdir="${test.classes}" debug="true"
+		<javac
+			srcdir="testsrc"
+			destdir="${test.classes}" debug="true"
 			target="${target-jvm}"
 			source="${source-level}"
 		>
 			<classpath>
 				<pathelement path="${classes}" />
 			</classpath>
-			<src path="testsrc" />
+			<sourcepath path="testsrc" />
+			<include name="org/mozilla/javascript/JsDriver.java" />
 		</javac>
 		<copy todir="${test.classes}/org/mozilla/javascript">
 			<fileset dir="testsrc/org/mozilla/javascript">
 				<include name="*.html"/>
 			</fileset>
 		</copy>
+		<antcall target="junit-compile" />
 	</target>
 	
 	<target name="clean">