--- jsr166/src/test/tck/JSR166TestCase.java	2015/10/11 23:07:44	1.175
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/10/12 23:52:44	1.177
@@ -1228,7 +1228,7 @@ public class JSR166TestCase extends Test
         } finally {
             if (t.getState() != Thread.State.TERMINATED) {
                 t.interrupt();
-                threadFail("Test timed out");
+                threadFail("timed out waiting for thread to terminate");
             }
         }
     }
@@ -1396,7 +1396,9 @@ public class JSR166TestCase extends Test
 
     public void await(CountDownLatch latch) {
         try {
-            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
+            if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
+                fail("timed out waiting for CountDownLatch for "
+                     + (LONG_DELAY_MS/1000) + " sec");
         } catch (Throwable fail) {
             threadUnexpectedException(fail);
         }
@@ -1404,7 +1406,9 @@ public class JSR166TestCase extends Test
 
     public void await(Semaphore semaphore) {
         try {
-            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
+            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
+                fail("timed out waiting for Semaphore for "
+                     + (LONG_DELAY_MS/1000) + " sec");
         } catch (Throwable fail) {
             threadUnexpectedException(fail);
         }