--- jsr166/src/test/tck/ForkJoinPoolTest.java	2017/05/29 22:44:27	1.75
+++ jsr166/src/test/tck/ForkJoinPoolTest.java	2018/01/23 20:44:11	1.76
@@ -28,7 +28,6 @@ import java.util.concurrent.atomic.Atomi
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
 
-import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -304,7 +303,7 @@ public class ForkJoinPoolTest extends JS
                        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());