--- old/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java	2014-12-24 18:51:40.326223861 +0400
+++ new/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java	2014-12-24 18:51:40.250223859 +0400
@@ -137,7 +137,7 @@
         OPTION_VALUES_SERVER_SPECIFIC {
             @Override
             public boolean isApplicable() {
-                return Platform.isServer();
+                return Platform.isServer() && Platform.isTieredSupported();
             }
 
             @Override
--- old/test/compiler/codecache/cli/common/CodeCacheCLITestCase.java	2014-12-24 18:51:40.582223869 +0400
+++ new/test/compiler/codecache/cli/common/CodeCacheCLITestCase.java	2014-12-24 18:51:40.502223867 +0400
@@ -43,7 +43,7 @@
             = options -> options.segmented;
     private static final Function<CodeCacheOptions, Boolean> SEGMENTED_SERVER
             = ONLY_SEGMENTED.andThen(isSegmented -> isSegmented
-                    && Platform.isServer());
+                    && Platform.isServer() && Platform.isTieredSupported());
     private static final String USE_INT_MODE = "-Xint";
     private static final String SEGMENTED_CODE_CACHE = "SegmentedCodeCache";
     private static final String TIERED_COMPILATION = "TieredCompilation";