diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp
index 38704fe07c7..1735f3d65d6 100644
--- a/src/plugins/autotest/testconfiguration.cpp
+++ b/src/plugins/autotest/testconfiguration.cpp
@@ -31,6 +31,7 @@
 #include <cpptools/projectinfo.h>
 
 #include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/buildsystem.h>
 #include <projectexplorer/buildtargetinfo.h>
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/environmentaspect.h>
@@ -137,8 +138,9 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode)
 
     const QSet<QString> buildSystemTargets = m_buildTargets;
     qCDebug(LOG) << "BuildSystemTargets\n    " << buildSystemTargets;
+    const QList<BuildTargetInfo> buildTargets = target->buildSystem()->applicationTargets();
     BuildTargetInfo targetInfo
-            = Utils::findOrDefault(target->applicationTargets(),
+            = Utils::findOrDefault(buildTargets,
                                    [&buildSystemTargets] (const BuildTargetInfo &bti) {
         return buildSystemTargets.contains(bti.buildKey);
     });
@@ -146,7 +148,6 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode)
     // there would be no BuildTargetInfo that could match
     if (targetInfo.targetFilePath.isEmpty()) {
         qCDebug(LOG) << "BuildTargetInfos";
-        const QList<BuildTargetInfo> buildTargets = target->applicationTargets();
         // if there is only one build target just use it (but be honest that we're deducing)
         if (buildTargets.size() == 1) {
             targetInfo = buildTargets.first();
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index b1128896f65..69f6dc86069 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -445,17 +445,17 @@ QString RunConfigurationFactory::decoratedTargetName(const QString &targetName,
 }
 
 QList<RunConfigurationCreationInfo>
-RunConfigurationFactory::availableCreators(Target *parent) const
+RunConfigurationFactory::availableCreators(Target *target) const
 {
-    const QList<BuildTargetInfo> buildTargets = parent->applicationTargets();
+    const QList<BuildTargetInfo> buildTargets = target->buildSystem()->applicationTargets();
     const bool hasAnyQtcRunnable = Utils::anyOf(buildTargets,
                                             Utils::equal(&BuildTargetInfo::isQtcRunnable, true));
     return Utils::transform(buildTargets, [&](const BuildTargetInfo &ti) {
         QString displayName = ti.displayName;
         if (displayName.isEmpty())
-            displayName = decoratedTargetName(ti.buildKey, parent);
+            displayName = decoratedTargetName(ti.buildKey, target);
         else if (m_decorateDisplayNames)
-            displayName = decoratedTargetName(displayName, parent);
+            displayName = decoratedTargetName(displayName, target);
         RunConfigurationCreationInfo rci;
         rci.factory = this;
         rci.id = m_runConfigBaseId;
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 437d3f4ef03..d71f87ce75f 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -236,7 +236,7 @@ public:
     static QString decoratedTargetName(const QString &targetName, Target *kit);
 
 protected:
-    virtual QList<RunConfigurationCreationInfo> availableCreators(Target *parent) const;
+    virtual QList<RunConfigurationCreationInfo> availableCreators(Target *target) const;
 
     using RunConfigurationCreator = std::function<RunConfiguration *(Target *)>;
 
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index 6687f4dfbef..b1ff917bf75 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -232,12 +232,6 @@ DeploymentData Target::buildSystemDeploymentData() const
     return buildSystem()->deploymentData();
 }
 
-const QList<BuildTargetInfo> Target::applicationTargets() const
-{
-    QTC_ASSERT(buildSystem(), return {});
-    return buildSystem()->applicationTargets();
-}
-
 BuildTargetInfo Target::buildTarget(const QString &buildKey) const
 {
     QTC_ASSERT(buildSystem(), return {});
diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h
index 7ccd4e7901e..34d48e78e8a 100644
--- a/src/plugins/projectexplorer/target.h
+++ b/src/plugins/projectexplorer/target.h
@@ -121,7 +121,6 @@ public:
 
     DeploymentData deploymentData() const;
     DeploymentData buildSystemDeploymentData() const;
-    const QList<BuildTargetInfo> applicationTargets() const;
     BuildTargetInfo buildTarget(const QString &buildKey) const;
 
 signals:
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp
index e5b90145439..9b4038a6320 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -37,6 +37,7 @@
 #include <cpptools/cppmodelmanager.h>
 
 #include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/buildsystem.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectnodes.h>
@@ -44,6 +45,7 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
+
 #include <qmljs/qmljsbind.h>
 #include <qmljs/qmljsfindexportedcpptypes.h>
 #include <qmljs/qmljsplugindumper.h>
@@ -141,7 +143,7 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject(
             projectInfo.qmlDumpEnvironment.appendOrSet("QML2_IMPORT_PATH", bc->environment().expandedValueForKey("QML2_IMPORT_PATH"), ":");
         }
 
-        const auto appTargets = activeTarget->applicationTargets();
+        const auto appTargets = activeTarget->buildSystem()->applicationTargets();
         for (const auto &target : appTargets) {
             if (target.targetFilePath.isEmpty())
                 continue;