diff --git a/llvm/test/Transforms/Attributor/nofpclass-minnum-maxnum.ll b/llvm/test/Transforms/Attributor/nofpclass-minnum-maxnum.ll
diff --git a/llvm/test/Transforms/Attributor/nofpclass.ll b/llvm/test/Transforms/Attributor/nofpclass.ll
diff --git a/llvm/unittests/Analysis/ValueTrackingTest.cpp b/llvm/unittests/Analysis/ValueTrackingTest.cpp
@@ -1539,9 +1539,9 @@ TEST_F(ComputeKnownFPClassTest, SIToFP) {
       "  %A3 = sitofp i17 %arg2 to half"
       "  ret float %A\n"
       "}\n");
-  expectKnownFPClass(fcFinite, std::nullopt, A);
-  expectKnownFPClass(fcFinite, std::nullopt, A2);
-  expectKnownFPClass(~fcNan, std::nullopt, A3);
+  expectKnownFPClass(fcFinite & ~fcNegZero, std::nullopt, A);
+  expectKnownFPClass(fcFinite & ~fcNegZero, std::nullopt, A2);
+  expectKnownFPClass(~(fcNan | fcNegZero), std::nullopt, A3);
 }
 
 TEST_F(ComputeKnownFPClassTest, FAdd) {