--- a/hotspot/test/compiler/unsafe/UnsafeGetStableArrayElement.java	Thu Jul 14 08:33:08 2016 +0200
+++ b/hotspot/test/compiler/unsafe/UnsafeGetStableArrayElement.java	Wed Jul 13 18:03:15 2016 +0300
@@ -28,7 +28,7 @@
  * @summary tests on constant folding of unsafe get operations from stable arrays
  * @library /testlibrary
  *
- * @requires vm.flavor != "client"
+ * @requires vm.flavor == "server"
  *
  * @modules java.base/jdk.internal.vm.annotation
  *          java.base/jdk.internal.misc
@@ -332,9 +332,10 @@
     }
 
     public static void main(String[] args) throws Exception {
-        if (Platform.isServer()) {
-            testUnsafeAccess();
+        if (!Platform.isServer()) {
+            throw new Error("TESTBUG: Not server VM");
         }
+        testUnsafeAccess();
         System.out.println("TEST PASSED");
     }
 }