--- a/test/hotspot/jtreg/compiler/onSpinWait/TestOnSpinWait.java	Wed Aug 08 15:34:32 2018 -0700
+++ b/test/hotspot/jtreg/compiler/onSpinWait/TestOnSpinWait.java	Wed Aug 08 18:38:34 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2016 Azul Systems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -40,29 +40,14 @@
 public class TestOnSpinWait {
 
     public static void main(String[] args) throws Exception {
-
-        // Test C1 compiler
+        // Test C2 compiler
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
           "-XX:+IgnoreUnrecognizedVMOptions", "-showversion",
-          "-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1", "-Xbatch",
-          "-XX:+PrintCompilation", "-XX:+UnlockDiagnosticVMOptions",
-          "-XX:+PrintInlining", Launcher.class.getName());
-
-        OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
-
-        analyzer.shouldHaveExitValue(0);
-
-        // The test is applicable only to C1 (present in Server VM).
-        analyzer.shouldContain("java.lang.Thread::onSpinWait (1 bytes)   intrinsic");
-
-        // Test C2 compiler
-        pb = ProcessTools.createJavaProcessBuilder(
-          "-XX:+IgnoreUnrecognizedVMOptions", "-showversion",
           "-XX:-TieredCompilation", "-Xbatch",
           "-XX:+PrintCompilation", "-XX:+UnlockDiagnosticVMOptions",
           "-XX:+PrintInlining", Launcher.class.getName());
 
-        analyzer = new OutputAnalyzer(pb.start());
+        OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
 
         analyzer.shouldHaveExitValue(0);