diff -r 813343dec9dd -r db6c74a53556 hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java	Thu Jul 14 08:33:08 2016 +0200
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java	Wed Jul 13 18:03:15 2016 +0300
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8031321
+ * @requires vm.flavor == "server"
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management