--- old/test/compiler/ciReplay/TestVM_no_comp_level.sh	2016-07-06 19:35:42.866152336 +0300
+++ new/test/compiler/ciReplay/TestVM_no_comp_level.sh	2016-07-06 19:35:42.822152337 +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-06 19:35:43.078152334 +0300
+++ new/test/compiler/rangechecks/TestRangeCheckSmearing.java	2016-07-06 19:35:43.030152335 +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,8 @@
             System.out.println("ArrayIndexOutOfBoundsException was not thrown in "+name);
         }
 
-        if (Platform.isServer()) {
+        int maxLevel = Arrays.stream(CompilerUtils.getAvailableCompilationLevels()).max().getAsInt();
+        if (Platform.isServer() && maxLevel == 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/tiered/NonTieredLevelsTest.java	2016-07-06 19:35:43.242152333 +0300
+++ new/test/compiler/tiered/NonTieredLevelsTest.java	2016-07-06 19:35:43.194152334 +0300
@@ -26,7 +26,7 @@
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management
- * @ignore 8157984
+ * @requires vm.opt.TieredStopAtLevel!=1 & vm.opt.TieredStopAtLevel!=2 & vm.opt.TieredStopAtLevel!=3
  * @build NonTieredLevelsTest
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission