diff --git a/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll b/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll
index 66ad1b1f76e..2d4e94f2886 100644
--- a/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll
+++ b/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin8.6.1 -relocation-model=static | grep 'movl _last' | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | grep 'movl _last' | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | grep 'cmpl.*_last' | wc -l | grep 1
 
 %block = external global ubyte*		; <ubyte**> [#uses=1]
 %last = external global int		; <int*> [#uses=3]
diff --git a/test/CodeGen/X86/compare_folding.llx b/test/CodeGen/X86/compare_folding.llx
index 2d003f01bf1..6a91bec55f9 100644
--- a/test/CodeGen/X86/compare_folding.llx
+++ b/test/CodeGen/X86/compare_folding.llx
@@ -1,6 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep com | wc -l > %t2
-; RUN: grep 'COM =' %s | grep -v grep | wc -l > %t1
-; RUN: diff %t1 %t2
+; RUN: llvm-as < %s | llc -march=x86 | grep movsd | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -march=x86 | grep ucomisd
 declare bool %llvm.isunordered(double,double)
 
 bool %test1(double %X, double %Y) {  ;; Returns isunordered(X,Y)
diff --git a/test/CodeGen/X86/scalar_sse_minmax.ll b/test/CodeGen/X86/scalar_sse_minmax.ll
index b2217f9975b..6a464e3d850 100644
--- a/test/CodeGen/X86/scalar_sse_minmax.ll
+++ b/test/CodeGen/X86/scalar_sse_minmax.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse1,+sse2 | grep mins | wc -l | grep 2 &&
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse1,+sse2 | grep mins | wc -l | grep 3 &&
 ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse1,+sse2 | grep maxs | wc -l | grep 2
 
 declare bool %llvm.isunordered.f64( double %x, double %y )
@@ -33,5 +33,10 @@ double %max2(double %x, double %y) {
         ret double %retval
 }
 
+<4 x float> %min3(float %tmp37) {
+        %tmp375 = insertelement <4 x float> undef, float %tmp37, uint 0
+        %tmp48 = tail call <4 x float> %llvm.x86.sse.min.ss( <4 x float> %tmp375, <4 x float> < float 6.553500e+04, float undef, float undef, float undef > )
+	ret <4 x float> %tmp48
+}
 
-
+declare <4 x float> %llvm.x86.sse.min.ss(<4 x float>, <4 x float>)