diff --git a/src/corelib/global/qfloat16_p.h b/src/corelib/global/qfloat16_p.h
index ae52e64435..f3fc96e119 100644
--- a/src/corelib/global/qfloat16_p.h
+++ b/src/corelib/global/qfloat16_p.h
@@ -61,9 +61,9 @@ static inline bool qt_is_inf(qfloat16 d) Q_DECL_NOTHROW
     bool is_inf;
     uchar *ch = (uchar *)&d;
     if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
-        is_inf = (ch[0] & 0x7c) == 0x7c;
+        is_inf = (ch[0] & 0x7c) == 0x7c && (ch[0] & 0x02) == 0;
     else
-        is_inf = (ch[1] & 0x7c) == 0x7c;
+        is_inf = (ch[1] & 0x7c) == 0x7c && (ch[1] & 0x02) == 0;
     return is_inf;
 }
 
diff --git a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
index 9bd87e3f21..6b98e3a823 100644
--- a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
+++ b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
@@ -158,12 +158,14 @@ void tst_qfloat16::qNan()
     qfloat16 nan = qQNaN();
     QVERIFY(!(0. > nan));
     QVERIFY(!(0. < nan));
+    QVERIFY(!qIsInf(nan));
     QVERIFY(qIsNaN(nan));
     QVERIFY(qIsNaN(nan + 1.f));
     QVERIFY(qIsNaN(-nan));
     qfloat16 inf = qInf();
     QVERIFY(inf > qfloat16(0));
     QVERIFY(-inf < qfloat16(0));
+    QVERIFY(!qIsNaN(inf));
     QVERIFY(qIsInf(inf));
     QVERIFY(qIsInf(-inf));
     QVERIFY(qIsInf(2.f*inf));