diff --git a/test/C++Frontend/2003-10-21-InnerClass.cpp.tr b/test/C++Frontend/2003-10-21-InnerClass.cpp.tr
index 4f7b436c14f..0e8ff2cd30c 100644
--- a/test/C++Frontend/2003-10-21-InnerClass.cpp.tr
+++ b/test/C++Frontend/2003-10-21-InnerClass.cpp.tr
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -xc++ -S -o - %s | grep '"struct.X::Y"'
+// RUN: %llvmgcc -xc++ -S -o - %s | grep "struct.X::Y"
 struct X {
 
   struct Y {
diff --git a/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr b/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr
index 3596d68e5d0..2b3b8b17974 100644
--- a/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr
+++ b/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr
@@ -1,5 +1,6 @@
 // The code generated for this testcase should be completely typesafe!
-// RUN: %llvmgcc -xc++ -S -o - %s | llvm-as | opt -die | llvm-dis | not grep ' cast '
+// RUN: %llvmgcc -xc++ -S -o - %s | llvm-as | opt -die | llvm-dis | \
+// RUN:   notcast
 
 struct contained {
   unsigned X;
diff --git a/test/C++Frontend/2003-11-18-MemberInitializationCasting.cpp.tr b/test/C++Frontend/2003-11-18-MemberInitializationCasting.cpp.tr
index 1d607a2ac95..30290826e75 100644
--- a/test/C++Frontend/2003-11-18-MemberInitializationCasting.cpp.tr
+++ b/test/C++Frontend/2003-11-18-MemberInitializationCasting.cpp.tr
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -xc++ -S -o - %s | llvm-as | opt -die | llvm-dis | not grep ' cast '
+// RUN: %llvmgcc -xc++ -S -o - %s | llvm-as | opt -die | llvm-dis | notcast
 
 struct A {
         A() : i(0) {}
diff --git a/test/C++Frontend/2004-01-11-DynamicInitializedConstant.cpp.tr b/test/C++Frontend/2004-01-11-DynamicInitializedConstant.cpp.tr
index 03fead23f2f..8ae15c9592b 100644
--- a/test/C++Frontend/2004-01-11-DynamicInitializedConstant.cpp.tr
+++ b/test/C++Frontend/2004-01-11-DynamicInitializedConstant.cpp.tr
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -xc++ -S -o - %s | not grep ' constant '
+// RUN: %llvmgcc -xc++ -S -o - %s | not grep { constant }
 
 extern int X;
 const int Y = X;
diff --git a/test/C++Frontend/2004-09-27-CompilerCrash.cpp b/test/C++Frontend/2004-09-27-CompilerCrash.cpp
index 726bd86a40d..1e5e6acea5a 100644
--- a/test/C++Frontend/2004-09-27-CompilerCrash.cpp
+++ b/test/C++Frontend/2004-09-27-CompilerCrash.cpp
@@ -1,7 +1,5 @@
 // RUN: %llvmgxx -S %s -o - | llvm-as -f -o /dev/null
 
-
-
 struct Pass {} ;
 template<typename PassName>
 Pass *callDefaultCtor() { return new PassName(); }
diff --git a/test/C++Frontend/2004-09-27-DidntEmitTemplate.cpp.tr b/test/C++Frontend/2004-09-27-DidntEmitTemplate.cpp.tr
index 21f4ac854fa..706d541bee6 100644
--- a/test/C++Frontend/2004-09-27-DidntEmitTemplate.cpp.tr
+++ b/test/C++Frontend/2004-09-27-DidntEmitTemplate.cpp.tr
@@ -1,4 +1,5 @@
-// RUN: llvmgcc -xc++ %s -c -o - | llvm-dis | grep callDefaultCtor | not grep declare
+// RUN: %llvmgxx -xc++ %s -c -o - | llvm-dis | grep callDefaultCtor | \
+// RUN:   not grep declare
 
 // This is a testcase for LLVM PR445, which was a problem where the 
 // instantiation of callDefaultCtor was not being emitted correctly.
diff --git a/test/C++Frontend/2004-11-27-EmitsUnusedInlineFunctions.cpp b/test/C++Frontend/2004-11-27-EmitsUnusedInlineFunctions.cpp
index 68df84c0756..794b7d7fd8b 100644
--- a/test/C++Frontend/2004-11-27-EmitsUnusedInlineFunctions.cpp
+++ b/test/C++Frontend/2004-11-27-EmitsUnusedInlineFunctions.cpp
@@ -2,6 +2,6 @@
 // verifies that it does not emit the body of getchar, because it is not used.
 // This corresponds to PR459
 
-// RUN: %llvmgxx %s -S -o - | not grep '^int .getchar'
+// RUN: %llvmgxx %s -S -o - | not grep {^i32 .getchar}
 
 #include <stdio.h>
diff --git a/test/C++Frontend/2005-02-14-BitFieldOffset.cpp b/test/C++Frontend/2005-02-14-BitFieldOffset.cpp
index 375b0902a1c..522e20a478d 100644
--- a/test/C++Frontend/2005-02-14-BitFieldOffset.cpp
+++ b/test/C++Frontend/2005-02-14-BitFieldOffset.cpp
@@ -1,4 +1,4 @@
-// RUN: %llvmgxx %s -S -o - | not grep 'int 6'
+// RUN: %llvmgxx %s -S -o - | not grep {i32 6}
 
 struct QVectorTypedData {
     int size;
diff --git a/test/C++Frontend/2006-09-27-Debug-Protection.cpp b/test/C++Frontend/2006-09-27-Debug-Protection.cpp
index 87bc0d595ad..27cbc0f1e8f 100644
--- a/test/C++Frontend/2006-09-27-Debug-Protection.cpp
+++ b/test/C++Frontend/2006-09-27-Debug-Protection.cpp
@@ -1,6 +1,6 @@
 // XFAIL: llvmgcc3
-// RUN: %llvmgxx -O0 -emit-llvm -S -g -o - %s | grep 'i32 1,' &&
-// RUN: %llvmgxx -O0 -emit-llvm -S -g -o - %s | grep 'i32 2,'
+// RUN: %llvmgxx -O0 -emit-llvm -S -g -o - %s | grep {i32 1,}
+// RUN: %llvmgxx -O0 -emit-llvm -S -g -o - %s | grep {i32 2,}
 
 class A {
 public:
diff --git a/test/C++Frontend/2007-03-27-FunctionVarRename.cpp b/test/C++Frontend/2007-03-27-FunctionVarRename.cpp
index ca68af1d57f..538d6df1813 100644
--- a/test/C++Frontend/2007-03-27-FunctionVarRename.cpp
+++ b/test/C++Frontend/2007-03-27-FunctionVarRename.cpp
@@ -1,5 +1,5 @@
-// RUN: %llvmgxx %s -emit-llvm -S -o - | not grep 'eprintf1' &&
-// RUN: %llvmgxx %s -emit-llvm -S -o - | grep 'eprintf'
+// RUN: %llvmgxx %s -emit-llvm -S -o - | not grep eprintf1
+// RUN: %llvmgxx %s -emit-llvm -S -o - | grep eprintf
 
 // Only one eprintf should exist in the output
 
diff --git a/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp b/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp
index 902ee126f60..20b9d84298c 100644
--- a/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp
+++ b/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp
@@ -1,10 +1,17 @@
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | grep xglobWeak | grep linkonce | wc -l | grep 1
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | grep xextWeak | grep linkonce | wc -l | grep 1
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | grep xWeaknoinline | grep weak wc -l | grep 1
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | grep xWeakextnoinline | grep weak wc -l | grep 1
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep declare | grep xglobnoWeak | grep linkonce | wc -l | grep 1
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | grep xstatnoWeak | grep internal | wc -l | grep 1
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | grep xextnoWeak | grep linkonce | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \
+// RUN:   grep xglobWeak | grep linkonce | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \
+// RUN:   grep xextWeak | grep linkonce | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \
+// RUN:   grep xWeaknoinline | grep weak | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \
+// RUN:   grep xWeakextnoinline | grep weak | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep declare | \
+// RUN:   grep xglobnoWeak | grep linkonce | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \
+// RUN:   grep xstatnoWeak | grep internal | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \
+// RUN:   grep xextnoWeak | grep linkonce | wc -l | grep 1
 inline int xglobWeak(int) __attribute__((weak));
 inline int xglobWeak (int i) {
   return i*2;
diff --git a/test/C++Frontend/dg.exp b/test/C++Frontend/dg.exp
index ff34508c3c6..879685ca879 100644
--- a/test/C++Frontend/dg.exp
+++ b/test/C++Frontend/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}]]