diff --git a/src/etc/testcases/taskdefs/javadoc/java/ClassToJavadoc.java b/src/etc/testcases/taskdefs/javadoc/java/ClassToJavadoc.java
index bd8cab624..f43734ff5 100644
--- a/src/etc/testcases/taskdefs/javadoc/java/ClassToJavadoc.java
+++ b/src/etc/testcases/taskdefs/javadoc/java/ClassToJavadoc.java
@@ -25,15 +25,19 @@ public class ClassToJavadoc {
     /**
      * @param anArgument A String that is ignored
      */
-    public void methodToJavadoc(String anArgument) { }
+    public void methodToJavadoc(String anArgument) {}
 
     /**
      * @see java.lang.Object#toString()
      */
-    public String toString() { return this.getClass().getName(); }
+    public String toString() {
+        return this.getClass().getName();
+    }
 
     /**
      * @return An arbitrary string.
      */
-    public String anotherString() {return "An arbitrary string.";}
+    public String anotherString() {
+        return "An arbitrary string.";
+    }
 }
diff --git a/src/etc/testcases/taskdefs/rmic/src/AntTimestamp.java b/src/etc/testcases/taskdefs/rmic/src/AntTimestamp.java
index 579d2edcd..3929b8a4a 100644
--- a/src/etc/testcases/taskdefs/rmic/src/AntTimestamp.java
+++ b/src/etc/testcases/taskdefs/rmic/src/AntTimestamp.java
@@ -14,21 +14,17 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.util.Calendar;
 
-import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.DateUtils;
 
-
 /**
  * This class imports a dependency on the Ant runtime classes,
  * so tests that classpath setup include them
  */
 public class AntTimestamp implements RemoteTimestamp {
 
-
     /**
      * return the phase of the moon.
      * Note the completely different semantics of the other implementation,
diff --git a/src/etc/testcases/taskdefs/rmic/src/RemoteTimestampImpl.java b/src/etc/testcases/taskdefs/rmic/src/RemoteTimestampImpl.java
index f361452ec..bc8fb190f 100644
--- a/src/etc/testcases/taskdefs/rmic/src/RemoteTimestampImpl.java
+++ b/src/etc/testcases/taskdefs/rmic/src/RemoteTimestampImpl.java
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 
 /**