diff --git a/llvm/test/Feature/TestAsmDisasm.sh b/llvm/test/Feature/TestAsmDisasm.sh
index 641dd2aea968..56e383328c10 100755
--- a/llvm/test/Feature/TestAsmDisasm.sh
+++ b/llvm/test/Feature/TestAsmDisasm.sh
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 # FIXME: We must strip symbols, because the symbol tables are not output in 
 # sorted order in the bytecode :(
 
-../tools/as/as   < $1      | opt -q -strip > $1.bc.1 || exit 1
+../tools/as/as   < $1      | ../tools/opt/opt -q -strip > $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
diff --git a/llvm/test/Feature/TestOptimizer.sh b/llvm/test/Feature/TestOptimizer.sh
index 5473647118eb..12afa77270fc 100755
--- a/llvm/test/Feature/TestOptimizer.sh
+++ b/llvm/test/Feature/TestOptimizer.sh
@@ -8,8 +8,8 @@ export LD_LIBRARY_PATH
 # Should not be able to optimize further!
 ../tools/opt/opt -q -constprop -dce < $1.bc.1 > $1.bc.2 || exit 2
 
-dis < $1.bc.1 > $1.ll.1 || exit 3
-dis < $1.bc.2 > $1.ll.2 || exit 3
+../tools/dis/dis < $1.bc.1 > $1.ll.1 || exit 3
+../tools/dis/dis < $1.bc.2 > $1.ll.2 || exit 3
 diff $1.ll.[12] || exit 3
 
 # Try out SCCP