diff --git a/src/java/com/samskivert/util/CollectionUtil.java b/src/java/com/samskivert/util/CollectionUtil.java
index 211d801b..ceae52f1 100644
--- a/src/java/com/samskivert/util/CollectionUtil.java
+++ b/src/java/com/samskivert/util/CollectionUtil.java
@@ -28,6 +28,7 @@ import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
+import java.util.NoSuchElementException;
 
 import com.samskivert.annotation.ReplacedBy;
 
diff --git a/src/java/com/samskivert/util/tests/CollectionUtilTest.java b/src/java/com/samskivert/util/tests/CollectionUtilTest.java
index faba2815..4052c7af 100644
--- a/src/java/com/samskivert/util/tests/CollectionUtilTest.java
+++ b/src/java/com/samskivert/util/tests/CollectionUtilTest.java
@@ -23,14 +23,12 @@ package com.samskivert.util.tests;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-import java.util.Collections;
 
 import org.junit.*;
 import static org.junit.Assert.*;
 
 import com.samskivert.util.CollectionUtil;
 import com.samskivert.util.ComparableArrayList;
-import com.samskivert.util.StringUtil;
 
 /**
  * Tests the {@link CollectionUtil} class.