diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp
index 24c97f11aeb..14b58c8368f 100644
--- a/src/plugins/autotoolsprojectmanager/makestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/makestep.cpp
@@ -49,8 +49,9 @@ MakeStepFactory::MakeStepFactory()
 // MakeStep
 
 MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl)
-    : ProjectExplorer::MakeStep(bsl, MAKE_STEP_ID, QString(), {"all", "clean"})
+    : ProjectExplorer::MakeStep(bsl, MAKE_STEP_ID)
 {
+    setAvailableBuildTargets({"all", "clean"});
     if (bsl->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
         setBuildTarget("clean", true);
         setClean(true);
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index 97531401562..95b83c789ab 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/src/plugins/genericprojectmanager/genericmakestep.cpp
@@ -36,8 +36,10 @@ namespace Internal {
 const char GENERIC_MS_ID[] = "GenericProjectManager.GenericMakeStep";
 
 GenericMakeStep::GenericMakeStep(BuildStepList *parent, const QString &buildTarget)
-    : MakeStep(parent, GENERIC_MS_ID, buildTarget, {"all", "clean"})
+    : MakeStep(parent, GENERIC_MS_ID)
 {
+    setBuildTarget(buildTarget);
+    setAvailableBuildTargets({"all", "clean"});
 }
 
 //
@@ -48,7 +50,7 @@ GenericMakeAllStepFactory::GenericMakeAllStepFactory()
 {
     struct Step : GenericMakeStep
     {
-        Step(BuildStepList *bsl) : GenericMakeStep(bsl, QString("all")) { }
+        Step(BuildStepList *bsl) : GenericMakeStep(bsl) { setBuildTarget("all"); }
     };
 
     registerStep<Step>(GENERIC_MS_ID);
diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp
index 3c3a0304e7d..2ab7b64e300 100644
--- a/src/plugins/projectexplorer/makestep.cpp
+++ b/src/plugins/projectexplorer/makestep.cpp
@@ -60,19 +60,24 @@ const char MAKEFLAGS[] = "MAKEFLAGS";
 
 namespace ProjectExplorer {
 
-MakeStep::MakeStep(BuildStepList *parent,
-                   Core::Id id,
-                   const QString &buildTarget,
-                   const QStringList &availableTargets)
+MakeStep::MakeStep(BuildStepList *parent, Core::Id id)
     : AbstractProcessStep(parent, id),
-      m_availableTargets(availableTargets),
       m_userJobCount(defaultJobCount())
 {
     setDefaultDisplayName(defaultDisplayName());
+}
+
+void MakeStep::setBuildTarget(const QString &buildTarget)
+{
     if (!buildTarget.isEmpty())
         setBuildTarget(buildTarget, true);
 }
 
+void MakeStep::setAvailableBuildTargets(const QStringList &buildTargets)
+{
+    m_availableTargets = buildTargets;
+}
+
 bool MakeStep::init()
 {
     BuildConfiguration *bc = buildConfiguration();
diff --git a/src/plugins/projectexplorer/makestep.h b/src/plugins/projectexplorer/makestep.h
index da65cec114e..f8584047d7d 100644
--- a/src/plugins/projectexplorer/makestep.h
+++ b/src/plugins/projectexplorer/makestep.h
@@ -45,10 +45,10 @@ class PROJECTEXPLORER_EXPORT MakeStep : public ProjectExplorer::AbstractProcessS
     Q_OBJECT
 
 public:
-    explicit MakeStep(ProjectExplorer::BuildStepList *parent,
-                      Core::Id id,
-                      const QString &buildTarget = QString(),
-                      const QStringList &availableTargets = {});
+    explicit MakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
+
+    void setBuildTarget(const QString &buildTarget);
+    void setAvailableBuildTargets(const QStringList &buildTargets);
 
     bool init() override;
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;