--- old/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java	2017-05-26 16:34:18.242927518 -0700
+++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java	2017-05-26 16:34:18.106927526 -0700
@@ -29,7 +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
@@ -40,20 +40,11 @@
 
 package compiler.rtm.cli;
 
-import compiler.testlibrary.rtm.predicate.SupportedCPU;
-import compiler.testlibrary.rtm.predicate.SupportedOS;
-import compiler.testlibrary.rtm.predicate.SupportedVM;
 import jdk.test.lib.process.ExitCode;
 import jdk.test.lib.cli.CommandLineOptionTest;
-import jdk.test.lib.cli.predicate.AndPredicate;
 
-public class TestUseRTMLockingOptionWithBiasedLocking
-        extends CommandLineOptionTest {
-    private TestUseRTMLockingOptionWithBiasedLocking() {
-        super(new AndPredicate(new SupportedCPU(), new SupportedOS(), new SupportedVM()));
-    }
+public class TestUseRTMLockingOptionWithBiasedLocking {
 
-    @Override
     public void runTestCases() throws Throwable {
         String warningMessage
                 = RTMGenericCommandLineOptionTest.RTM_BIASED_LOCKING_WARNING;
@@ -98,6 +89,6 @@
     }
 
     public static void main(String args[]) throws Throwable {
-        new TestUseRTMLockingOptionWithBiasedLocking().test();
+        new TestUseRTMLockingOptionWithBiasedLocking().runTestCases();
     }
 }