2 files changed, 10 insertions, 3 deletions
diff --git a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
index 7434dc4286..1642c71d93 100644
--- a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
@@ -12,7 +12,6 @@ list(APPEND test_data ${test_data_glob})
 
 qt_internal_add_test(tst_qqmldebugservice
     SOURCES
-        ../../../shared/util.cpp ../../../shared/util.h
         ../shared/debugutil.cpp ../shared/debugutil_p.h
         ../shared/qqmldebugprocess.cpp ../shared/qqmldebugprocess_p.h
         ../shared/qqmldebugtestservice.cpp ../shared/qqmldebugtestservice.h
@@ -20,7 +19,6 @@ qt_internal_add_test(tst_qqmldebugservice
     DEFINES
         QT_QML_DEBUG_NO_WARNING
     INCLUDE_DIRECTORIES
-        ../../../shared
         ../shared
     PUBLIC_LIBRARIES
         Qt::CorePrivate
@@ -28,6 +26,7 @@ qt_internal_add_test(tst_qqmldebugservice
         Qt::GuiPrivate
         Qt::QmlDebugPrivate
         Qt::QmlPrivate
+        Qt::QuickTestUtilsPrivate
     TESTDATA ${test_data}
 )
 
diff --git a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
index b90844bd10..d36ae80aa5 100644
--- a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
+++ b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
@@ -30,7 +30,7 @@
 #include "qqmldebugtestservice.h"
 #include "debugutil_p.h"
 #include "qqmldebugprocess_p.h"
-#include "../../../shared/util.h"
+#include <QtQuickTestUtils/private/qmlutils_p.h>
 
 #include <private/qqmldebugclient_p.h>
 #include <private/qqmldebugconnection_p.h>
@@ -51,6 +51,9 @@
 class tst_QQmlDebugService : public QQmlDataTest
 {
     Q_OBJECT
+public:
+    tst_QQmlDebugService();
+
 private:
     QQmlDebugConnection *m_conn;
     QQmlDebugTestService *m_service;
@@ -69,6 +72,11 @@ private slots:
     void checkSupportForOldDataStreamVersion();
 };
 
+tst_QQmlDebugService::tst_QQmlDebugService()
+    : QQmlDataTest(QT_QMLTEST_DATADIR)
+{
+}
+
 void tst_QQmlDebugService::initTestCase()
 {
     QQmlDataTest::initTestCase();