--- a/jdk/test/tools/launcher/ExecutionEnvironment.java	Fri Jun 17 10:34:44 2011 -0700
+++ b/jdk/test/tools/launcher/ExecutionEnvironment.java	Fri Jun 17 15:17:01 2011 -0700
@@ -299,8 +299,8 @@
 
         if (TestHelper.is32Bit) {
             tr = TestHelper.doExec(TestHelper.javaCmd, "-client", "-version");
-            if (!tr.matches("Java.*Client VM.*")) {
-                System.out.println("FAIL: the expected vm -client did launch");
+            if (!tr.matches(".*Client VM.*")) {
+                System.out.println("FAIL: the expected vm -client did not launch");
                 System.out.println(tr);
                 errors++;
             } else {
@@ -308,8 +308,8 @@
             }
         }
         tr = TestHelper.doExec(TestHelper.javaCmd, "-server", "-version");
-        if (!tr.matches("Java.*Server VM.*")) {
-            System.out.println("FAIL: the expected vm -server did launch");
+        if (!tr.matches(".*Server VM.*")) {
+            System.out.println("FAIL: the expected vm -server did not launch");
             System.out.println(tr);
             errors++;
         } else {

--- a/jdk/test/tools/launcher/VersionCheck.java	Fri Jun 17 10:34:44 2011 -0700
+++ b/jdk/test/tools/launcher/VersionCheck.java	Fri Jun 17 15:17:01 2011 -0700
@@ -132,7 +132,7 @@
         StringBuilder out = new StringBuilder();
         // remove the HotSpot line
         for (String x : alist) {
-            if (!x.contains("HotSpot")) {
+            if (!x.matches(".*Client.*VM.*|.*Server.*VM.*")) {
                 out = out.append(x + "\n");
             }
         }