diff --git a/tests/auto/qml/codemodel/dependencies/samples/VisualItemModel.qml b/tests/auto/qml/codemodel/dependencies/samples/VisualItemModel.qml
index 45ff96380bb..a7f7180648e 100644
--- a/tests/auto/qml/codemodel/dependencies/samples/VisualItemModel.qml
+++ b/tests/auto/qml/codemodel/dependencies/samples/VisualItemModel.qml
@@ -23,10 +23,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick 2.4
+import QtQml.Models 2.2
 
 Rectangle {
-    VisualItemModel {
+    DelegateModel {
         id: itemModel
         Rectangle { height: 30; width: 80; color: "red" }
         Rectangle { height: 30; width: 80; color: "green" }
diff --git a/tests/auto/qml/codemodel/dependencies/samples/test_Tumbler.qml b/tests/auto/qml/codemodel/dependencies/samples/test_Tumbler.qml
index 6bcef4c464c..c4d824d89a4 100644
--- a/tests/auto/qml/codemodel/dependencies/samples/test_Tumbler.qml
+++ b/tests/auto/qml/codemodel/dependencies/samples/test_Tumbler.qml
@@ -24,7 +24,8 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Extras 1.4
+import QtQuick.Controls 2.3
+import QtQml.Models 2.2
 
 Rectangle {
     width: 220
@@ -53,18 +54,6 @@ Rectangle {
 
     Tumbler {
         anchors.centerIn: parent
-
-        TumblerColumn {
-            model: listModel
-            role: "foo"
-        }
-        TumblerColumn {
-            model: listModel
-            role: "bar"
-        }
-        TumblerColumn {
-            model: listModel
-            role: "baz"
-        }
+        model: listModel
     }
 }
diff --git a/tests/auto/qml/codemodel/dependencies/samples/test_Window.qml b/tests/auto/qml/codemodel/dependencies/samples/test_Window.qml
index 813161ef809..f48e093aa10 100644
--- a/tests/auto/qml/codemodel/dependencies/samples/test_Window.qml
+++ b/tests/auto/qml/codemodel/dependencies/samples/test_Window.qml
@@ -24,10 +24,10 @@
 ****************************************************************************/
 
 // ExpectedSemanticMessages: 0
-// ExpectedStaticMessages: 1
+// ExpectedStaticMessages: 0
 
 import QtQuick 2.4
-import QtQuick.Controls 1.3
+import QtQuick.Window 2.2
 
 Window {
     title: qsTr("Hello World")