--- old/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java	2017-05-26 16:34:25.786927122 -0700
+++ new/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java	2017-05-26 16:34:25.650927129 -0700
@@ -30,6 +30,7 @@
  * @library /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
@@ -44,13 +45,9 @@
 import compiler.testlibrary.rtm.AbortType;
 import compiler.testlibrary.rtm.RTMLockingStatistics;
 import compiler.testlibrary.rtm.RTMTestBase;
-import compiler.testlibrary.rtm.predicate.SupportedCPU;
-import compiler.testlibrary.rtm.predicate.SupportedOS;
-import compiler.testlibrary.rtm.predicate.SupportedVM;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.cli.CommandLineOptionTest;
-import jdk.test.lib.cli.predicate.AndPredicate;
 
 import java.util.List;
 
@@ -66,12 +63,8 @@
  * to avoid issue with retriable aborts described in
  * {@link TestUseRTMAfterLockInflation}.
  */
-public class TestUseRTMLockElidingOption extends CommandLineOptionTest {
-    private TestUseRTMLockElidingOption() {
-        super(new AndPredicate(new SupportedCPU(), new SupportedOS(), new SupportedVM()));
-    }
+public class TestUseRTMLockElidingOption {
 
-    @Override
     public void runTestCases() throws Throwable {
         verifyOption(false);
         verifyOption(true);
@@ -122,6 +115,6 @@
     }
 
     public static void main(String args[]) throws Throwable {
-        new TestUseRTMLockElidingOption().test();
+        new TestUseRTMLockElidingOption().runTestCases();
     }
 }