--- old/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java	2014-12-19 14:14:49.287868253 +0400
+++ new/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java	2014-12-19 14:14:49.215868250 +0400
@@ -28,8 +28,9 @@
 
 /**
  * @test
+ * @bug 8015774
  * @summary Verify SegmentedCodeCache option's processing
- * @library /testlibrary /testlibrary/whitebox
+ * @library /testlibrary /../../test/lib
  * @build TestSegmentedCodeCacheOption com.oracle.java.testlibrary.*
  * @run main TestSegmentedCodeCacheOption
  */
@@ -81,9 +82,8 @@
 
                 CommandLineOptionTest.verifyJVMStartup(
                         /* expected messages */ null, UNEXPECTED_MESSAGES,
-                        ExitCode.OK, testCaseExitCodeMessage,
-                        testCaseWarningMessage, false, INT_MODE,
-                        USE_SEGMENTED_CODE_CACHE);
+                        testCaseExitCodeMessage, testCaseWarningMessage,
+                        ExitCode.OK, false, INT_MODE, USE_SEGMENTED_CODE_CACHE);
             }
         },
         OPTION_VALUES_GENERIC {