diff --git a/tests/auto/controls/data/tableview/table_multicolumns.qml b/tests/auto/controls/data/tableview/table_multicolumns.qml
new file mode 100644
index 0000000000000000000000000000000000000000..bbfcab0ab39ba74df196fa4b381295c58b1f4657
--- /dev/null
+++ b/tests/auto/controls/data/tableview/table_multicolumns.qml
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Quick Controls module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.1
+import QtQuick.Controls 1.0
+
+TableView {
+    currentRow: 0
+
+    model:  ListModel {
+        ListElement { name: "Bob";  age: 20; hair: "black"}
+        ListElement { name: "Joe";  age: 30; hair: "brown"}
+        ListElement { name: "Ted";  age: 40; hair: "blond"}
+    } // qml
+    height: 70
+    TableViewColumn {
+        title: "Name"
+        role: "name"
+        width: 100
+    }
+    TableViewColumn {
+        title: "Age"
+        role: "age"
+        width: 100
+    }
+    TableViewColumn {
+        title: "Hair"
+        role: "hair"
+        width: 100
+    }
+}
diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml
index b03d58fe00f358a8c7dd744020eb40bc7344e084..65d7c72cd47ea081ff77ff325d392c6e8108b45b 100644
--- a/tests/auto/controls/data/tst_tableview.qml
+++ b/tests/auto/controls/data/tst_tableview.qml
@@ -180,6 +180,24 @@ TestCase {
         table.destroy()
     }
 
+    function test_columnCount() {
+        var component = Qt.createComponent("tableview/table_multicolumns.qml")
+        compare(component.status, Component.Ready)
+        var table =  component.createObject(container);
+        verify(table !== null, "table created is null")
+        compare(table.columnCount, 3)
+        table.destroy()
+    }
+
+    function test_rowCount() {
+        var component = Qt.createComponent("tableview/table_multicolumns.qml")
+        compare(component.status, Component.Ready)
+        var table =  component.createObject(container);
+        verify(table !== null, "table created is null")
+        compare(table.rowCount, 3)
+        table.destroy()
+    }
+
     // In TableView, drawn text = table.currentRowItem.children[1].children[1].itemAt(0).children[0].children[0].text
 
     function findAChild(item, name)