diff --git a/test/Feature/TestAsmDisasm.sh b/test/Feature/TestAsmDisasm.sh
index 0b8faef9b22..a492f8f305b 100755
--- a/test/Feature/TestAsmDisasm.sh
+++ b/test/Feature/TestAsmDisasm.sh
@@ -4,7 +4,17 @@
 
 rm -f test.bc.temp[12]
 
-LD_LIBRARY_PATH=$3
+#
+# Split the current LD_LIBRARY_PATH into two separate components.
+#
+FirstLDP=`echo $LD_LIBRARY_PATH | cut -d\; -f1`
+SecondLDP=`echo $LD_LIBRARY_PATH | cut -d\; -f2`
+
+#
+# Now create a new LD_LIBRARY_PATH with our command line options as
+# the first section.
+#
+LD_LIBRARY_PATH="$3:${FirstLDP}\;${SecondLDP}"
 export LD_LIBRARY_PATH
 
 AS=$2/as
diff --git a/test/Feature/TestOptimizer.sh b/test/Feature/TestOptimizer.sh
index 648d7168ea4..10008ee1113 100755
--- a/test/Feature/TestOptimizer.sh
+++ b/test/Feature/TestOptimizer.sh
@@ -1,5 +1,16 @@
 #!/bin/sh
-LD_LIBRARY_PATH=$3
+
+#
+# Split the current LD_LIBRARY_PATH into two separate components.
+#
+FirstLDP=`echo $LD_LIBRARY_PATH | cut -d\; -f1`
+SecondLDP=`echo $LD_LIBRARY_PATH | cut -d\; -f2`
+
+#
+# Now create a new LD_LIBRARY_PATH with our command line options as
+# the first section.
+#
+LD_LIBRARY_PATH="$3:${FirstLDP}\;${SecondLDP}"
 export LD_LIBRARY_PATH
 
 AS=$2/as