--- jsr166/src/test/tck/ThreadTest.java	2015/02/22 19:15:14	1.16
+++ jsr166/src/test/tck/ThreadTest.java	2017/03/18 20:42:20	1.20
@@ -11,7 +11,7 @@ import junit.framework.TestSuite;
 
 public class ThreadTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
 
     public static Test suite() {
@@ -49,12 +49,11 @@ public class ThreadTest extends JSR166Te
      * setDefaultUncaughtExceptionHandler.
      */
     public void testGetAndSetDefaultUncaughtExceptionHandler() {
-        assertEquals(null, Thread.getDefaultUncaughtExceptionHandler());
-        // failure due to securityException is OK.
+        assertNull(Thread.getDefaultUncaughtExceptionHandler());
+        // failure due to SecurityException is OK.
         // Would be nice to explicitly test both ways, but cannot yet.
         Thread.UncaughtExceptionHandler defaultHandler
             = Thread.getDefaultUncaughtExceptionHandler();
-        Thread current = Thread.currentThread();
         MyHandler eh = new MyHandler();
         try {
             Thread.setDefaultUncaughtExceptionHandler(eh);