diff --git a/tests/system/objects.map b/tests/system/objects.map
index d3f0a2897cb2454d238bb42f0a965910444a79e5..63d5b8d73127a9cd8aa2be80e57e85689323f0e4 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -114,7 +114,7 @@
 :Options_Core::Internal::SettingsDialog	{type='Core::Internal::SettingsDialog' unnamed='1' visible='1' windowTitle~='(Options|Preferences)'}
 :Options_QListView	{type='QListView' unnamed='1' visible='1' window=':Options_Core::Internal::SettingsDialog'}
 :QML Debugging.No_QPushButton	{text='No' type='QPushButton' unnamed='1' visible='1' window=':QML Debugging_QMessageBox'}
-:QML Debugging_QMessageBox	{type='QMessageBox' unnamed='1' visible='1' windowTitle='QML Debugging'}
+:QML Debugging_QMessageBox	{text='The option will only take effect if the project is recompiled. Do you want to recompile now?' type='QMessageBox' unnamed='1' visible='1'}
 :QWebPage	{type='QWebPage' unnamed='1'}
 :Qt Creator.Add Bookmark_QToolButton	{text='Add Bookmark' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.Analyzer Toolbar_QDockWidget	{name='Analyzer Toolbar' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Analyzer Toolbar'}
diff --git a/tests/system/suite_debugger/tst_debug_empty_main/test.py b/tests/system/suite_debugger/tst_debug_empty_main/test.py
index 6c8de770d70f5b5505d31d5154739964e7d01c00..a055bcd0a91f9b04d15ea3a26efdbde5457d3bac 100644
--- a/tests/system/suite_debugger/tst_debug_empty_main/test.py
+++ b/tests/system/suite_debugger/tst_debug_empty_main/test.py
@@ -91,6 +91,8 @@ def __handleAppOutputWaitForDebuggerFinish__():
                 "Verifying whether debugging has finished.")
 
 def performDebugging(workingDir, projectName, checkedTargets):
+    # for checking if it's a plain C application (as project names are set to match project type)
+    sampleC = re.compile("SampleC\d{3}")
     for kit, config in iterateBuildConfigs(len(checkedTargets), "Debug"):
         test.log("Selecting '%s' as build config" % config)
         selectBuildConfig(len(checkedTargets), kit, config)
@@ -111,7 +113,10 @@ def performDebugging(workingDir, projectName, checkedTargets):
         invokeMenuItem("Debug", "Toggle Breakpoint")
         clickButton(waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton"))
         handleDebuggerWarnings(config, isMsvc)
-        clickButton(waitForObject(":*Qt Creator.Continue_Core::Internal::FancyToolButton"))
+        # on Mac the breakpoint won't get hit if it's a C++ based application and the breakpoint is
+        # set to an empty code line inside an empty main
+        if platform.system() != "Darwin" or sampleC.match(projectName):
+            clickButton(waitForObject(":*Qt Creator.Continue_Core::Internal::FancyToolButton"))
         __handleAppOutputWaitForDebuggerFinish__()
         removeOldBreakpoints()
         deleteAppFromWinFW(workingDir, projectName, False)