--- a/hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java	Thu Jan 15 11:10:03 2015 +0100
+++ b/hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java	Thu Jan 15 16:05:20 2015 +0100
@@ -116,7 +116,14 @@
 
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(finalargs.toArray(new String[0]));
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
-    output.shouldHaveExitValue(0);
+    try {
+        output.shouldHaveExitValue(0);
+    } catch (RuntimeException e) {
+        // It's ok if there is no client vm in the jdk.
+        if (output.firstMatch("Unrecognized option: -client") == null) {
+            throw e;
+        }
+    }
 
     return output;
   }