diff --git a/test/Feature/Makefile b/test/Feature/Makefile
index 1b131acc89d..b0eeab8b126 100644
--- a/test/Feature/Makefile
+++ b/test/Feature/Makefile
@@ -24,10 +24,10 @@ testsparc   : $(OTESTS:%.ll=%.s)
 testcbe     : $(OTESTS:%.ll=%.tc)
 
 Output/%.asmdis: % $(LAS) $(LDIS) Output/.dir
-	@./TestAsmDisasm.sh $< $(LLVMTOOLCURRENT) $(LLVMLIBCURRENTSOURCE)
+	@./TestAsmDisasm.sh $< $(LLVMTOOLCURRENT)
 
 Output/%.opt: % $(LAS) $(LDIS) $(LOPT) Output/.dir
-	@./TestOptimizer.sh $< $(LLVMTOOLCURRENT) $(LLVMLIBCURRENTSOURCE)
+	@./TestOptimizer.sh $< $(LLVMTOOLCURRENT)
 
 Output/%.tc: Output/%.bc $(LDIS)
 	@echo "======== Generating C code for $<"
diff --git a/test/Feature/TestAsmDisasm.sh b/test/Feature/TestAsmDisasm.sh
index a492f8f305b..7ef09e67a8c 100755
--- a/test/Feature/TestAsmDisasm.sh
+++ b/test/Feature/TestAsmDisasm.sh
@@ -4,19 +4,6 @@
 
 rm -f test.bc.temp[12]
 
-#
-# 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
 DIS=$2/dis
 
diff --git a/test/Feature/TestOptimizer.sh b/test/Feature/TestOptimizer.sh
index 10008ee1113..6816169a1d4 100755
--- a/test/Feature/TestOptimizer.sh
+++ b/test/Feature/TestOptimizer.sh
@@ -1,18 +1,5 @@
 #!/bin/sh
 
-#
-# 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
 DIS=$2/dis
 OPT=$2/opt