diff --git a/llvm/test/CodeGen/X86/2004-03-30-Select-Max.ll b/llvm/test/CodeGen/X86/2004-03-30-Select-Max.ll
index b6631b62118a..c44d10ac5b5a 100644
--- a/llvm/test/CodeGen/X86/2004-03-30-Select-Max.ll
+++ b/llvm/test/CodeGen/X86/2004-03-30-Select-Max.ll
@@ -1,6 +1,6 @@
-; RUN: llc < %s -march=x86 | not grep {j\[lgbe\]}
+; RUN: llc < %s -march=x86 -mcpu=yonah | not grep {j\[lgbe\]}
 
-define i32 @max(i32 %A, i32 %B) {
+define i32 @max(i32 %A, i32 %B) nounwind {
         %gt = icmp sgt i32 %A, %B               ; <i1> [#uses=1]
         %R = select i1 %gt, i32 %A, i32 %B              ; <i32> [#uses=1]
         ret i32 %R
diff --git a/llvm/test/CodeGen/X86/2008-08-05-SpillerBug.ll b/llvm/test/CodeGen/X86/2008-08-05-SpillerBug.ll
index 4c6493445a90..d9d95b595bee 100644
--- a/llvm/test/CodeGen/X86/2008-08-05-SpillerBug.ll
+++ b/llvm/test/CodeGen/X86/2008-08-05-SpillerBug.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -mtriple=i386-apple-darwin -disable-fp-elim -stats |& grep asm-printer | grep 55
+; RUN: llc < %s -mtriple=i386-apple-darwin -mcpu=yonah -disable-fp-elim -stats |& grep asm-printer | grep 55
 ; PR2568
 
 @g_3 = external global i16		; <i16*> [#uses=1]
diff --git a/llvm/test/CodeGen/X86/clz.ll b/llvm/test/CodeGen/X86/clz.ll
index 3f27187d44a8..623ac75b5299 100644
--- a/llvm/test/CodeGen/X86/clz.ll
+++ b/llvm/test/CodeGen/X86/clz.ll
@@ -1,10 +1,11 @@
-; RUN: llc < %s -march=x86 | grep bsr | count 2
-; RUN: llc < %s -march=x86 | grep bsf
-; RUN: llc < %s -march=x86 | grep cmov | count 3
+; RUN: llc < %s -march=x86 -mcpu=yonah | FileCheck %s
 
 define i32 @t1(i32 %x) nounwind  {
 	%tmp = tail call i32 @llvm.ctlz.i32( i32 %x )
 	ret i32 %tmp
+; CHECK: t1:
+; CHECK: bsrl
+; CHECK: cmov
 }
 
 declare i32 @llvm.ctlz.i32(i32) nounwind readnone 
@@ -12,6 +13,9 @@ declare i32 @llvm.ctlz.i32(i32) nounwind readnone
 define i32 @t2(i32 %x) nounwind  {
 	%tmp = tail call i32 @llvm.cttz.i32( i32 %x )
 	ret i32 %tmp
+; CHECK: t2:
+; CHECK: bsfl
+; CHECK: cmov
 }
 
 declare i32 @llvm.cttz.i32(i32) nounwind readnone 
@@ -21,6 +25,9 @@ entry:
         %tmp1 = add i16 %x, %y
 	%tmp2 = tail call i16 @llvm.ctlz.i16( i16 %tmp1 )		; <i16> [#uses=1]
 	ret i16 %tmp2
+; CHECK: t3:
+; CHECK: bsrw
+; CHECK: cmov
 }
 
 declare i16 @llvm.ctlz.i16(i16) nounwind readnone