diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
index 90057e9bf8..47002515e9 100644
--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
@@ -3606,11 +3606,11 @@ void tst_qquicktext::fontSizeMode()
     // and text is NOT wrapped
     myText->setVAlign(QQuickText::AlignBottom);
     myText->setFontSizeMode(QQuickText::Fit);
-    QVERIFY(QQuickTest::qWaitForItemPolished(myText));
+    QVERIFY(QQuickTest::qWaitForPolish(myText));
 
     int baselineOffset = myText->baselineOffset();
     myText->setHeight(myText->height() * 2);
-    QVERIFY(QQuickTest::qWaitForItemPolished(myText));
+    QVERIFY(QQuickTest::qWaitForPolish(myText));
     QVERIFY(myText->baselineOffset() > baselineOffset);
 
     // Growing height needs to update the baselineOffset when AlignBottom is used
@@ -3619,11 +3619,11 @@ void tst_qquicktext::fontSizeMode()
     myText->setFontSizeMode(QQuickText::Fit);
     myText->setWrapMode(QQuickText::NoWrap);
     myText->resetMaximumLineCount();
-    QVERIFY(QQuickTest::qWaitForItemPolished(myText));
+    QVERIFY(QQuickTest::qWaitForPolish(myText));
 
     baselineOffset = myText->baselineOffset();
     myText->setHeight(myText->height() * 2);
-    QVERIFY(QQuickTest::qWaitForItemPolished(myText));
+    QVERIFY(QQuickTest::qWaitForPolish(myText));
     QVERIFY(myText->baselineOffset() > baselineOffset);
 
     // Check baselineOffset for the HorizontalFit case
diff --git a/tests/auto/quick/qquicktreeview/tst_qquicktreeview.cpp b/tests/auto/quick/qquicktreeview/tst_qquicktreeview.cpp
index 06c95888bd..379ab074a3 100644
--- a/tests/auto/quick/qquicktreeview/tst_qquicktreeview.cpp
+++ b/tests/auto/quick/qquicktreeview/tst_qquicktreeview.cpp
@@ -24,6 +24,8 @@
 using namespace QQuickViewTestUtils;
 using namespace QQuickVisualTestUtils;
 
+using namespace Qt::StringLiterals;
+
 #define LOAD_TREEVIEW(fileName) \
     view->setSource(testFileUrl(fileName)); \
     view->show(); \
@@ -1111,7 +1113,7 @@ void tst_qquicktreeview::sortTreeModelDynamic()
 
     // Now change the text in one of the items. This will trigger
     // a sort for only one of the parents in the model.
-    proxyModel.setData(treeView->modelIndex(0, row), u"xxx"_qs, Qt::DisplayRole);
+    proxyModel.setData(treeView->modelIndex(0, row), u"xxx"_s, Qt::DisplayRole);
 
     for (int row = 0; row < treeView->rows(); ++row) {
         const auto index = treeView->modelIndex(0, row);