diff --git a/tests/auto/corelib/platform/androiditemmodel/testdata/src/org/qtproject/qt/android/tests/TestQtAbstractItemModel.java b/tests/auto/corelib/platform/androiditemmodel/testdata/src/org/qtproject/qt/android/tests/TestQtAbstractItemModel.java
index 5ac40ee657f..383e96c3176 100644
--- a/tests/auto/corelib/platform/androiditemmodel/testdata/src/org/qtproject/qt/android/tests/TestQtAbstractItemModel.java
+++ b/tests/auto/corelib/platform/androiditemmodel/testdata/src/org/qtproject/qt/android/tests/TestQtAbstractItemModel.java
@@ -13,6 +13,13 @@ import org.qtproject.qt.android.QtModelIndex;
 public class TestQtAbstractItemModel
         extends QtAbstractItemModel implements QtAbstractItemModel.OnDataChangedListener
 {
+    static final int QT_USER_ROLE = 0x100;
+    static final int ROLE_STRING = QT_USER_ROLE;
+    static final int ROLE_BOOLEAN = QT_USER_ROLE + 1;
+    static final int ROLE_INTEGER = QT_USER_ROLE + 2;
+    static final int ROLE_DOUBLE = QT_USER_ROLE + 3;
+    static final int ROLE_LONG = QT_USER_ROLE + 4;
+
     int m_rows = 0;
     int m_cols = 0;
     int m_dataChangedCount = 0;
@@ -37,15 +44,15 @@ public class TestQtAbstractItemModel
             return null;
 
         switch (role) {
-        case 0:
+        case ROLE_STRING:
             return String.format("r%d/c%d", r, c);
-        case 1:
+        case ROLE_BOOLEAN:
             return new Boolean(((r + c) % 2) == 0);
-        case 2:
+        case ROLE_INTEGER:
             return new Integer((c << 8) + r);
-        case 3:
+        case ROLE_DOUBLE:
             return new Double((r + 1.0) / (c + 1.0));
-        case 4:
+        case ROLE_LONG:
             return new Long((c << 8) * (r << 8));
         default:
             return null;
@@ -74,11 +81,11 @@ public class TestQtAbstractItemModel
     public HashMap<Integer, String> roleNames()
     {
         final HashMap<Integer, String> roles = new HashMap<Integer, String>();
-        roles.put(0, "stringRole");
-        roles.put(1, "booleanRole");
-        roles.put(2, "integerRole");
-        roles.put(3, "doubleRole");
-        roles.put(4, "longRole");
+        roles.put(ROLE_STRING, "stringRole");
+        roles.put(ROLE_BOOLEAN, "booleanRole");
+        roles.put(ROLE_INTEGER, "integerRole");
+        roles.put(ROLE_DOUBLE, "doubleRole");
+        roles.put(ROLE_LONG, "longRole");
         return roles;
     }
 
diff --git a/tests/auto/corelib/platform/androiditemmodel/testdata/src/org/qtproject/qt/android/tests/TestQtAbstractListModel.java b/tests/auto/corelib/platform/androiditemmodel/testdata/src/org/qtproject/qt/android/tests/TestQtAbstractListModel.java
index cdefdba5a83..f6e9892b09d 100644
--- a/tests/auto/corelib/platform/androiditemmodel/testdata/src/org/qtproject/qt/android/tests/TestQtAbstractListModel.java
+++ b/tests/auto/corelib/platform/androiditemmodel/testdata/src/org/qtproject/qt/android/tests/TestQtAbstractListModel.java
@@ -13,6 +13,13 @@ import org.qtproject.qt.android.QtModelIndex;
 public class TestQtAbstractListModel
         extends QtAbstractListModel implements QtAbstractListModel.OnDataChangedListener
 {
+    static final int QT_USER_ROLE = 0x100;
+    static final int ROLE_STRING = QT_USER_ROLE;
+    static final int ROLE_BOOLEAN = QT_USER_ROLE + 1;
+    static final int ROLE_INTEGER = QT_USER_ROLE + 2;
+    static final int ROLE_DOUBLE = QT_USER_ROLE + 3;
+    static final int ROLE_LONG = QT_USER_ROLE + 4;
+
     int m_rows = 0;
     int m_dataChangedCount = 0;
 
@@ -29,15 +36,15 @@ public class TestQtAbstractListModel
             return null;
 
         switch (role) {
-        case 0:
+        case ROLE_STRING:
             return String.format("r%d/c%d", r, c);
-        case 1:
+        case ROLE_BOOLEAN:
             return new Boolean(((r + c) % 2) == 0);
-        case 2:
+        case ROLE_INTEGER:
             return new Integer((c << 8) + r);
-        case 3:
+        case ROLE_DOUBLE:
             return new Double((r + 1.0) / (c + 1.0));
-        case 4:
+        case ROLE_LONG:
             return new Long((c << 8) * (r << 8));
         default:
             return null;
@@ -49,11 +56,11 @@ public class TestQtAbstractListModel
     @Override public HashMap<Integer, String> roleNames()
     {
         final HashMap<Integer, String> roles = new HashMap<Integer, String>();
-        roles.put(0, "stringRole");
-        roles.put(1, "booleanRole");
-        roles.put(2, "integerRole");
-        roles.put(3, "doubleRole");
-        roles.put(4, "longRole");
+        roles.put(ROLE_STRING, "stringRole");
+        roles.put(ROLE_BOOLEAN, "booleanRole");
+        roles.put(ROLE_INTEGER, "integerRole");
+        roles.put(ROLE_DOUBLE, "doubleRole");
+        roles.put(ROLE_LONG, "longRole");
         return roles;
     }
 
diff --git a/tests/auto/corelib/platform/androiditemmodel/tst_androiditemmodel.cpp b/tests/auto/corelib/platform/androiditemmodel/tst_androiditemmodel.cpp
index baa808a9046..7320530e92f 100644
--- a/tests/auto/corelib/platform/androiditemmodel/tst_androiditemmodel.cpp
+++ b/tests/auto/corelib/platform/androiditemmodel/tst_androiditemmodel.cpp
@@ -28,6 +28,14 @@ class tst_AndroidItemModel : public QObject
     QAbstractItemModel *qProxy;
     void resetModel();
 
+    enum DataRole{
+        ROLE_STRING = Qt::UserRole,
+        ROLE_BOOLEAN,
+        ROLE_INTEGER,
+        ROLE_DOUBLE,
+        ROLE_LONG
+    };
+
 private slots:
     void initTestCase_data();
     void init();
@@ -115,11 +123,11 @@ void tst_AndroidItemModel::removeColumn()
 
 void tst_AndroidItemModel::roleNames()
 {
-    const static QHash<int, QByteArray> expectedRoles = { { 0, "stringRole" },
-                                                          { 1, "booleanRole" },
-                                                          { 2, "integerRole" },
-                                                          { 3, "doubleRole" },
-                                                          { 4, "longRole" } };
+    const static QHash<int, QByteArray> expectedRoles = { { ROLE_STRING, "stringRole" },
+                                                          { ROLE_BOOLEAN, "booleanRole" },
+                                                          { ROLE_INTEGER, "integerRole" },
+                                                          { ROLE_DOUBLE, "doubleRole" },
+                                                          { ROLE_LONG, "longRole" } };
     QCOMPARE(qProxy->roleNames(), expectedRoles);
 }
 
@@ -161,11 +169,11 @@ void tst_AndroidItemModel::hasIndex()
 
 void tst_AndroidItemModel::data()
 {
-    const static QHash<int, QMetaType::Type> roleToType = { { 0, QMetaType::QString },
-                                                            { 1, QMetaType::Bool },
-                                                            { 2, QMetaType::Int },
-                                                            { 3, QMetaType::Double },
-                                                            { 4, QMetaType::Long } };
+    const static QHash<int, QMetaType::Type> roleToType = { { ROLE_STRING, QMetaType::QString },
+                                                            { ROLE_BOOLEAN, QMetaType::Bool },
+                                                            { ROLE_INTEGER, QMetaType::Int },
+                                                            { ROLE_DOUBLE, QMetaType::Double },
+                                                            { ROLE_LONG, QMetaType::Long } };
     QFETCH_GLOBAL(int, columnCount);
     QFETCH_GLOBAL(bool, isList);
 
@@ -185,20 +193,20 @@ void tst_AndroidItemModel::data()
                 const QVariant data = qProxy->data(index, role);
                 QCOMPARE_EQ(data.typeId(), roleToType[role]);
                 switch (role) {
-                case 0:
+                case ROLE_STRING:
                     QCOMPARE(data.toString(),
                              "r%1/c%2"_L1.arg(QString::number(r), QString::number(c)));
                     break;
-                case 1:
+                case ROLE_BOOLEAN:
                     QCOMPARE(data.toBool(), ((r + c) % 2) == 0);
                     break;
-                case 2:
+                case ROLE_INTEGER:
                     QCOMPARE(data.toInt(), (c << 8) + r);
                     break;
-                case 3:
+                case ROLE_DOUBLE:
                     QVERIFY(qFuzzyCompare(data.toDouble(), (1.0 + r) / (1.0 + c)));
                     break;
-                case 4:
+                case ROLE_LONG:
                     QCOMPARE(data.toULongLong(), ((c << 8) * (r << 8)));
                     break;
                 }
@@ -213,9 +221,9 @@ void tst_AndroidItemModel::setData_data()
     QTest::addColumn<int>("column");
     QTest::addColumn<int>("role");
 
-    QTest::newRow("role0") << 0 << 0 << 0;
-    QTest::newRow("role1") << 0 << 0 << 1;
-    QTest::newRow("role2") << 0 << 0 << 2;
+    QTest::newRow("role0") << 0 << 0 << int(ROLE_STRING);
+    QTest::newRow("role1") << 0 << 0 << int(ROLE_BOOLEAN);
+    QTest::newRow("role2") << 0 << 0 << int(ROLE_INTEGER);
 }
 
 void tst_AndroidItemModel::setData()