diff --git a/test/Transforms/InstCombine/and-fcmp.ll b/test/Transforms/InstCombine/and-fcmp.ll
index 91868d1d075..08fad676c75 100644
--- a/test/Transforms/InstCombine/and-fcmp.ll
+++ b/test/Transforms/InstCombine/and-fcmp.ll
@@ -1,5 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep fcmp | count 3
-; RUN: opt < %s -instcombine -S | grep ret | grep 0
+; RUN: opt < %s -instcombine -S | FileCheck %s
 
 define zeroext i8 @t1(float %x, float %y) nounwind {
        %a = fcmp ueq float %x, %y
@@ -7,6 +6,11 @@ define zeroext i8 @t1(float %x, float %y) nounwind {
        %c = and i1 %a, %b
        %retval = zext i1 %c to i8
        ret i8 %retval
+; CHECK: t1
+; CHECK: fcmp oeq float %x, %y
+; CHECK-NOT: fcmp ueq float %x, %y
+; CHECK-NOT: fcmp ord float %x, %y
+; CHECK-NOW: and
 }
 
 define zeroext i8 @t2(float %x, float %y) nounwind {
@@ -15,6 +19,11 @@ define zeroext i8 @t2(float %x, float %y) nounwind {
        %c = and i1 %a, %b
        %retval = zext i1 %c to i8
        ret i8 %retval
+; CHECK: t2
+; CHECK: fcmp olt float %x, %y
+; CHECK-NOT: fcmp olt float %x, %y
+; CHECK-NOT: fcmp ord float %x, %y
+; CHECK-NOT: and
 }
 
 define zeroext i8 @t3(float %x, float %y) nounwind {
@@ -23,6 +32,8 @@ define zeroext i8 @t3(float %x, float %y) nounwind {
        %c = and i1 %a, %b
        %retval = zext i1 %c to i8
        ret i8 %retval
+; CHECK: t3
+; CHECK: ret i8 0
 }
 
 define zeroext i8 @t4(float %x, float %y) nounwind {
@@ -31,4 +42,9 @@ define zeroext i8 @t4(float %x, float %y) nounwind {
        %c = and i1 %a, %b
        %retval = zext i1 %c to i8
        ret i8 %retval
+; CHECK: t4
+; CHECK: fcmp one float %y, %x
+; CHECK-NOT: fcmp one float %y, %x
+; CHECK-NOT: fcmp ord float %x, %y
+; CHECK-NOT: and
 }