diff --git a/test/Analysis/BasicAA/2004-01-29-InvariantMemory.llx b/test/Analysis/BasicAA/2004-01-29-InvariantMemory.llx
index cfc4c480cf4..c8c30f989c3 100644
--- a/test/Analysis/BasicAA/2004-01-29-InvariantMemory.llx
+++ b/test/Analysis/BasicAA/2004-01-29-InvariantMemory.llx
@@ -1,4 +1,5 @@
-; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse -instcombine | \
+; RUN:    llvm-dis | not grep load
 
 %X = constant [2 x int] [int 4, int 5]
 
diff --git a/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx b/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx
index f888fc033ad..65bc21a01a1 100644
--- a/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx
+++ b/test/Analysis/BasicAA/2004-07-28-MustAliasbug.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep 'store i32 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -dse | llvm-dis | grep {store i32 0}
 
 void %test({int,int }* %P) {
 	%Q = getelementptr {int,int}* %P, int 1
diff --git a/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll b/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll
index f82816e9fa6..f7f42ba9760 100644
--- a/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll
+++ b/test/Analysis/BasicAA/2005-03-09-BrokenBasicAA.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'load i32\* %A'
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine |\
+; RUN:    llvm-dis | grep {load i32\\* %A}
 
 declare double* %useit(int*)
 
diff --git a/test/Analysis/BasicAA/2007-01-13-BasePointerBadNoAlias.ll b/test/Analysis/BasicAA/2007-01-13-BasePointerBadNoAlias.ll
index f5e2780d30c..683e07db51a 100644
--- a/test/Analysis/BasicAA/2007-01-13-BasePointerBadNoAlias.ll
+++ b/test/Analysis/BasicAA/2007-01-13-BasePointerBadNoAlias.ll
@@ -1,6 +1,9 @@
-; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'sub i32' &&
-; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | not grep 'ret i32 0'
 ; PR1109
+; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | \
+; RUN:   grep {sub i32}
+; RUN: llvm-as < %s | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | \
+; RUN:   not grep {ret i32 0}
+; END.
 
 target datalayout = "e-p:32:32"
 target triple = "i686-apple-darwin8"
diff --git a/test/Analysis/BasicAA/dg.exp b/test/Analysis/BasicAA/dg.exp
index ff34508c3c6..694e4fdd88a 100644
--- a/test/Analysis/BasicAA/dg.exp
+++ b/test/Analysis/BasicAA/dg.exp
@@ -1,3 +1,3 @@
-load_lib llvm-dg.exp
+load_lib llvm.exp
 
 llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Analysis/BasicAA/tailcall-modref.ll b/test/Analysis/BasicAA/tailcall-modref.ll
index a92f85d122a..9d447d91000 100644
--- a/test/Analysis/BasicAA/tailcall-modref.ll
+++ b/test/Analysis/BasicAA/tailcall-modref.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine | llvm-dis | grep 'ret i32 0'
+; RUN: llvm-upgrade < %s | llvm-as | opt -basicaa -load-vn -gcse -instcombine |\
+; RUN:   llvm-dis | grep {ret i32 0}
 declare void %foo(int*)
 declare void %bar()