diff --git a/test/BugPoint/crash-basictest.ll b/test/BugPoint/crash-basictest.ll
index 3c5804c..77eb6ec 100644
--- a/test/BugPoint/crash-basictest.ll
+++ b/test/BugPoint/crash-basictest.ll
@@ -1,5 +1,7 @@
 ; Basic test for bugpoint.
-; RUN: bugpoint %s -domset -idom -domset -bugpoint-crashcalls -domset -idom -domset
+; RUN: llvm-upgrade < %s > %t1.ll
+; RUN: bugpoint %t1.ll -domset -idom -domset -bugpoint-crashcalls \
+; RUN:   -domset -idom -domset
 
 int %test() {
 	call int %test()
diff --git a/test/BugPoint/crash-narrowfunctiontest.ll b/test/BugPoint/crash-narrowfunctiontest.ll
index 8927ba1..197e42f 100644
--- a/test/BugPoint/crash-narrowfunctiontest.ll
+++ b/test/BugPoint/crash-narrowfunctiontest.ll
@@ -1,6 +1,7 @@
 ; Test that bugpoint can narrow down the testcase to the important function
 ;
-; RUN: bugpoint %s -bugpoint-crashcalls
+; RUN: llvm-upgrade < %s > %t1.ll
+; RUN: bugpoint %t1.ll -bugpoint-crashcalls
 
 int %foo() { ret int 1 }
 
diff --git a/test/BugPoint/misopt-basictest.ll b/test/BugPoint/misopt-basictest.ll
index 76363df..66cc53f 100644
--- a/test/BugPoint/misopt-basictest.ll
+++ b/test/BugPoint/misopt-basictest.ll
@@ -1,6 +1,5 @@
-; RUN: PATH=/usr/bin:/bin/:${PATH}
-; RUN: export PATH
-; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg
+; RUN: llvm-upgrade < %s > %t1.ll
+; RUN: bugpoint %t1.ll -dce -bugpoint-deletecalls -simplifycfg
 
 %.LC0 = internal global [13 x sbyte] c"Hello World\0A\00"
 
diff --git a/test/BugPoint/remove_arguments_test.ll b/test/BugPoint/remove_arguments_test.ll
index 5a0bd6f..ed77da7 100644
--- a/test/BugPoint/remove_arguments_test.ll
+++ b/test/BugPoint/remove_arguments_test.ll
@@ -1,4 +1,5 @@
-; RUN: bugpoint %s  -bugpoint-crashcalls
+; RUN: llvm-upgrade < %s > %t1.ll
+; RUN: bugpoint %t1.ll  -bugpoint-crashcalls
 
 ; Test to make sure that arguments are removed from the function if they are unnecessary.