diff --git a/tests/system/settings/unix/QtProject/qtcreator/toolchains.xml b/tests/system/settings/unix/QtProject/qtcreator/toolchains.xml
index a2525c73ac07224f2b6c4965bf85fadf1184619c..5c9c9b48c8f900825498905776a52e1da8a4a405 100644
--- a/tests/system/settings/unix/QtProject/qtcreator/toolchains.xml
+++ b/tests/system/settings/unix/QtProject/qtcreator/toolchains.xml
@@ -9,6 +9,7 @@
    <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
     <value type="QString">x86-linux-generic-elf-64bit</value>
     <value type="QString">x86-linux-generic-elf-32bit</value>
+    <value type="QString">x86-macos-generic-mach_o-64bit</value>
    </valuelist>
    <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value>
    <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index d1c5a61eb924c7209b83cf01b87f06ef106a9a88..41bbbde0b1593e462924d3d17830136b7de159d6 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -147,6 +147,10 @@ def substituteDefaultCompiler(settingsDir):
         test.log("Injected default compiler '%s' to qtversion.xml..." % compiler)
 
 def __guessABI__(supportedABIs, use64Bit):
+    if platform.system() == 'Linux':
+        supportedABIs = filter(lambda x: 'linux' in x, supportedABIs)
+    elif platform.system() == 'Darwin':
+        supportedABIs = filter(lambda x: 'macos' in x, supportedABIs)
     if use64Bit:
         searchFor = "64bit"
     else:
@@ -162,8 +166,6 @@ def __guessABI__(supportedABIs, use64Bit):
     return ''
 
 def __is64BitOS__():
-    if platform.system() == 'Darwin':
-        return sys.maxsize > (2 ** 32)
     if platform.system() in ('Microsoft', 'Windows'):
         machine = os.getenv("PROCESSOR_ARCHITEW6432", os.getenv("PROCESSOR_ARCHITECTURE"))
     else: