@@ -218,7 +218,7 @@ Item {
218218 var launcher = findChild(shell, "launcher")
219219 var stage = findChild(shell, "stage")
220220
221− mouseClick(emergencyButton, units.gu(1), units.gu(1))
221+ tap(emergencyButton)
222222
223223 tryCompare(greeter, "lockedApp", "dialer-app")
224224 tryCompare(greeter, "hasLockedApp", true)
@@ -245,7 +245,7 @@ Item {
245245 function test_emergencyCallCrash() {
246246 var lockscreen = findChild(shell, "lockscreen")
247247 var emergencyButton = findChild(lockscreen, "emergencyCallLabel")
248− mouseClick(emergencyButton, units.gu(1), units.gu(1))
248+ tap(emergencyButton)
249249
250250 tryCompare(lockscreen, "shown", false)
251251 killApps() // kill dialer-app, as if it crashed
@@ -255,7 +255,7 @@ Item {
255255 function test_emergencyCallAppLaunch() {
256256 var lockscreen = findChild(shell, "lockscreen")
257257 var emergencyButton = findChild(lockscreen, "emergencyCallLabel")
258− mouseClick(emergencyButton, units.gu(1), units.gu(1))
258+ tap(emergencyButton)
259259
260260 tryCompare(lockscreen, "shown", false)
261261 ApplicationManager.startApplication("gallery-app", ApplicationManager.NoFlag)
@@ -300,7 +300,7 @@ Item {
300300
301301 var dialog = findChild(root, "infoPopup")
302302 var button = findChild(dialog, "infoPopupOkButton")
303− mouseClick(button, button.width / 2, button.height / 2)
303+ tap(button)
304304 tryCompareFunction(function() {return findChild(root, "infoPopup")}, null)
305305
306306 tryCompare(resetSpy, "count", 0)