diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
new file mode 100644
index 0000000000000000000000000000000000000000..e51392c4b256e6fc68dc93ffa568ce3735000b27
--- /dev/null
+++ b/tests/auto/auto.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += qtdesktop
diff --git a/tests/auto/qtdesktop/data/tst_button.qml b/tests/auto/qtdesktop/data/tst_button.qml
new file mode 100644
index 0000000000000000000000000000000000000000..94e627a960d3370686ed26049fc21fac7e07f263
--- /dev/null
+++ b/tests/auto/qtdesktop/data/tst_button.qml
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Components project.
+**
+** $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.0
+import QtTest 1.0
+
+TestCase {
+ id: testCase
+ name: "Tests_Button"
+ when:windowShown
+ width:400
+ height:400
+
+ function cleanupTestCase() {
+ wait(100) //wait for a short while to make sure no leaked textures
+ }
+
+ function test_defaultbutton() {
+ var tmp = Qt.createQmlObject('import QtDesktop 1.0; Button {id: button1}', testCase, '');
+ compare(tmp.defaultbutton, false);
+ }
+
+ function test_text() {
+ var tmp1 = Qt.createQmlObject('import QtDesktop 1.0; Button {id: button2_1}', testCase, '');
+ compare(tmp1.text, "");
+ tmp1.text = "Hello";
+ compare(tmp1.text, "Hello");
+
+ var tmp2 = Qt.createQmlObject('import QtDesktop 1.0; Button {id: button2_2; text: "Hello"}', testCase, '');
+ compare(tmp2.text, "Hello");
+ }
+}
diff --git a/tests/auto/qtdesktop/qtdesktop.pro b/tests/auto/qtdesktop/qtdesktop.pro
new file mode 100644
index 0000000000000000000000000000000000000000..9ebd6e91c4fa9524504b54e1c2b18b58ca15cb76
--- /dev/null
+++ b/tests/auto/qtdesktop/qtdesktop.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+TARGET = tst_qtdesktop
+
+QT += widgets
+
+CONFIG += qmltestcase
+
+INCLUDEPATH += $$PWD/../../shared
+SOURCES += tst_qtdesktop.cpp
+
+TESTDATA = data/*
+
+OTHER_FILES += \
+ data/tst_button.qml
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qtdesktop/tst_qtdesktop.cpp b/tests/auto/qtdesktop/tst_qtdesktop.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a1c9da35949c3a8a4b27c382b198e7b4f8cfad0d
--- /dev/null
+++ b/tests/auto/qtdesktop/tst_qtdesktop.cpp
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtQuickTest/quicktest.h>
+#include "qtdc_quicktest.h"
+QTDC_QUICK_TEST_MAIN(qtdesktop)
diff --git a/tests/shared/qtdc_quicktest.h b/tests/shared/qtdc_quicktest.h
new file mode 100644
index 0000000000000000000000000000000000000000..71f710db3f3d00f2160fcccf522e11e4da891642
--- /dev/null
+++ b/tests/shared/qtdc_quicktest.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTDC_QUICKTEST_H
+#define QTDC_QUICKTEST_H
+
+#include <QtQuickTest/quicktestglobal.h>
+#include <QtWidgets/QApplication>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+#ifdef QUICK_TEST_SOURCE_DIR
+#define QTDC_QUICK_TEST_MAIN_VAR QUICK_TEST_SOURCE_DIR
+#else
+#define QTDC_QUICK_TEST_MAIN_VAR 0
+#endif
+
+#define QTDC_QUICK_TEST_MAIN(name) \
+ int main(int argc, char **argv) \
+ { \
+ QCoreApplication* app = 0; \
+ if (!QCoreApplication::instance()) \
+ app = new QApplication(argc, argv); \
+ int i = quick_test_main(argc, argv, #name, QTDC_QUICK_TEST_MAIN_VAR); \
+ delete app; \
+ return i; \
+ }
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif
diff --git a/tests/tests.pro b/tests/tests.pro
new file mode 100644
index 0000000000000000000000000000000000000000..85e4f3a53daada4148da2e36b80b9d03be0607aa
--- /dev/null
+++ b/tests/tests.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += auto