test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java
--- a/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java Fri Sep 14 08:48:36 2018 -0700
+++ b/test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java Fri Sep 14 15:32:22 2018 -0400
@@ -25,11 +25,11 @@
* @test
* @bug 8031320
* @summary Verify processing of UseRTMLocking and UseBiasedLocking
- * options combination on CPU and VM with rtm support.
+ * options combination on CPU, OS, and VM with rtm support.
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
+ * @requires vm.rtm.cpu & vm.rtm.compiler
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission