--- jsr166/src/test/tck/JSR166TestCase.java	2014/05/14 21:06:38	1.115
+++ jsr166/src/test/tck/JSR166TestCase.java	2014/06/08 00:15:50	1.116
@@ -160,12 +160,13 @@ public class JSR166TestCase extends Test
     }
 
     protected void runTestProfiled() throws Throwable {
+        // Warmup run, notably to trigger all needed classloading.
+        super.runTest();
         long t0 = System.nanoTime();
         try {
             super.runTest();
         } finally {
-            long elapsedMillis =
-                (System.nanoTime() - t0) / (1000L * 1000L);
+            long elapsedMillis = millisElapsedSince(t0);
             if (elapsedMillis >= profileThreshold)
                 System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
         }