2 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/quick/qquickaccessible/CMakeLists.txt b/tests/auto/quick/qquickaccessible/CMakeLists.txt
index 8d0fcbe406..bc037a64dd 100644
--- a/tests/auto/quick/qquickaccessible/CMakeLists.txt
+++ b/tests/auto/quick/qquickaccessible/CMakeLists.txt
@@ -12,10 +12,7 @@ list(APPEND test_data ${test_data_glob})
 
 qt_internal_add_test(tst_qquickaccessible
     SOURCES
-        ../../shared/util.cpp ../../shared/util.h
         tst_qquickaccessible.cpp
-    INCLUDE_DIRECTORIES
-        ../../shared
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
@@ -23,6 +20,7 @@ qt_internal_add_test(tst_qquickaccessible
         Qt::Network
         Qt::QmlPrivate
         Qt::QuickPrivate
+        Qt::QuickTestUtilsPrivate
     TESTDATA ${test_data}
 )
 
diff --git a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
index edaaed967a..136703d517 100644
--- a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
+++ b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
@@ -45,8 +45,8 @@
 #include <QtQuick/private/qquicklistview_p.h>
 #include <QtQuick/private/qquicktext_p.h>
 
-#include "../../shared/util.h"
-#include "../shared/visualtestutil.h"
+#include <QtQuickTestUtils/private/qmlutils_p.h>
+#include <QtQuickTestUtils/private/visualtestutils_p.h>
 
 #define EXPECT(cond) \
     do { \
@@ -84,6 +84,7 @@ private slots:
 };
 
 tst_QQuickAccessible::tst_QQuickAccessible()
+    : QQmlDataTest(QT_QMLTEST_DATADIR)
 {
 
 }
@@ -299,7 +300,7 @@ void tst_QQuickAccessible::quickAttachedProperties()
         QQuickListView *listview = qobject_cast<QQuickListView *>(object);
         QVERIFY(listview != nullptr);
         QQuickItem *contentItem = listview->contentItem();
-        QQuickText *childItem = QQuickVisualTestUtil::findItem<QQuickText>(contentItem, "acc_text");
+        QQuickText *childItem = QQuickVisualTestUtils::findItem<QQuickText>(contentItem, "acc_text");
         QVERIFY(childItem != nullptr);
 
         QObject *attachedObject = QQuickAccessibleAttached::attachedProperties(childItem);