diff --git a/lib/Transforms/InstCombine/InstCombineCompares.cpp b/lib/Transforms/InstCombine/InstCombineCompares.cpp
index d5164222321..be26d5e8124 100644
--- a/lib/Transforms/InstCombine/InstCombineCompares.cpp
+++ b/lib/Transforms/InstCombine/InstCombineCompares.cpp
@@ -5302,10 +5302,18 @@ static Instruction *foldFabsWithFcmpZero(FCmpInst &I) {
     // fabs(X) > 0.0 --> X != 0.0
     return new FCmpInst(FCmpInst::FCMP_ONE, X, I.getOperand(1));
 
+  case FCmpInst::FCMP_UGT:
+    // fabs(X) u> 0.0 --> X u!= 0.0
+    return new FCmpInst(FCmpInst::FCMP_UNE, X, I.getOperand(1));
+
   case FCmpInst::FCMP_OLE:
     // fabs(X) <= 0.0 --> X == 0.0
     return new FCmpInst(FCmpInst::FCMP_OEQ, X, I.getOperand(1));
 
+  case FCmpInst::FCMP_ULE:
+    // fabs(X) u<= 0.0 --> X u== 0.0
+    return new FCmpInst(FCmpInst::FCMP_UEQ, X, I.getOperand(1));
+
   case FCmpInst::FCMP_OGE:
     // fabs(X) >= 0.0 --> !isnan(X)
     assert(!I.hasNoNaNs() && "fcmp should have simplified");
diff --git a/test/Transforms/InstCombine/fcmp.ll b/test/Transforms/InstCombine/fcmp.ll
index de93cff5bec..5aea40f0918 100644
--- a/test/Transforms/InstCombine/fcmp.ll
+++ b/test/Transforms/InstCombine/fcmp.ll
@@ -199,8 +199,7 @@ define <2 x i1> @fabs_ole(<2 x float> %a) {
 
 define <2 x i1> @fabs_ule(<2 x float> %a) {
 ; CHECK-LABEL: @fabs_ule(
-; CHECK-NEXT:    [[CALL:%.*]] = call <2 x float> @llvm.fabs.v2f32(<2 x float> [[A:%.*]])
-; CHECK-NEXT:    [[CMP:%.*]] = fcmp ninf arcp ule <2 x float> [[CALL]], zeroinitializer
+; CHECK-NEXT:    [[CMP:%.*]] = fcmp ueq <2 x float> [[A:%.*]], zeroinitializer
 ; CHECK-NEXT:    ret <2 x i1> [[CMP]]
 ;
   %call = call <2 x float> @llvm.fabs.v2f32(<2 x float> %a)
@@ -220,8 +219,7 @@ define i1 @fabs_ogt(double %a) {
 
 define i1 @fabs_ugt(double %a) {
 ; CHECK-LABEL: @fabs_ugt(
-; CHECK-NEXT:    [[CALL:%.*]] = call double @llvm.fabs.f64(double [[A:%.*]])
-; CHECK-NEXT:    [[CMP:%.*]] = fcmp reassoc ninf ugt double [[CALL]], 0.000000e+00
+; CHECK-NEXT:    [[CMP:%.*]] = fcmp une double [[A:%.*]], 0.000000e+00
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %call = call double @llvm.fabs.f64(double %a)