--- old/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java	2017-05-26 16:34:24.046927213 -0700
+++ new/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java	2017-05-26 16:34:23.910927221 -0700
@@ -28,6 +28,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
@@ -41,13 +42,8 @@
 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;
 
@@ -61,12 +57,8 @@
  * is used. For more information abort that issue see
  * {@link TestUseRTMAfterLockInflation}.
  */
-public class TestUseRTMForInflatedLocks extends CommandLineOptionTest {
-    private TestUseRTMForInflatedLocks() {
-        super(new AndPredicate(new SupportedCPU(), new SupportedOS(), new SupportedVM()));
-    }
+public class TestUseRTMForInflatedLocks {
 
-    @Override
     protected void runTestCases() throws Throwable {
         AbortProvoker provoker = AbortType.XABORT.provoker();
         RTMLockingStatistics lock;
@@ -96,6 +88,6 @@
     }
 
     public static void main(String args[]) throws Throwable {
-        new TestUseRTMForInflatedLocks().test();
+        new TestUseRTMForInflatedLocks().runTestCases();
     }
 }