diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index ca971c6842a5de335a8322f0d09fb720afb7c72b..7e6ba8eb0d24f1fc1d5191eb6e9cdf09cde8e334 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -31,7 +31,7 @@ def ensureChecked(objectName, shouldBeChecked = True):
     else:
         state = "unchecked"
     test.log("New state for QCheckBox: %s" % state)
-    test.verify(object.checked == shouldBeChecked)
+    test.verify(waitFor("object.checked == shouldBeChecked", 1000))
     return object
 
 # verify that an object is in an expected enable state. Returns the object.
diff --git a/tests/system/suite_general/tst_select_all/test.py b/tests/system/suite_general/tst_select_all/test.py
index be6ddf92abab0bec289fbd1668711a86474810ea..fda92a3ccfe2cd099fd15c5dea10889b7c1bd389 100644
--- a/tests/system/suite_general/tst_select_all/test.py
+++ b/tests/system/suite_general/tst_select_all/test.py
@@ -35,7 +35,7 @@ def main():
             test.compare(editor.textCursor().selectionStart(), 0)
             test.compare(editor.textCursor().selectionEnd(), size)
             test.compare(editor.textCursor().position(), size)
-            test.log("Pressing key %s" % key)
+            test.log("Pressing key: %s" % key.replace("<", "").replace(">", ""))
             type(editor, key)
             if key == "<Up>":
                 test.compare(editor.textCursor().selectionStart(), editor.textCursor().selectionEnd())
@@ -43,7 +43,7 @@ def main():
                 pos = size
                 if key == "<Left>":
                     pos -= 1
-                    if platform.system() != 'Darwin' and JIRA.isBugStillOpen(7215, JIRA.Bug.CREATOR):
+                    if JIRA.isBugStillOpen(7215, JIRA.Bug.CREATOR):
                         test.warning("Using workaround for %s-%d" % (JIRA.Bug.CREATOR, 7215))
                         pos = 0
                 test.compare(editor.textCursor().selectionStart(), pos)