diff --git a/src/java.base/unix/native/libjli/java_md.c b/src/java.base/unix/native/libjli/java_md.c
index 2c25a7668c3..0a61971b080 100644
--- a/src/java.base/unix/native/libjli/java_md.c
+++ b/src/java.base/unix/native/libjli/java_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, 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
@@ -348,7 +348,6 @@ CreateExecutionEnvironment(int *pargc, char ***pargv,
          *
          *     o          $JVMPATH (directory portion only)
          *     o          $JDK/lib
-         *     o          $JDK/../lib
          *
          * followed by the user's previous effective LD_LIBRARY_PATH, if
          * any.
@@ -377,10 +376,8 @@ CreateExecutionEnvironment(int *pargc, char ***pargv,
 
                 snprintf(new_runpath, new_runpath_size, LD_LIBRARY_PATH "="
                         "%s:"
-                        "%s/lib:"
-                        "%s/../lib",
+                        "%s/lib",
                         new_jvmpath,
-                        jdkroot,
                         jdkroot
                         );
 
diff --git a/test/jdk/tools/launcher/ExecutionEnvironment.java b/test/jdk/tools/launcher/ExecutionEnvironment.java
index 8a10756021e..dbf20fc5bb9 100644
--- a/test/jdk/tools/launcher/ExecutionEnvironment.java
+++ b/test/jdk/tools/launcher/ExecutionEnvironment.java
@@ -141,7 +141,6 @@ public class ExecutionEnvironment extends TestHelper {
                     String libPath = LD_LIBRARY_PATH + "=" +
                         jvmroot + "/lib/server" + System.getProperty("path.separator") +
                         jvmroot + "/lib" + System.getProperty("path.separator") +
-                        jvmroot + "/../lib" + System.getProperty("path.separator") +
                         LD_LIBRARY_PATH_VALUE;
                     if (!tr.matches(libPath)) {
                         flagError(tr, "FAIL: did not get <" + libPath + ">");
diff --git a/test/jdk/tools/launcher/Test7029048.java b/test/jdk/tools/launcher/Test7029048.java
index 4aab158cfc1..f92867044a1 100644
--- a/test/jdk/tools/launcher/Test7029048.java
+++ b/test/jdk/tools/launcher/Test7029048.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, 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
@@ -26,21 +26,10 @@
  * @bug 7029048 8217340 8217216
  * @summary Ensure that the launcher defends against user settings of the
  *          LD_LIBRARY_PATH environment variable on Unixes
- * @requires os.family != "windows" & os.family != "mac" & !vm.musl & os.family != "aix"
+ * @requires os.family != "windows" & os.family != "mac"
  * @library /test/lib
- * @compile -XDignore.symbol.file ExecutionEnvironment.java Test7029048.java
- * @run main/othervm -DexpandedLdLibraryPath=false Test7029048
- */
-
-/**
- * @test
- * @bug 7029048 8217340 8217216
- * @summary Ensure that the launcher defends against user settings of the
- *          LD_LIBRARY_PATH environment variable on Unixes
- * @requires os.family == "aix" | vm.musl
- * @library /test/lib
- * @compile -XDignore.symbol.file ExecutionEnvironment.java Test7029048.java
- * @run main/othervm -DexpandedLdLibraryPath=true Test7029048
+ * @compile ExecutionEnvironment.java Test7029048.java
+ * @run main/othervm Test7029048
  */
 
 import java.io.File;
@@ -51,13 +40,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import jdk.test.lib.Platform;
+
 public class Test7029048 extends TestHelper {
 
     private static final String LIBJVM = ExecutionEnvironment.LIBJVM;
     private static final String LD_LIBRARY_PATH =
             ExecutionEnvironment.LD_LIBRARY_PATH;
-    private static final String LD_LIBRARY_PATH_64 =
-            ExecutionEnvironment.LD_LIBRARY_PATH_64;
 
     private static final File libDir =
             new File(System.getProperty("sun.boot.library.path"));
@@ -71,9 +60,6 @@ public class Test7029048 extends TestHelper {
     private static final File dstClientDir = new File(dstLibDir, "client");
     private static final File dstClientLibjvm = new File(dstClientDir, LIBJVM);
 
-    static final boolean IS_EXPANDED_LD_LIBRARY_PATH =
-            Boolean.getBoolean("expandedLdLibraryPath");
-
     static String getValue(String name, List<String> in) {
         for (String x : in) {
             String[] s = x.split("=");
@@ -134,7 +120,7 @@ public class Test7029048 extends TestHelper {
     private static enum TestCase {
         NO_DIR(0),                      // Directory does not exist
         NO_LIBJVM(0),                   // Directory exists, but no libjvm.so
-        LIBJVM(3);                      // Directory exists, with a libjvm.so
+        LIBJVM(2);                      // Directory exists, with a libjvm.so
         private final int value;
         TestCase(int i) {
             this.value = i;
@@ -170,7 +156,7 @@ public class Test7029048 extends TestHelper {
                     }
 
                     desc = "LD_LIBRARY_PATH should not be set (no libjvm.so)";
-                    if (IS_EXPANDED_LD_LIBRARY_PATH) {
+                    if (Platform.isAix() || Platform.isMusl()) {
                         printSkipMessage(desc);
                         continue;
                     }
@@ -180,7 +166,7 @@ public class Test7029048 extends TestHelper {
                         recursiveDelete(dstLibDir);
                     }
                     desc = "LD_LIBRARY_PATH should not be set (no directory)";
-                    if (IS_EXPANDED_LD_LIBRARY_PATH) {
+                    if (Platform.isAix() || Platform.isMusl()) {
                         printSkipMessage(desc);
                         continue;
                     }