--- a/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java	Tue Jan 17 17:00:22 2017 +0100
+++ b/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java	Tue Jan 17 21:38:07 2017 -0800
@@ -114,7 +114,7 @@
 
     public void test() throws Exception {
         Executable intrinsicMethod = testCase.getExecutable();
-        if (Platform.isServer() && (TIERED_STOP_AT_LEVEL == COMP_LEVEL_FULL_OPTIMIZATION)) {
+        if (Platform.isServer() && !Platform.isEmulatedClient() && (TIERED_STOP_AT_LEVEL == COMP_LEVEL_FULL_OPTIMIZATION)) {
             if (TIERED_COMPILATION) {
                 checkIntrinsicForCompilationLevel(intrinsicMethod, COMP_LEVEL_SIMPLE);
             }