1 files changed, 10 insertions, 5 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java b/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java
index c71259234a..05fc689119 100644
--- a/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java
+++ b/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java
@@ -34,11 +34,16 @@ public class LinkedTransferQueueTest extends JSR166TestCase {
         public boolean permitsNulls() { return false; }
     }
 
-    public static class Generic extends BlockingQueueTest {
-        protected BlockingQueue emptyCollection() {
-            return new LinkedTransferQueue();
-        }
-    }
+    // android-note: These tests have been moved into their own separate
+    // classes to work around CTS issues:
+    // LinkedTransferQueueBlockingQueueTest.java
+    // LinkedTransferQueueCollectionTest.java
+    //
+    // public static class Generic extends BlockingQueueTest {
+    //     protected BlockingQueue emptyCollection() {
+    //         return new LinkedTransferQueue();
+    //     }
+    // }
 
     // android-note: Removed because the CTS runner does a bad job of
     // retrying tests that have suite() declarations.