diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp
index 1224a247091..deca70c3ea4 100644
--- a/src/corelib/json/qjsonvalue.cpp
+++ b/src/corelib/json/qjsonvalue.cpp
@@ -613,8 +613,10 @@ bool QJsonValue::operator==(const QJsonValue &other) const
     case Object:
         if (base == other.base)
             return true;
-        if (!base || !other.base)
-            return false;
+        if (!base)
+            return !other.base->length;
+        if (!other.base)
+            return !base->length;
         return QJsonObject(d, static_cast<QJsonPrivate::Object *>(base))
                 == QJsonObject(other.d, static_cast<QJsonPrivate::Object *>(other.base));
     }
diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp
index 7f5d438ac20..9a2fdecafc5 100644
--- a/tests/auto/corelib/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/json/tst_qtjson.cpp
@@ -2444,14 +2444,20 @@ void tst_QtJson::objectEquals()
     QFETCH(QJsonObject, right);
     QFETCH(bool, result);
 
-    QVERIFY((left == right) == result);
-    QVERIFY((right == left) == result);
+    QCOMPARE(left == right, result);
+    QCOMPARE(right == left, result);
 
     // invariants checks
     QCOMPARE(left, left);
     QCOMPARE(right, right);
-    QVERIFY((left != right) != result);
-    QVERIFY((right != left) != result);
+    QCOMPARE(left != right, !result);
+    QCOMPARE(right != left, !result);
+
+    // The same but from QJsonValue perspective
+    QCOMPARE(QJsonValue(left) == QJsonValue(right), result);
+    QCOMPARE(QJsonValue(left) != QJsonValue(right), !result);
+    QCOMPARE(QJsonValue(right) == QJsonValue(left), result);
+    QCOMPARE(QJsonValue(right) != QJsonValue(left), !result);
 }
 
 void tst_QtJson::bom()