diff -r a5a2e4770524 -r 21efc1774302 test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java
--- a/test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java	Sat Feb 10 09:17:53 2018 -0800
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinPoolTest.java	Sat Feb 10 09:23:41 2018 -0800
@@ -55,7 +55,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
 
-import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -331,7 +330,7 @@
                        p.getFactory());
             while (! p.isQuiescent()) {
                 if (millisElapsedSince(startTime) > LONG_DELAY_MS)
-                    throw new AssertionFailedError("timed out");
+                    throw new AssertionError("timed out");
                 assertFalse(p.getAsyncMode());
                 assertFalse(p.isShutdown());
                 assertFalse(p.isTerminating());