diff --git a/jdk/test/tools/launcher/ToolsOpts.java b/jdk/test/tools/launcher/ToolsOpts.java
index 44f6d5b1cc7..e4ce69049dc 100644
--- a/jdk/test/tools/launcher/ToolsOpts.java
+++ b/jdk/test/tools/launcher/ToolsOpts.java
@@ -132,9 +132,10 @@ public class ToolsOpts extends TestHelper {
             }
             if (pat.compareTo("-J-version") == 0 ||
                     pat.compareTo("-J-showversion") == 0) {
-                if (!tr.contains("java version")) {
+                if (!tr.contains("java version") &&
+                        !tr.contains("openjdk version")) {
                     throw new RuntimeException("failed: " + pat +
-                            " should have display java version.");
+                            " should display a version string.");
                 }
             } else if (pat.compareTo("-J-XshowSettings:VM") == 0) {
                 if (!tr.contains("VM settings")) {