2 files changed, 10 insertions, 23 deletions
diff --git a/tests/auto/declarative_location_core/tst_user.qml b/tests/auto/declarative_location_core/tst_user.qml
index abfad1b4..6ca12f7b 100644
--- a/tests/auto/declarative_location_core/tst_user.qml
+++ b/tests/auto/declarative_location_core/tst_user.qml
@@ -28,23 +28,21 @@
 
 import QtTest
 import QtLocation
-import "utils.js" as Utils
 
 TestCase {
     id: testCase
 
     name: "User"
 
-    User { id: emptyUser }
+    property user emptyUser
 
     function test_empty() {
         compare(emptyUser.userId, "");
         compare(emptyUser.name, "");
     }
 
-    User {
-        id: qmlUser
-
+    property user qmlUser
+    qmlUser {
         userId: "testuser"
         name: "Test User"
     }
@@ -53,19 +51,4 @@ TestCase {
         compare(qmlUser.userId, "testuser");
         compare(qmlUser.name, "Test User");
     }
-
-    User {
-        id: testUser
-    }
-
-    function test_setAndGet_data() {
-        return [
-            { tag: "userId", property: "userId", signal: "userIdChanged", value: "testuser", reset: "" },
-            { tag: "name", property: "name", signal: "nameChanged", value: "Test User", reset: "" },
-        ];
-    }
-
-    function test_setAndGet(data) {
-        Utils.testObjectProperties(testCase, testUser, data);
-    }
 }
diff --git a/tests/auto/qmlinterface/data/TestUser.qml b/tests/auto/qmlinterface/data/TestUser.qml
index a02f4f1f..137d87ed 100644
--- a/tests/auto/qmlinterface/data/TestUser.qml
+++ b/tests/auto/qmlinterface/data/TestUser.qml
@@ -26,9 +26,13 @@
 **
 ****************************************************************************/
 
+import QtQuick
 import QtLocation
 
-User {
-    name: "Test User"
-    userId: "test-user-id"
+Item {
+    property user user
+    user {
+        name: "Test User"
+        userId: "test-user-id"
+    }
 }