2 files changed, 7 insertions, 10 deletions
diff --git a/tests/auto/quick/qquicklistview/data/header.qml b/tests/auto/quick/qquicklistview/data/header.qml
index bf70310630..1cc4ae09ee 100644
--- a/tests/auto/quick/qquicklistview/data/header.qml
+++ b/tests/auto/quick/qquicklistview/data/header.qml
@@ -15,7 +15,7 @@ Rectangle {
             height: 30
             width: 240
             Text {
-                text: index + " " + x + "," + y
+                text: index + " " + parent.x + "," + parent.y
             }
             color: ListView.isCurrentItem ? "lightsteelblue" : "white"
         }
diff --git a/tests/auto/quick/qquicklistview/data/headerfooter.qml b/tests/auto/quick/qquicklistview/data/headerfooter.qml
index 4c3eeca328..07a331a4b7 100644
--- a/tests/auto/quick/qquicklistview/data/headerfooter.qml
+++ b/tests/auto/quick/qquicklistview/data/headerfooter.qml
@@ -2,27 +2,24 @@ import QtQuick 2.0
 
 ListView {
     id: view
-    property bool horizontal: false
-    property bool rtl: false
+
     width: 240
     height: 320
 
     model: testModel
-    
-    orientation: horizontal ? ListView.Horizontal : ListView.Vertical
+
     header: Rectangle {
         objectName: "header"
-        width: horizontal ? 20 : view.width
-        height: horizontal ? view.height : 20
+        width: orientation == ListView.Horizontal ? 20 : view.width
+        height: orientation == ListView.Horizontal ? view.height : 20
         color: "red"
     }
     footer: Rectangle {
         objectName: "footer"
-        width: horizontal ? 30 : view.width
-        height: horizontal ? view.height : 30
+        width: orientation == ListView.Horizontal ? 30 : view.width
+        height: orientation == ListView.Horizontal ? view.height : 30
         color: "blue"
     }
 
     delegate: Text { width: 30; height: 30; text: index + "(" + x + ")" }
-    layoutDirection: rtl ? Qt.RightToLeft : Qt.LeftToRight
 }