diff --git a/src/testcases/org/apache/tools/ant/BuildFileTest.java b/src/testcases/org/apache/tools/ant/BuildFileTest.java
index 735ea0ee1..2d82d86a1 100644
--- a/src/testcases/org/apache/tools/ant/BuildFileTest.java
+++ b/src/testcases/org/apache/tools/ant/BuildFileTest.java
@@ -54,9 +54,10 @@
 
 package org.apache.tools.ant;
 
-import junit.framework.*;
-import org.apache.tools.ant.*;
-import java.io.*;
+import junit.framework.TestCase;
+import org.apache.tools.ant.Project;
+import java.io.File;
+import java.io.PrintStream;
 import java.net.URL;
 
 /**
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java
index 5bb13ab54..9b899c04b 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java
@@ -61,7 +61,7 @@ import org.apache.tools.ant.*;
 /**
  * stress out java task
  * @author steve loughran
- * @author <a href="mailto:sbailliez@apache.org>Stephane Bailliez</a> 
+ * @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a> 
  */
 public class JavaTest extends BuildFileTest {
     
@@ -100,7 +100,8 @@ public class JavaTest extends BuildFileTest {
     public void testJarNoFork() {
         expectBuildExceptionContaining("testJarNoFork",
             "parameter validation",
-            "Cannot execute a jar in non-forked mode. Please set fork='true'. ");        
+            "Cannot execute a jar in non-forked mode. " 
+                + "Please set fork='true'. ");        
     }
       
     public void testJarAndClassName() {