diff --git a/src/java/org/apache/commons/logging/impl/WeakHashtable.java b/src/java/org/apache/commons/logging/impl/WeakHashtable.java
index e2d4100..3a21979 100644
--- a/src/java/org/apache/commons/logging/impl/WeakHashtable.java
+++ b/src/java/org/apache/commons/logging/impl/WeakHashtable.java
@@ -20,7 +20,13 @@ package org.apache.commons.logging.impl;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
-import java.util.*;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>Implementation of <code>Hashtable</code> that uses <code>WeakReference</code>'s
diff --git a/src/test/org/apache/commons/logging/AltHashtableTestCase.java b/src/test/org/apache/commons/logging/AltHashtableTestCase.java
index 79ed2bf..b1a7c6f 100644
--- a/src/test/org/apache/commons/logging/AltHashtableTestCase.java
+++ b/src/test/org/apache/commons/logging/AltHashtableTestCase.java
@@ -17,7 +17,8 @@
 
 package org.apache.commons.logging;
 
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
 
 /**
  * Test the ability to force the LogFactory class to use some
diff --git a/src/test/org/apache/commons/logging/BadHashtablePropertyTestCase.java b/src/test/org/apache/commons/logging/BadHashtablePropertyTestCase.java
index f55a925..d932967 100644
--- a/src/test/org/apache/commons/logging/BadHashtablePropertyTestCase.java
+++ b/src/test/org/apache/commons/logging/BadHashtablePropertyTestCase.java
@@ -17,7 +17,7 @@
 
 package org.apache.commons.logging;
 
-import junit.framework.*;
+import junit.framework.TestCase;
 import java.util.Hashtable;
 
 /**
diff --git a/src/test/org/apache/commons/logging/impl/WeakHashtableTest.java b/src/test/org/apache/commons/logging/impl/WeakHashtableTest.java
index af8c933..fd659d4 100644
--- a/src/test/org/apache/commons/logging/impl/WeakHashtableTest.java
+++ b/src/test/org/apache/commons/logging/impl/WeakHashtableTest.java
@@ -18,9 +18,17 @@
 
 package org.apache.commons.logging.impl;
 
-import java.lang.ref.*;
-import junit.framework.*;
-import java.util.*;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import junit.framework.TestCase;
 
 public class WeakHashtableTest extends TestCase {