--- a/hotspot/test/compiler/unsafe/UnsafeGetConstantField.java	Mon Feb 29 15:05:45 2016 +0100
+++ b/hotspot/test/compiler/unsafe/UnsafeGetConstantField.java	Mon Feb 29 23:46:55 2016 +0300
@@ -27,6 +27,9 @@
  * @test
  * @summary tests on constant folding of unsafe get operations
  * @library /testlibrary /test/lib
+ *
+ * @requires vm.flavor != "client"
+ *
  * @run main/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -Xbatch -XX:-TieredCompilation
  *                   -XX:+FoldStableValues