diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 363a7c3fdb7..c65c479d6a0 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -138,8 +138,8 @@ public:
     void setCommandsAfterConnect(const QString &commands) { m_commandsAfterConnect = commands; }
     QString commandsAfterConnect() const { return m_commandsAfterConnect; }
 
-    // Used by Valgrind
-    QStringList expectedSignals;
+    void addExpectedSignal(const QString &signal) { m_expectedSignals.append(signal); }
+    QStringList expectedSignals() const { return m_expectedSignals; }
 
     // For QNX debugging
     bool useCtrlCStub = false;
@@ -244,6 +244,8 @@ private:
     QString m_commandsForReset; // Used by baremetal plugin. Commands used for resetting the inferior
     bool m_useContinueInsteadOfRun = false; // If connected to a hw debugger run is not possible but continue is used
     QString m_commandsAfterConnect; // Additional commands to post after connection to debug target
+
+    QStringList m_expectedSignals; // Used by Valgrind
 };
 
 namespace Internal {
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index e2c4efdfd24..fbdc18af38d 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -204,11 +204,6 @@ void DebuggerRunTool::setCrashParameter(const QString &event)
     m_runParameters.crashParameter = event;
 }
 
-void DebuggerRunTool::addExpectedSignal(const QString &signal)
-{
-    m_runParameters.expectedSignals.append(signal);
-}
-
 void DebuggerRunTool::addSearchDirectory(const Utils::FilePath &dir)
 {
     m_runParameters.additionalSearchDirectories.append(dir);
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index 56a2897cae8..40b18efcd3c 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -33,8 +33,6 @@ public:
     void setStartMessage(const QString &msg);
     void setCrashParameter(const QString &event);
 
-    void addExpectedSignal(const QString &signal);
-
     void setSysRoot(const Utils::FilePath &sysRoot);
 
     void setContinueAfterAttach(bool on);
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 010a90288f9..d33cd965a05 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1421,7 +1421,7 @@ void GdbEngine::handleStop2(const GdbMi &data)
             QString meaning = data["signal-meaning"].data();
             // Ignore these as they are showing up regularly when
             // stopping debugging.
-            if (name == stopSignal(rp.toolChainAbi) || rp.expectedSignals.contains(name)) {
+            if (name == stopSignal(rp.toolChainAbi) || rp.expectedSignals().contains(name)) {
                 showMessage(name + " CONSIDERED HARMLESS. CONTINUING.");
             } else if (m_isQnxGdb && name == "0" && meaning == "Signal 0") {
                 showMessage("SIGNAL 0 CONSIDERED BOGUS.");
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index dbf3ac30609..c86f1ef98df 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -193,7 +193,7 @@ void MemcheckToolRunner::startDebugger(qint64 valgrindPid)
     rp.setDisplayName(QString("VGdb %1").arg(valgrindPid));
     rp.setRemoteChannel(QString("| vgdb --pid=%1").arg(valgrindPid));
     rp.setUseContinueInsteadOfRun(true);
-    debugger->addExpectedSignal("SIGTRAP");
+    rp.addExpectedSignal("SIGTRAP");
 
     connect(runControl(), &RunControl::stopped, debugger, &RunControl::deleteLater);