diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp
index 0a75abf03d2..68b76b986ba 100644
--- a/src/plugins/autotest/autotestplugin.cpp
+++ b/src/plugins/autotest/autotestplugin.cpp
@@ -487,7 +487,7 @@ QVector<QObject *> AutotestPlugin::createTestObjects() const
 
 bool ChoicePair::matches(const ProjectExplorer::RunConfiguration *rc) const
 {
-    return rc && rc->displayName() == displayName && rc->runnable().command.executable().toString() == executable;
+    return rc && rc->displayName() == displayName && rc->runnable().command.executable() == executable;
 }
 
 } // Internal
diff --git a/src/plugins/autotest/autotestplugin.h b/src/plugins/autotest/autotestplugin.h
index 93081c1b2af..963e894ad91 100644
--- a/src/plugins/autotest/autotestplugin.h
+++ b/src/plugins/autotest/autotestplugin.h
@@ -7,6 +7,8 @@
 
 #include <extensionsystem/iplugin.h>
 
+#include <utils/filepath.h>
+
 namespace ProjectExplorer {
 class Project;
 class RunConfiguration;
@@ -20,12 +22,12 @@ struct TestSettings;
 
 struct ChoicePair
 {
-    explicit ChoicePair(const QString &name = QString(), const QString &exe = QString())
+    explicit ChoicePair(const QString &name = {}, const Utils::FilePath &exe = {})
         : displayName(name), executable(exe) {}
     bool matches(const ProjectExplorer::RunConfiguration *rc) const;
 
     QString displayName;
-    QString executable;
+    Utils::FilePath executable;
 };
 
 class AutotestPlugin : public ExtensionSystem::IPlugin
diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp
index f91a4c592c9..d377e87c3d0 100644
--- a/src/plugins/autotest/testrunner.cpp
+++ b/src/plugins/autotest/testrunner.cpp
@@ -446,11 +446,11 @@ static RunConfiguration *getRunConfiguration(const QString &buildTargetKey)
         if (dName.isEmpty())
             return nullptr;
         // run configuration has been selected - fill config based on this one..
-        const QString exe = dialog.executable();
+        const FilePath exe = FilePath::fromString(dialog.executable());
         runConfig = Utils::findOr(runConfigurations, nullptr, [&dName, &exe] (const RunConfiguration *rc) {
             if (rc->displayName() != dName)
                 return false;
-            return rc->runnable().command.executable().toString() == exe;
+            return rc->runnable().command.executable() == exe;
         });
         if (runConfig && dialog.rememberChoice())
             AutotestPlugin::cacheRunConfigChoice(buildTargetKey, ChoicePair(dName, exe));