--- old/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java	2014-12-19 14:14:49.523868260 +0400
+++ new/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java	2014-12-19 14:14:49.451868258 +0400
@@ -22,14 +22,16 @@
  */
 package codeheapsize;
 
+import com.oracle.java.testlibrary.Platform;
 import common.CodeCacheCLITestBase;
 import common.CodeCacheCLITestCase;
 import sun.hotspot.code.BlobType;
 import java.util.EnumSet;
 /**
  * @test
+ * @bug 8015774
  * @summary Verify processing of options related to code heaps sizing.
- * @library /testlibrary /testlibrary/whitebox ..
+ * @library /testlibrary .. /../../test/lib
  * @build TestCodeHeapSizeOptions com.oracle.java.testlibrary.* codeheapsize.*
  *        common.*
  * @run main/timeout=240 codeheapsize.TestCodeHeapSizeOptions
@@ -43,7 +45,8 @@
 
     private static final CodeCacheCLITestCase CODE_CACHE_FREE_SPACE
             = new CodeCacheCLITestCase(new CodeCacheCLITestCase.Description(
-                            options -> options.segmented,
+                            options -> options.segmented
+                                    && Platform.isDebugBuild(),
                             EnumSet.noneOf(BlobType.class)),
                     new CodeCacheFreeSpaceRunner());