diff --git a/test/Feature/TestAsmDisasm.sh b/test/Feature/TestAsmDisasm.sh
index 88c8633fcc9..1474c516f53 100755
--- a/test/Feature/TestAsmDisasm.sh
+++ b/test/Feature/TestAsmDisasm.sh
@@ -4,15 +4,21 @@
 
 rm -f test.bc.temp[12]
 
-LD_LIBRARY_PATH=../lib/Assembly/Parser/Debug:../lib/Assembly/Writer/Debug:../lib/Analysis/Debug:../lib/VMCore/Debug:../lib/Bytecode/Writer/Debug:../lib/Bytecode/Reader/Debug:../lib/Optimizations/Debug
+LD_LIBRARY_PATH=../lib/Debug
 export LD_LIBRARY_PATH
 
+AS=../tools/Debug/as
+DIS=../tools/Debug/dis
+export AS
+export DIS
+
+
 # Two full cycles are needed for bitwise stability
 
-../tools/as/as   < $1      > $1.bc.1 || exit 1
-../tools/dis/dis < $1.bc.1 > $1.ll.1 || exit 2
-../tools/as/as   < $1.ll.1 > $1.bc.2 || exit 3
-../tools/dis/dis < $1.bc.2 > $1.ll.2 || exit 4
+$AS  < $1      > $1.bc.1 || exit 1
+$DIS < $1.bc.1 > $1.ll.1 || exit 2
+$AS  < $1.ll.1 > $1.bc.2 || exit 3
+$DIS < $1.bc.2 > $1.ll.2 || exit 4
 
 diff $1.ll.[12] || exit 7
 
diff --git a/test/Feature/TestOptimizer.sh b/test/Feature/TestOptimizer.sh
index 12afa77270f..50729b6251b 100755
--- a/test/Feature/TestOptimizer.sh
+++ b/test/Feature/TestOptimizer.sh
@@ -1,22 +1,28 @@
 #!/bin/sh
-LD_LIBRARY_PATH=../lib/Assembly/Parser/Debug:../lib/Assembly/Writer/Debug:../lib/Analysis/Debug:../lib/VMCore/Debug:../lib/Bytecode/Writer/Debug:../lib/Bytecode/Reader/Debug:../lib/Optimizations/Debug
+LD_LIBRARY_PATH=../lib/Debug
 export LD_LIBRARY_PATH
 
+AS=../tools/Debug/as
+DIS=../tools/Debug/dis
+OPT=../tools/Debug/opt
+export AS
+export DIS
+export OPT
 
-../tools/as/as < $1 | ../tools/opt/opt -q -inline -dce -constprop -dce | ../tools/dis/dis | ../tools/as/as > $1.bc.1 || exit 1
+$AS < $1 | $OPT -q -inline -dce -constprop -dce | $DIS | $AS > $1.bc.1 || exit 1
 
 # Should not be able to optimize further!
-../tools/opt/opt -q -constprop -dce < $1.bc.1 > $1.bc.2 || exit 2
+$OPT -q -constprop -dce < $1.bc.1 > $1.bc.2 || exit 2
 
-../tools/dis/dis < $1.bc.1 > $1.ll.1 || exit 3
-../tools/dis/dis < $1.bc.2 > $1.ll.2 || exit 3
+$DIS < $1.bc.1 > $1.ll.1 || exit 3
+$DIS < $1.bc.2 > $1.ll.2 || exit 3
 diff $1.ll.[12] || exit 3
 
 # Try out SCCP
-../tools/as/as < $1 | ../tools/opt/opt -q -inline -dce -sccp -dce | ../tools/dis/dis | ../tools/as/as > $1.bc.3 || exit 1
+$AS < $1 | $OPT -q -inline -dce -sccp -dce | $DIS | $AS > $1.bc.3 || exit 1
 
 # Should not be able to optimize further!
-#../tools/opt/opt -q -sccp -dce < $1.bc.3 > $1.bc.4 || exit 2
+#$OPT -q -sccp -dce < $1.bc.3 > $1.bc.4 || exit 2
 
 #diff $1.bc.[34] || exit 3
 rm $1.bc.[123] $1.ll.[12]
diff --git a/test/Setup b/test/Setup
index ff2f0851aed..a6ab810dff4 100644
--- a/test/Setup
+++ b/test/Setup
@@ -1,4 +1,5 @@
-setenv LD_LIBRARY_PATH ../lib/Assembly/Parser/Debug:../lib/Assembly/Writer/Debug:../lib/Analysis/Debug:../lib/VMCore/Debug:../lib/Bytecode/Writer/Debug:../lib/Bytecode/Reader/Debug:../lib/Optimizations/Debug
+setenv LD_LIBRARY_PATH ../lib/Debug
+
+setenv PATH ../tools/Debug:${PATH}
+alias as ../tools/Debug/as
 
-setenv PATH ../lib/CodeGen:../tools/dis:../tools/opt:../tools/strip:../tools/analyze:../tools/llc:${PATH}
-alias as ../tools/as/as
diff --git a/test/SetupOpt b/test/SetupOpt
index 0867d01c8e3..1932541986b 100755
--- a/test/SetupOpt
+++ b/test/SetupOpt
@@ -1,4 +1,4 @@
-setenv LD_LIBRARY_PATH ../lib/Assembly/Parser/Release:../lib/Assembly/Writer/Release:../lib/Analysis/Release:../lib/VMCore/Release:../lib/Bytecode/Writer/Release:../lib/Bytecode/Reader/Release:../lib/Optimizations/Release
+setenv LD_LIBRARY_PATH ../lib/Release
 
-setenv PATH ../tools/dis:../tools/opt:../tools/strip:../tools/analyze:${PATH}
-alias as ../tools/as/as
+setenv PATH ../tools/Release:${PATH}
+alias as ../tools/Release/as