diff --git a/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr b/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr
index 0c1395dea0e..e6c09e5bfe1 100644
--- a/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr
+++ b/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr
@@ -1,6 +1,6 @@
 // The code generated for this testcase should be completely typesafe!
 // RUN: %llvmgcc -xc++ -S -o - %s | llvm-as | opt -die | llvm-dis | \
-// RUN:    grep -v llvm.noinline | notcast
+// 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 0bfb5dc54e8..cb66ba1127d 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 | grep -v llvm.noinline | notcast
+// RUN: %llvmgcc -xc++ -S -o - %s | llvm-as | opt -die | llvm-dis |  notcast
 
 struct A {
         A() : i(0) {}
diff --git a/test/C++Frontend/2005-07-21-VirtualBaseAccess.cpp b/test/C++Frontend/2005-07-21-VirtualBaseAccess.cpp
index eac77842748..7711cff6d36 100644
--- a/test/C++Frontend/2005-07-21-VirtualBaseAccess.cpp
+++ b/test/C++Frontend/2005-07-21-VirtualBaseAccess.cpp
@@ -1,4 +1,4 @@
-// RUN: %llvmgxx -xc++ %s -c -o - | opt -die | llvm-dis | grep -v llvm.noinline | not grep cast
+// RUN: %llvmgxx -xc++ %s -c -o - | opt -die | llvm-dis | not grep cast
 
 void foo(int*);
 
diff --git a/test/CFrontend/2003-07-22-ArrayAccessTypeSafety.c.tr b/test/CFrontend/2003-07-22-ArrayAccessTypeSafety.c.tr
index 1f302306421..51e66c9b839 100644
--- a/test/CFrontend/2003-07-22-ArrayAccessTypeSafety.c.tr
+++ b/test/CFrontend/2003-07-22-ArrayAccessTypeSafety.c.tr
@@ -1,4 +1,4 @@
-/* RUN: %llvmgcc -xc %s -S -o - | grep -v alloca | grep -v llvm.noinline | not grep bitcast
+/* RUN: %llvmgcc -xc %s -S -o - | grep -v alloca | not grep bitcast
  */
 
 void test(int* array, long long N) {