diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index 01b0a1375f7..8959e3669dc 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -204,24 +204,24 @@ def substituteDefaultCompiler(settingsDir):
         test.log("Injected default compiler '%s' to qtversion.xml..." % compiler)
 
 def substituteCdb(settingsDir):
-    def canUse32bitCdb():
+    def canUse64bitCdb():
         try:
             serverIni = readFile(os.path.join(os.getenv("APPDATA"), "froglogic",
                                               "Squish", "ver1", "server.ini"))
             autLine = filter(lambda line: "AUT/qtcreator" in line, serverIni.splitlines())[0]
             autPath = autLine.split("\"")[1]
-            return os.path.exists(os.path.join(autPath, "..", "lib", "qtcreatorcdbext32"))
+            return os.path.exists(os.path.join(autPath, "..", "lib", "qtcreatorcdbext64"))
         except:
             test.fatal("Something went wrong when determining debugger bitness",
                        "Did Squish's file structure change? Guessing 32-bit cdb can be used...")
             return True
 
-    if canUse32bitCdb():
-        architecture = "x86"
-        bitness = "32"
-    else:
+    if canUse64bitCdb():
         architecture = "x64"
         bitness = "64"
+    else:
+        architecture = "x86"
+        bitness = "32"
     debuggers = os.path.join(settingsDir, "QtProject", 'qtcreator', 'debuggers.xml')
     __substitute__(debuggers, "SQUISH_DEBUGGER_ARCHITECTURE", architecture)
     __substitute__(debuggers, "SQUISH_DEBUGGER_BITNESS", bitness)
diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py
index 97f4420cf82..9468ac4f8a0 100644
--- a/tests/system/suite_debugger/tst_simple_debug/test.py
+++ b/tests/system/suite_debugger/tst_simple_debug/test.py
@@ -58,7 +58,7 @@ def main():
                 test.log("Selecting '%s' as build config" % config)
                 verifyBuildConfig(kit, config, True, True, True)
                 # explicitly build before start debugging for adding the executable as allowed program to WinFW
-                invokeMenuItem("Build", "Rebuild All Projects")
+                selectFromLocator("t rebuild", "Rebuild (Rebuild All Projects)")
                 waitForCompile(300000)
                 if not checkCompile():
                     test.fatal("Compile had errors... Skipping current build config")