--- a/test/jdk/tools/launcher/RunpathTest.java	Thu Jun 28 07:22:59 2018 +0200
+++ b/test/jdk/tools/launcher/RunpathTest.java	Thu Jun 28 09:06:54 2018 +0200
@@ -57,14 +57,14 @@
         final TestResult tr = doExec(elfreaderCmd, "-d", javacmd);
         if (!tr.matches(expectedRpath)) {
             System.out.println(tr);
-            throw new RuntimeException("FAILED: RPATH strings " +
+            throw new RuntimeException("FAILED: RPATH/RUNPATH strings " +
                     expectedRpath + " not found in " + javaCmd);
         }
-        System.out.println(javacmd + " contains expected RPATHS");
+        System.out.println(javacmd + " contains expected RPATHS/RUNPATH");
     }
 
     void testRpath() {
-        String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib.*";
+        String expectedRpath = ".*R(UN)?PATH.*\\$ORIGIN/../lib.*";
         elfCheck(javaCmd, expectedRpath);
     }