--- old/test/compiler/rtm/cli/RTMLockingAwareTest.java	2016-07-06 19:18:36.435389903 +0300
+++ new/test/compiler/rtm/cli/RTMLockingAwareTest.java	2016-07-06 19:18:36.359389901 +0300
@@ -22,14 +22,16 @@
  *
  */
 
-import java.util.List;
-import java.util.LinkedList;
+package compiler.rtm.cli;
 
-import jdk.test.lib.ExitCode;
-import jdk.test.lib.cli.*;
-import jdk.test.lib.cli.predicate.AndPredicate;
 import compiler.testlibrary.rtm.predicate.SupportedCPU;
 import compiler.testlibrary.rtm.predicate.SupportedVM;
+import jdk.test.lib.ExitCode;
+import jdk.test.lib.cli.CommandLineOptionTest;
+import jdk.test.lib.cli.predicate.AndPredicate;
+
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * Base for all RTM-related CLI tests on options whose processing depends