1 files changed, 7 insertions, 8 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/DelayQueueTest.java b/jsr166-tests/src/test/java/jsr166/DelayQueueTest.java
index 5d48c18..dc221ab 100644
--- a/jsr166-tests/src/test/java/jsr166/DelayQueueTest.java
+++ b/jsr166-tests/src/test/java/jsr166/DelayQueueTest.java
@@ -22,15 +22,14 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
-public class DelayQueueTest extends JSR166TestCase {
+public class DelayQueueTest extends BlockingQueueTest {
 
-    public static class Generic extends BlockingQueueTest {
-        protected BlockingQueue emptyCollection() {
-            return new DelayQueue();
-        }
-        protected PDelay makeElement(int i) {
-            return new PDelay(i);
-        }
+    protected BlockingQueue emptyCollection() {
+        return new DelayQueue();
+    }
+
+    protected PDelay makeElement(int i) {
+        return new PDelay(i);
     }
 
     private static final int NOCAP = Integer.MAX_VALUE;