diff --git a/src/plugins/analyzerbase/startremotedialog.cpp b/src/plugins/analyzerbase/startremotedialog.cpp
index cf4dae10ec5..92e62c6ce39 100644
--- a/src/plugins/analyzerbase/startremotedialog.cpp
+++ b/src/plugins/analyzerbase/startremotedialog.cpp
@@ -25,6 +25,8 @@
 
 #include "startremotedialog.h"
 
+#include "analyzerstartparameters.h"
+
 #include <coreplugin/icore.h>
 #include <projectexplorer/kitchooser.h>
 #include <projectexplorer/kitinformation.h>
@@ -134,14 +136,12 @@ QSsh::SshConnectionParameters StartRemoteDialog::sshParams() const
     return device->sshParameters();
 }
 
-QString StartRemoteDialog::executable() const
+AnalyzerRunnable StartRemoteDialog::runnable() const
 {
-    return d->executable->text();
-}
-
-QString StartRemoteDialog::arguments() const
-{
-    return d->arguments->text();
+    AnalyzerRunnable r;
+    r.debuggee = d->executable->text();
+    r.debuggeeArgs = d->arguments->text();
+    return r;
 }
 
 QString StartRemoteDialog::workingDirectory() const
diff --git a/src/plugins/analyzerbase/startremotedialog.h b/src/plugins/analyzerbase/startremotedialog.h
index be9426a8571..64826fafabf 100644
--- a/src/plugins/analyzerbase/startremotedialog.h
+++ b/src/plugins/analyzerbase/startremotedialog.h
@@ -36,6 +36,8 @@ namespace Analyzer {
 
 namespace Internal { class StartRemoteDialogPrivate; }
 
+class AnalyzerRunnable;
+
 class ANALYZER_EXPORT StartRemoteDialog : public QDialog
 {
     Q_OBJECT
@@ -45,8 +47,7 @@ public:
     ~StartRemoteDialog();
 
     QSsh::SshConnectionParameters sshParams() const;
-    QString executable() const;
-    QString arguments() const;
+    AnalyzerRunnable runnable() const;
     QString workingDirectory() const;
 
 private slots:
diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp
index 3d5f970100b..209dd74df7a 100644
--- a/src/plugins/valgrind/valgrindplugin.cpp
+++ b/src/plugins/valgrind/valgrindplugin.cpp
@@ -193,14 +193,11 @@ void ValgrindPlugin::extensionsInitialized()
             return;
         ValgrindRunControl *rc = mcTool->createRunControl(runConfig, MEMCHECK_RUN_MODE);
         QTC_ASSERT(rc, return);
-        AnalyzerRunnable runnable;
-        runnable.debuggee = dlg.executable();
-        runnable.debuggeeArgs = dlg.arguments();
-        rc->setRunnable(runnable);
+        rc->setRunnable(dlg.runnable());
         AnalyzerConnection connection;
         connection.connParams = dlg.sshParams();
         rc->setConnection(connection);
-        rc->setDisplayName(dlg.executable());
+        rc->setDisplayName(dlg.runnable().debuggee);
         rc->setWorkingDirectory(dlg.workingDirectory());
         rc->setCustomStart();
         ProjectExplorerPlugin::startRunControl(rc, MEMCHECK_RUN_MODE);
@@ -220,14 +217,11 @@ void ValgrindPlugin::extensionsInitialized()
             return;
         ValgrindRunControl *rc = cgTool->createRunControl(runConfig);
         QTC_ASSERT(rc, return);
-        AnalyzerRunnable runnable;
-        runnable.debuggee = dlg.executable();
-        runnable.debuggeeArgs = dlg.arguments();
-        rc->setRunnable(runnable);
+        rc->setRunnable(dlg.runnable());
         AnalyzerConnection connection;
         connection.connParams = dlg.sshParams();
         rc->setConnection(connection);
-        rc->setDisplayName(dlg.executable());
+        rc->setDisplayName(dlg.runnable().debuggee);
         rc->setWorkingDirectory(dlg.workingDirectory());
         rc->setCustomStart();
         ProjectExplorerPlugin::startRunControl(rc, CALLGRIND_RUN_MODE);