diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td
index 4b427f30a43..0f9ef6a76fa 100644
--- a/include/llvm/Intrinsics.td
+++ b/include/llvm/Intrinsics.td
@@ -237,8 +237,9 @@ def int_eh_typeid_for : Intrinsic<[llvm_i32_ty, llvm_ptr_ty]>;
 
 //===---------------- Generic Variable Attribute Intrinsics----------------===//
 //
-def int_var_annotation : Intrinsic<[llvm_void_ty, llvm_ptr_ty, llvm_ptr_ty], 
-                                      [], "llvm.var.annotation">;
+def int_var_annotation : Intrinsic<[llvm_void_ty, llvm_ptr_ty, llvm_ptr_ty,
+                                    llvm_ptr_ty, llvm_i32_ty], 
+                                    [], "llvm.var.annotation">;
 
 //===----------------------------------------------------------------------===//
 // Target-specific intrinsics
diff --git a/test/CFrontend/2006-09-25-DebugFilename.c b/test/CFrontend/2006-09-25-DebugFilename.c
index e115c394a5e..2139c1ade56 100644
--- a/test/CFrontend/2006-09-25-DebugFilename.c
+++ b/test/CFrontend/2006-09-25-DebugFilename.c
@@ -1,5 +1,5 @@
 // RUN: ignore %llvmgcc -xc %s -S -o /dev/null |& \
-// RUN:   grep fluffy | grep 2006-09-25-DebugFilename.c.tr
+// RUN:   grep fluffy | grep 2006-09-25-DebugFilename.c
 #include "2006-09-25-DebugFilename.h"
 int func1() { return hfunc1(); }
 int func2() { fluffy; return hfunc1(); }
diff --git a/test/CFrontend/2007-06-15-AnnotateAttribute.c b/test/CFrontend/2007-06-15-AnnotateAttribute.c
index 18ce69389dc..6fe09c2e33e 100644
--- a/test/CFrontend/2007-06-15-AnnotateAttribute.c
+++ b/test/CFrontend/2007-06-15-AnnotateAttribute.c
@@ -1,5 +1,4 @@
-// RUN: %llvmgxx -c -emit-llvm %s -o - | llvm-dis | grep llvm.global.annotations | grep foo \ 
-// RUN: | grep @X | grep @a
+// RUN: %llvmgxx -c -emit-llvm %s -o - | llvm-dis | grep llvm.global.annotations
 // RUN: %llvmgxx -c -emit-llvm %s -o - | llvm-dis | grep -c llvm.var.annotation | grep 3 
 
 #include <stdio.h>