diff --git a/tests/auto/algorithm/tst_algorithm.cpp b/tests/auto/algorithm/tst_algorithm.cpp
index 706b6dd91eb..14d30f75473 100644
--- a/tests/auto/algorithm/tst_algorithm.cpp
+++ b/tests/auto/algorithm/tst_algorithm.cpp
@@ -555,23 +555,23 @@ void tst_Algorithm::take()
     {
         QList<Struct> v {1, 3, 5, 6, 7, 8, 9, 11, 13, 15, 13, 16, 17};
         Utils::optional<Struct> r1 = Utils::take(v, [](const Struct &s) { return s.member == 13; });
-        QVERIFY(r1);
-        QCOMPARE(r1.value(), 13);
+        QVERIFY(static_cast<bool>(r1));
+        QCOMPARE(r1.value().member, 13);
         Utils::optional<Struct> r2 = Utils::take(v, [](const Struct &s) { return s.member == 13; });
-        QVERIFY(r2);
-        QCOMPARE(r2.value(), 13);
+        QVERIFY(static_cast<bool>(r2));
+        QCOMPARE(r2.value().member, 13);
         Utils::optional<Struct> r3 = Utils::take(v, [](const Struct &s) { return s.member == 13; });
-        QVERIFY(!r3);
+        QVERIFY(!static_cast<bool>(r3));
 
         Utils::optional<Struct> r4 = Utils::take(v, &Struct::isEven);
-        QVERIFY(r4);
-        QCOMPARE(r4.value(), 6);
+        QVERIFY(static_cast<bool>(r4));
+        QCOMPARE(r4.value().member, 6);
     }
     {
         QList<Struct> v {0, 0, 0, 0, 0, 0, 1, 2, 3};
         Utils::optional<Struct> r1 = Utils::take(v, &Struct::member);
-        QVERIFY(r1);
-        QCOMPARE(r1.value(), 1);
+        QVERIFY(static_cast<bool>(r1));
+        QCOMPARE(r1.value().member, 1);
     }
 }
 
diff --git a/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp b/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp
index 1e6404eb630..807d5986550 100644
--- a/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp
+++ b/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp
@@ -285,23 +285,23 @@ void tst_PointerAlgorithm::take()
     {
         QList<Struct> v {1, 3, 5, 6, 7, 8, 9, 11, 13, 15, 13, 16, 17};
         Utils::optional<Struct> r1 = Utils::take(v, [](const Struct &s) { return s.member == 13; });
-        QVERIFY(r1);
-        QCOMPARE(r1.value(), 13);
+        QVERIFY(static_cast<bool>(r1));
+        QCOMPARE(r1.value().member, 13);
         Utils::optional<Struct> r2 = Utils::take(v, [](const Struct &s) { return s.member == 13; });
-        QVERIFY(r2);
-        QCOMPARE(r2.value(), 13);
+        QVERIFY(static_cast<bool>(r2));
+        QCOMPARE(r2.value().member, 13);
         Utils::optional<Struct> r3 = Utils::take(v, [](const Struct &s) { return s.member == 13; });
-        QVERIFY(!r3);
+        QVERIFY(!static_cast<bool>(r3));
 
         Utils::optional<Struct> r4 = Utils::take(v, &Struct::isEven);
-        QVERIFY(r4);
-        QCOMPARE(r4.value(), 6);
+        QVERIFY(static_cast<bool>(r4));
+        QCOMPARE(r4.value().member, 6);
     }
     {
         QList<Struct> v {0, 0, 0, 0, 0, 0, 1, 2, 3};
         Utils::optional<Struct> r1 = Utils::take(v, &Struct::member);
-        QVERIFY(r1);
-        QCOMPARE(r1.value(), 1);
+        QVERIFY(static_cast<bool>(r1));
+        QCOMPARE(r1.value().member, 1);
     }
 }