--- old/test/compiler/unsafe/UnsafeGetStableArrayElement.java	2016-03-24 14:22:35.000000000 +0300
+++ new/test/compiler/unsafe/UnsafeGetStableArrayElement.java	2016-03-24 14:22:35.000000000 +0300
@@ -27,7 +27,6 @@
  * @test
  * @summary tests on constant folding of unsafe get operations from stable arrays
  * @library /testlibrary /test/lib
- * @ignore 8151137
  *
  * @requires vm.flavor != "client"
  *
@@ -39,6 +38,8 @@
  */
 import jdk.internal.misc.Unsafe;
 import jdk.internal.vm.annotation.Stable;
+import jdk.test.lib.Platform;
+
 import java.util.concurrent.Callable;
 
 import static jdk.internal.misc.Unsafe.*;
@@ -219,6 +220,10 @@
     }
 
     public static void main(String[] args) throws Exception {
+        if (!Platform.isServer()) {
+            return; // not applicable to Client VM
+        }
+
         // boolean[], aligned accesses
         testMatched(   Test::testZ_Z, Test::changeZ);
         testMismatched(Test::testZ_B, Test::changeZ);