--- a/hotspot/test/compiler/intrinsics/IntrinsicDisabledTest.java	Tue Jan 17 17:00:22 2017 +0100
+++ b/hotspot/test/compiler/intrinsics/IntrinsicDisabledTest.java	Tue Jan 17 21:38:07 2017 -0800
@@ -197,7 +197,8 @@
     }
 
     public static void main(String args[]) {
-        if (Platform.isServer() && (TIERED_STOP_AT_LEVEL == CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION)) {
+        if (Platform.isServer() && !Platform.isEmulatedClient() &&
+                                   (TIERED_STOP_AT_LEVEL == CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION)) {
             if (TIERED_COMPILATION) {
                 test(CompilerWhiteBoxTest.COMP_LEVEL_SIMPLE);
             }