--- old/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java	2016-07-28 19:38:46.088077614 +0300
+++ new/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java	2016-07-28 19:38:45.988077611 +0300
@@ -35,8 +35,8 @@
 public class CompileTheWorld {
     // in case when a static constructor changes System::out and System::err
     // we hold these values of output streams
-    public static final PrintStream OUT = System.out;
-    public static final PrintStream ERR = System.err;
+    static PrintStream OUT = System.out;
+    static final PrintStream ERR = System.err;
     /**
      * Entry point. Compiles classes in {@code paths}
      *
@@ -56,7 +56,7 @@
             }
         }
         if (os != null) {
-            System.setOut(os);
+            OUT = os;
         }
 
         try {
@@ -89,9 +89,6 @@
                 os.close();
             }
         }
-        // in case when a static constructor creates and runs a new thread
-        // we force it to exit
-        System.exit(0);
     }
 
     private static ExecutorService createExecutor() {