diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 1efbd4e9d432a08d5cff3838489ba71c2f0d65ef..a49a45797188027162a610efd5a328099153e813 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -41,6 +41,11 @@
 import QtQuick 2.1
 import QtTest 1.0
 
+Item {
+    id: container
+    width: 300
+    height: 300
+
 TestCase {
     id: testCase
     name: "Tests_Button"
@@ -98,4 +103,17 @@ TestCase {
         tmp.testAction.trigger()
         compare(clickSpy.count, 1)
     }
+
+    function test_activeFocusOnPress(){
+        var control = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {x: 20; y: 20; width: 100; height: 50}', container, '')
+        control.activeFocusOnPress = false
+        verify(!control.activeFocus)
+        mouseClick(control, 30, 30)
+        verify(!control.activeFocus)
+        control.activeFocusOnPress = true
+        verify(!control.activeFocus)
+        mouseClick(control, 30, 30)
+        verify(control.activeFocus)
+    }
+}
 }
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index ae996d01ec4236f73ee61fe718417232b26cfbc9..ca12da3cf654243fde832d780778c099b4f5d8b4 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -219,5 +219,16 @@ Item {
             root.checkBox1.partiallyCheckedEnabled = false;
             root.checkBox2.partiallyCheckedEnabled = false;
         }
+
+        function test_activeFocusOnPress(){
+            checkBox.activeFocusOnPress = false
+            verify(!checkBox.activeFocus)
+            mouseClick(checkBox, checkBox.x + 1, checkBox.y + 1)
+            verify(!checkBox.activeFocus)
+            checkBox.activeFocusOnPress = true
+            verify(!checkBox.activeFocus)
+            mouseClick(checkBox, checkBox.x + 1, checkBox.y + 1)
+            verify(checkBox.activeFocus)
+        }
     }
 }
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index c2e6bffd2c751ae8e2c94a270602c4211730a4be..4b036d8de23c07b128eb747851ba5ad14e285521 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -171,5 +171,16 @@ Item {
             compare(root.radioButton1.checked, true);
             compare(root.radioButton2.checked, false);
         }
+
+        function test_activeFocusOnPress(){
+            radioButton.activeFocusOnPress = false
+            verify(!radioButton.activeFocus)
+            mouseClick(radioButton, radioButton.x + 1, radioButton.y + 1)
+            verify(!radioButton.activeFocus)
+            radioButton.activeFocusOnPress = true
+            verify(!radioButton.activeFocus)
+            mouseClick(radioButton, radioButton.x + 1, radioButton.y + 1)
+            verify(radioButton.activeFocus)
+        }
     }
 }
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index eb8ba5a6c8eb62b9863f4cbc411aba031cf63024..b6f60c55819e05632aa595dfb8de97b9ae8dc2da 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -138,5 +138,17 @@ Item {
             compare(slider.value, slider.maximumValue)
 
         }
+
+        function test_activeFocusOnPress(){
+            var control = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {x: 20; y: 20; width: 100; height: 50}', container, '')
+            control.activeFocusOnPress = false
+            verify(!control.activeFocus)
+            mouseClick(control, 30, 30)
+            verify(!control.activeFocus)
+            control.activeFocusOnPress = true
+            verify(!control.activeFocus)
+            mousePress(control, 30, 30)
+            verify(control.activeFocus)
+        }
     }
 }
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index 5994b451e1c3f0bae5c552fcf87123785009e8ee..53615c711ba3587f8788f85170afe86677fddb67 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -267,6 +267,18 @@ Item {
             compare(spinbox.value, -1000);
         }
 
+        function test_activeFocusOnPress(){
+            var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {x: 20; y: 20; width: 100; height: 50}', container, '')
+            spinbox.activeFocusOnPress = false
+            verify(!spinbox.activeFocus)
+            mouseClick(spinbox, 30, 30)
+            verify(!spinbox.activeFocus)
+            spinbox.activeFocusOnPress = true
+            verify(!spinbox.activeFocus)
+            mouseClick(spinbox, 30, 30)
+            verify(spinbox.activeFocus)
+        }
+
         function test_ImplicitSize() // Verify if we correctly grow and shrink depending on contents
         {
             var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml
index 27f68a1a2ee1827f691ab01a3b13826b0198feaf..945b8aa4881ce18eb946ae4b0b8f72b65dd1e97a 100644
--- a/tests/auto/controls/data/tst_textarea.qml
+++ b/tests/auto/controls/data/tst_textarea.qml
@@ -41,6 +41,11 @@
 import QtQuick 2.1
 import QtTest 1.0
 
+Item {
+    id: container
+    width: 300
+    height: 300
+
 TestCase {
     id: testCase
     name: "Tests_TextArea"
@@ -59,4 +64,17 @@ TestCase {
         textarea.append("name");
         compare(textarea.text, "my\nname")
     }
+
+    function test_activeFocusOnPress(){
+        var control = Qt.createQmlObject('import QtQuick.Controls 1.0; TextArea {x: 20; y: 20; width: 100; height: 50}', container, '')
+        control.activeFocusOnPress = false
+        verify(!control.activeFocus)
+        mouseClick(control, 30, 30)
+        verify(!control.activeFocus)
+        control.activeFocusOnPress = true
+        verify(!control.activeFocus)
+        mouseClick(control, 30, 30)
+        verify(control.activeFocus)
+    }
+}
 }
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index e9bd45410b308e977a8fe6c013604dd03f5bf48d..ed2d5401ad7bb291e46ce2d43da0d2dc939f0eec 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -41,6 +41,10 @@
 import QtQuick 2.1
 import QtTest 1.0
 
+Item {
+    id: container
+    width: 300; height: 300
+
 TestCase {
     id: testCase
     name: "Tests_TextField"
@@ -243,4 +247,17 @@ TestCase {
         textfield.redo()
         compare(textfield.text, "this is not my text")
     }
+
+    function test_activeFocusOnPress(){
+        var control = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {x: 20; y: 20; width: 100; height: 50}', container, '')
+        control.activeFocusOnPress = false
+        verify(!control.activeFocus)
+        mouseClick(control, 30, 30)
+        verify(!control.activeFocus)
+        control.activeFocusOnPress = true
+        verify(!control.activeFocus)
+        mouseClick(control, 30, 30)
+        verify(control.activeFocus)
+    }
+}
 }
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index e488d03b3de8a3303685e2bf2a06b5712303d10d..8400b552f9e655447eec413a75c3d40eade281c8 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -41,6 +41,11 @@
 import QtQuick 2.1
 import QtTest 1.0
 
+Item {
+    id: container
+    width: 300
+    height: 300
+
 TestCase {
     id: testCase
     name: "Tests_ToolButton"
@@ -51,5 +56,18 @@ TestCase {
     function test_createToolButton() {
         var toolButton = Qt.createQmlObject('import QtQuick.Controls 1.0; ToolButton {}', testCase, '');
     }
+
+    function test_activeFocusOnPress(){
+        var control = Qt.createQmlObject('import QtQuick.Controls 1.0; ToolButton {x: 20; y: 20; width: 100; height: 50}', container, '')
+        control.activeFocusOnPress = false
+        verify(!control.activeFocus)
+        mouseClick(control, 30, 30)
+        verify(!control.activeFocus)
+        control.activeFocusOnPress = true
+        verify(!control.activeFocus)
+        mouseClick(control, 30, 30)
+        verify(control.activeFocus)
+    }
+}
 }