2 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro b/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro
index 9908f220d2..95cf68f459 100644
--- a/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro
+++ b/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro
@@ -3,9 +3,8 @@ TARGET = tst_qquickspritegoal
 SOURCES += tst_qquickspritegoal.cpp
 macx:CONFIG -= app_bundle
 
-testDataFiles.files = data
-testDataFiles.path = .
-DEPLOYMENT += testDataFiles
+include (../../shared/util.pri)
+TESTDATA = data/*
 
 QT += core-private gui-private v8-private qml-private opengl-private testlib
 
diff --git a/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp b/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp
index f4991470c9..704651ab17 100644
--- a/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp
+++ b/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp
@@ -44,24 +44,28 @@
 #include <private/qquickparticlesystem_p.h>
 #include <private/qabstractanimation_p.h>
 
-class tst_qquickspritegoal : public QObject
+#include "../../shared/util.h"
+
+class tst_qquickspritegoal : public QQmlDataTest
 {
     Q_OBJECT
 public:
-    tst_qquickspritegoal();
+    tst_qquickspritegoal() {}
 
 private slots:
+    void initTestCase();
     void test_instantTransition();
 };
 
-tst_qquickspritegoal::tst_qquickspritegoal()
+void tst_qquickspritegoal::initTestCase()
 {
+    QQmlDataTest::initTestCase();
     QUnifiedTimer::instance()->setConsistentTiming(true);
 }
 
 void tst_qquickspritegoal::test_instantTransition()
 {
-    QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml", 600);
+    QQuickView* view = createView(testFileUrl("basic.qml"), 600);
     QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
     ensureAnimTime(600, system->m_animation);