--- old/test/compiler/ciReplay/TestVM_no_comp_level.sh	2016-07-08 19:59:56.792755739 +0300
+++ new/test/compiler/ciReplay/TestVM_no_comp_level.sh	2016-07-08 19:59:56.744755739 +0300
@@ -29,7 +29,7 @@
 ## @summary testing of ciReplay with using generated by VM replay.txt w/o comp_level
 ## @author igor.ignatyev@oracle.com
 ## @requires vm.flightRecorder != true
-## @ignore 8157984
+## @ignore 8160898
 ## @run shell TestVM_no_comp_level.sh
 ##
 
--- old/test/compiler/rangechecks/TestRangeCheckSmearing.java	2016-07-08 19:59:56.976755738 +0300
+++ new/test/compiler/rangechecks/TestRangeCheckSmearing.java	2016-07-08 19:59:56.928755738 +0300
@@ -28,7 +28,6 @@
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @ignore 8157984
  * @build TestRangeCheckSmearing
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                jdk.test.lib.Platform
@@ -44,6 +43,7 @@
 import sun.hotspot.code.NMethod;
 import jdk.test.lib.Platform;
 import compiler.whitebox.CompilerWhiteBoxTest;
+import compiler.testlibrary.CompilerUtils;
 
 public class TestRangeCheckSmearing {
     private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
@@ -396,7 +396,7 @@
             System.out.println("ArrayIndexOutOfBoundsException was not thrown in "+name);
         }
 
-        if (Platform.isServer()) {
+        if (CompilerUtils.getMaxCompilationLevel() == CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION) {
             if (exceptionRequired == WHITE_BOX.isMethodCompiled(m)) {
                 System.out.println((exceptionRequired?"Didn't deoptimized":"deoptimized") + " in "+name);
                 test_success = false;
--- old/test/compiler/testlibrary/CompilerUtils.java	2016-07-08 19:59:57.144755736 +0300
+++ new/test/compiler/testlibrary/CompilerUtils.java	2016-07-08 19:59:57.096755737 +0300
@@ -23,6 +23,7 @@
 
 package compiler.testlibrary;
 
+import java.util.Arrays;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.Platform;
 import java.util.stream.IntStream;
@@ -60,4 +61,14 @@
         }
         return new int[0];
     }
+
+    /**
+     * Returns maximum compilation level available
+     * @return an int value representing maximum compilation level available
+     */
+    public static int getMaxCompilationLevel() {
+        return Arrays.stream(getAvailableCompilationLevels())
+                .max()
+                .getAsInt();
+    }
 }
--- old/test/compiler/tiered/NonTieredLevelsTest.java	2016-07-08 19:59:57.308755735 +0300
+++ new/test/compiler/tiered/NonTieredLevelsTest.java	2016-07-08 19:59:57.260755735 +0300
@@ -26,7 +26,7 @@
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management
- * @ignore 8157984
+ * @requires vm.opt.TieredStopAtLevel==null
  * @build NonTieredLevelsTest
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission