diff --git a/tests/system/shared/project_explorer.py b/tests/system/shared/project_explorer.py
index d479d63a7f88b60d7c22f0762307cb26203d383f..21350642ec5dbe4ba5f4ad4b047d1fffe80d0baa 100644
--- a/tests/system/shared/project_explorer.py
+++ b/tests/system/shared/project_explorer.py
@@ -7,8 +7,11 @@ def switchViewTo(view):
     tabBar = waitForObject("{type='Core::Internal::FancyTabBar' unnamed='1' visible='1' "
                            "window=':Qt Creator_Core::Internal::MainWindow'}")
     mouseMove(tabBar, 10, 10 + 52 * view)
-    snooze(2)
-    text = str(QToolTip.text())
+    if waitFor("QToolTip.isVisible()", 10000):
+        text = str(QToolTip.text())
+    else:
+        test.warning("Waiting for ToolTip timed out.")
+        text = ""
     pattern = ViewConstants.getToolTipForViewTab(view)
     if re.match(pattern, unicode(text), re.UNICODE):
        test.passes("ToolTip verified")