diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index ccd15ef8a0021819e58fc29fca273f21e611420d..9232ac17703ce33de31ad0e7c3c58fc772a3b1f0 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1636,7 +1636,7 @@ void GdbEngine::handleStop1(const GdbMi &data)
             if (name == stopSignal(sp.toolChainAbi)) {
                 showMessage(_(name + " CONSIDERED HARMLESS. CONTINUING."));
             } else {
-                showMessage(_("HANDLING SIGNAL" + name));
+                showMessage(_("HANDLING SIGNAL " + name));
                 if (debuggerCore()->boolSetting(UseMessageBoxForSignals)
                         && !isStopperThread)
                     showStoppedBySignalMessageBox(_(meaning), _(name));
@@ -2278,20 +2278,16 @@ void GdbEngine::handleExecuteReturn(const GdbResponse &response)
 
 void GdbEngine::setTokenBarrier()
 {
-    if (m_nonDiscardableCount > 0) {
-        showMessage(_("--- CANNOT SET TOKEN BARRIER: "), LogMiscInput);
-        foreach (const GdbCommand &cookie, m_cookieForToken)
-            showMessage(QString::fromLatin1("CMD: %1, FLAGS: %2")
-                .arg(_(cookie.command)).arg(cookie.flags), LogMiscInput);
-        QTC_ASSERT(false, return);
-        return;
-    }
+    QTC_ASSERT(m_nonDiscardableCount > 0, /**/);
     bool good = true;
-    foreach (const GdbCommand &cookie, m_cookieForToken) {
-        if (!(cookie.flags & Discardable)) {
-            qDebug() << "CMD:" << cookie.command
-                << " FLAGS:" << cookie.flags
-                << " CALLBACK:" << cookie.callbackName;
+    QHashIterator<int, GdbCommand> it(m_cookieForToken);
+    while (it.hasNext()) {
+        it.next();
+        if (!(it.value().flags & Discardable)) {
+            qDebug() << "TOKEN: " << it.key()
+                << "CMD:" << it.value().command
+                << " FLAGS:" << it.value().flags
+                << " CALLBACK:" << it.value().callbackName;
             good = false;
         }
     }
@@ -3970,6 +3966,7 @@ void GdbEngine::rebuildWatchModel()
     showStatusMessage(tr("Finished retrieving data"), 400);
     watchHandler()->endCycle();
     showToolTip();
+    handleAutoTests();
 }
 
 static QByteArray arrayFillCommand(const char *array, const QByteArray &params)
diff --git a/src/plugins/debugger/gdb/pythongdbengine.cpp b/src/plugins/debugger/gdb/pythongdbengine.cpp
index 81baea0fe9c2e5746438444cdb578ae83e7a066b..ae3a053cc6aec2ff38cfd8291296e2c51fe0aa5a 100644
--- a/src/plugins/debugger/gdb/pythongdbengine.cpp
+++ b/src/plugins/debugger/gdb/pythongdbengine.cpp
@@ -193,7 +193,6 @@ void GdbEngine::handleStackFramePython(const GdbResponse &response)
         }
         if (!partial)
             emit stackFrameCompleted();
-        handleAutoTests();
     } else {
         showMessage(_("DUMPER FAILED: " + response.toString()));
     }