--- jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2019/08/15 16:01:30	1.71
+++ jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2019/08/15 16:06:13	1.72
@@ -1384,7 +1384,8 @@ public class AbstractQueuedSynchronizerT
             if (s.getFirstQueuedThread() == thread
                 && s.hasQueuedPredecessors()
                 && s.hasQueuedThreads()
-                && s.getQueueLength() == 1)
+                && s.getQueueLength() == 1
+                && s.hasContended())
                 break;
             if (startTime == 0L)
                 startTime = System.nanoTime();
@@ -1411,6 +1412,7 @@ public class AbstractQueuedSynchronizerT
         assertFalse(s.hasQueuedThreads());
         assertEquals(0, s.getQueueLength());
         assertTrue(s.getQueuedThreads().isEmpty());
+        assertTrue(s.hasContended());
     }
 
 }