diff -r a5a2e4770524 -r 21efc1774302 test/jdk/java/util/concurrent/tck/ReentrantReadWriteLockTest.java
--- a/test/jdk/java/util/concurrent/tck/ReentrantReadWriteLockTest.java	Sat Feb 10 09:17:53 2018 -0800
+++ b/test/jdk/java/util/concurrent/tck/ReentrantReadWriteLockTest.java	Sat Feb 10 09:23:41 2018 -0800
@@ -44,7 +44,6 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -115,7 +114,7 @@
         long startTime = System.nanoTime();
         while (!lock.hasQueuedThread(t)) {
             if (millisElapsedSince(startTime) > LONG_DELAY_MS)
-                throw new AssertionFailedError("timed out");
+                throw new AssertionError("timed out");
             Thread.yield();
         }
         assertTrue(t.isAlive());