--- a/hotspot/test/runtime/CommandLine/TestVMOptions.java	Thu Apr 23 17:42:06 2015 +0200
+++ b/hotspot/test/runtime/CommandLine/TestVMOptions.java	Thu Apr 23 12:46:42 2015 -0700
@@ -46,7 +46,7 @@
     pb = ProcessTools.createJavaProcessBuilder(
         "-XX:-PrintVMOptions", "-version");
     output = new OutputAnalyzer(pb.start());
-    output.shouldContain("java version");
+    output.shouldMatch("(openjdk|java)\\sversion");
 
     File dir = new File(System.getProperty("test.src", "."));
     File file = new File(dir, "flagfile.txt");