*** old/test/compiler/intrinsics/IntrinsicAvailableTest.java	Thu Jan 14 13:30:22 2016
--- new/test/compiler/intrinsics/IntrinsicAvailableTest.java	Thu Jan 14 13:30:21 2016

*** 21,30 ****
--- 21,32 ----
   * questions.
   */
  import java.lang.reflect.Executable;
  import java.util.concurrent.Callable;
  import java.util.Objects;
+ 
+ import jdk.test.lib.*;
  import compiler.whitebox.CompilerWhiteBoxTest;
  /*
   * @test
   * @bug 8130832
   * @library /testlibrary /test/lib /compiler/whitebox /compiler/testlibrary /

*** 103,123 ****
--- 105,124 ----
                                         intrinsicEnabledMessage + " but intrinsic is " + intrinsicAvailableMessage +
                                         " at compilation level " + compLevel);
          }
      }
  
      protected boolean isServerVM() {
          return VMName.toLowerCase().contains("server");
      }
  
      public void test() throws Exception {
          Executable intrinsicMethod = testCase.getExecutable();
!         if (isServerVM()) {
!         if (Platform.isServer()) {
              if (TIERED_COMPILATION) {
                  checkIntrinsicForCompilationLevel(intrinsicMethod, COMP_LEVEL_SIMPLE);
              }
+             // Dont bother check JVMCI compiler - returns false on all intrinsics.
+             if (!Boolean.valueOf(getVMOption("UseJVMCICompiler"))) {
                  checkIntrinsicForCompilationLevel(intrinsicMethod, COMP_LEVEL_FULL_OPTIMIZATION);
+             }
          } else {
              checkIntrinsicForCompilationLevel(intrinsicMethod, COMP_LEVEL_SIMPLE);
          }
      }