diff --git a/llvm/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll b/llvm/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll
index 36385e2b207b..719150dd31d9 100644
--- a/llvm/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll
+++ b/llvm/test/Analysis/Dominators/2006-09-26-PostDominanceFrontier.ll
@@ -1,4 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -postdomfrontier -disable-verify
+; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -postdomfrontier \
+; RUN:   -disable-verify
+; END.
 ;
 ; ModuleID = '2006-09-26-PostDominanceFrontier.bc'
 target endian = little
diff --git a/llvm/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll b/llvm/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll
index e7bb43e97f43..40d276087df0 100644
--- a/llvm/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll
+++ b/llvm/test/Analysis/Dominators/2006-10-02-BreakCritEdges.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -domtree -break-crit-edges -analyze -domtree | grep '3.*%brtrue$'
+; RUN: llvm-upgrade < %s | llvm-as | opt -domtree -break-crit-edges -analyze \
+; RUN:  -domtree | grep {3.*%brtrue$}
 ; PR932
 implementation   ; Functions:
 
diff --git a/llvm/test/Analysis/Dominators/dg.exp b/llvm/test/Analysis/Dominators/dg.exp
index ff34508c3c64..879685ca879d 100644
--- a/llvm/test/Analysis/Dominators/dg.exp
+++ b/llvm/test/Analysis/Dominators/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}]]
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/llvm/test/Analysis/GlobalsModRef/dg.exp b/llvm/test/Analysis/GlobalsModRef/dg.exp
index ff34508c3c64..879685ca879d 100644
--- a/llvm/test/Analysis/GlobalsModRef/dg.exp
+++ b/llvm/test/Analysis/GlobalsModRef/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}]]
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/llvm/test/Analysis/GlobalsModRef/indirect-global.ll b/llvm/test/Analysis/GlobalsModRef/indirect-global.ll
index bb75732bebb0..0ab82aefb8bf 100644
--- a/llvm/test/Analysis/GlobalsModRef/indirect-global.ll
+++ b/llvm/test/Analysis/GlobalsModRef/indirect-global.ll
@@ -1,6 +1,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   opt -globalsmodref-aa -load-vn -gcse -instcombine | llvm-dis | \
-; RUN:   grep 'ret i32 0'
+; RUN:   grep {ret i32 0}
+; END.
 %G = internal global int* null
 
 implementation
diff --git a/llvm/test/Analysis/LoadVN/casts.ll b/llvm/test/Analysis/LoadVN/casts.ll
index 9b8f6a599999..3da4d5730193 100644
--- a/llvm/test/Analysis/LoadVN/casts.ll
+++ b/llvm/test/Analysis/LoadVN/casts.ll
@@ -1,7 +1,7 @@
 ; Check to make sure that Value Numbering doesn't merge casts of different
 ; flavors.
 ; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | \
-; RUN:   grep '[sz]ext' | wc -l | grep 2
+; RUN:   grep {\[sz\]ext} | wc -l | grep 2
 
 declare void %external(int)
 
diff --git a/llvm/test/Analysis/LoadVN/dg.exp b/llvm/test/Analysis/LoadVN/dg.exp
index ff34508c3c64..879685ca879d 100644
--- a/llvm/test/Analysis/LoadVN/dg.exp
+++ b/llvm/test/Analysis/LoadVN/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}]]
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/llvm/test/Analysis/LoopInfo/dg.exp b/llvm/test/Analysis/LoopInfo/dg.exp
index ff34508c3c64..879685ca879d 100644
--- a/llvm/test/Analysis/LoopInfo/dg.exp
+++ b/llvm/test/Analysis/LoopInfo/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}]]
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/llvm/test/Analysis/ScalarEvolution/dg.exp b/llvm/test/Analysis/ScalarEvolution/dg.exp
index 0abedddac687..b65a2503ac6f 100644
--- a/llvm/test/Analysis/ScalarEvolution/dg.exp
+++ b/llvm/test/Analysis/ScalarEvolution/dg.exp
@@ -1,3 +1,3 @@
-load_lib llvm-dg.exp
+load_lib llvm.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.ll]] 
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.ll]] 
diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count.ll b/llvm/test/Analysis/ScalarEvolution/trip-count.ll
index 671aba574c8a..a689e71eaa3c 100644
--- a/llvm/test/Analysis/ScalarEvolution/trip-count.ll
+++ b/llvm/test/Analysis/ScalarEvolution/trip-count.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -analyze -scalar-evolution 2>&1 | \
-; RUN:   grep '10000 iterations'
+; RUN: llvm-as < %s | opt -analyze -scalar-evolution |& \
+; RUN:   grep {10000 iterations}
 ; PR1101
 
 @A = weak global [1000 x i32] zeroinitializer, align 32