--- old/test/jdk/tools/launcher/RunpathTest.java	2020-05-20 18:08:05.443394650 -0700
+++ new/test/jdk/tools/launcher/RunpathTest.java	2020-05-20 18:08:05.059387277 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
 
     final String findElfReader() {
         String[] paths = {"/usr/sbin", "/usr/bin"};
-        final String cmd = isSolaris ? "elfdump" : "readelf";
+        final String cmd = "readelf";
         for (String x : paths) {
             File p = new File(x);
             File e = new File(p, cmd);
@@ -69,7 +69,7 @@
     }
 
     public static void main(String... args) throws Exception {
-        if (isSolaris || isLinux) {
+        if (isLinux) {
             RunpathTest rp = new RunpathTest();
             if (rp.elfreaderCmd == null) {
                 System.err.println("Warning: test passes vacuously");