--- old/test/compiler/rtm/locking/TestUseRTMDeopt.java	2017-05-26 16:34:23.630927235 -0700
+++ new/test/compiler/rtm/locking/TestUseRTMDeopt.java	2017-05-26 16:34:23.498927242 -0700
@@ -29,6 +29,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
@@ -42,24 +43,16 @@
 import compiler.testlibrary.rtm.AbortProvoker;
 import compiler.testlibrary.rtm.AbortType;
 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;
 
 /**
  * Test verifies that usage of UseRTMDeopt option affects uncommon traps usage
  * for methods that use locking.
  */
-public class TestUseRTMDeopt extends CommandLineOptionTest {
-    private TestUseRTMDeopt() {
-        super(new AndPredicate(new SupportedCPU(), new SupportedOS(), new SupportedVM()));
-    }
+public class TestUseRTMDeopt {
 
-    @Override
     protected void runTestCases() throws Throwable {
         verifyUseRTMDeopt(false);
         verifyUseRTMDeopt(true);
@@ -92,6 +85,6 @@
     }
 
     public static void main(String args[]) throws Throwable {
-        new TestUseRTMDeopt().test();
+        new TestUseRTMDeopt().runTestCases();
     }
 }