--- jsr166/src/test/tck/ForkJoinPoolTest.java	2009/08/03 22:08:07	1.6
+++ jsr166/src/test/tck/ForkJoinPoolTest.java	2009/08/04 00:23:18	1.7
@@ -416,7 +416,7 @@ public class ForkJoinPoolTest extends JS
             int r = f.get();
             assertTrue(r ==  832040);
         } finally {
-            joinPool(p);
+            p.shutdownNow(); // don't wait out shutdown
         }
     }
 
@@ -642,9 +642,8 @@ public class ForkJoinPoolTest extends JS
             }});
 
         t.start();
-        Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
-        joinPool(p);
+        p.shutdownNow();
     }
 
     /**