diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 3db61fe1211..0ce9e360e29 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -387,7 +387,7 @@ void CMakeBuildSystem::setParametersAndRequestParse(const BuildDirParameters &pa
     QTC_ASSERT(parameters.isValid(), return );
 
     m_parameters = parameters;
-    m_parameters.buildDirectory = buildDirectory(parameters);
+    ensureBuildDirectory(parameters);
     updateReparseParameters(reparseParameters);
 
     m_reader.setParameters(m_parameters);
@@ -455,15 +455,14 @@ bool CMakeBuildSystem::persistCMakeState()
     QTC_ASSERT(parameters.isValid(), return false);
 
     const bool hadBuildDirectory = parameters.buildDirectory.exists();
-    parameters.buildDirectory = buildDirectory(parameters);
+    ensureBuildDirectory(parameters);
 
     int reparseFlags = REPARSE_DEFAULT;
     qCDebug(cmakeBuildSystemLog) << "Checking whether build system needs to be persisted:"
                                  << "buildDir:" << parameters.buildDirectory
                                  << "Has extraargs:" << !parameters.configurationChangesArguments.isEmpty();
 
-    if (parameters.buildDirectory == parameters.buildDirectory
-        && mustApplyConfigurationChangesArguments(parameters)) {
+    if (mustApplyConfigurationChangesArguments(parameters)) {
         reparseFlags = REPARSE_FORCE_EXTRA_CONFIGURATION;
         qCDebug(cmakeBuildSystemLog) << "   -> must run CMake with extra arguments.";
     }
@@ -864,15 +863,13 @@ void CMakeBuildSystem::wireUpConnections()
     }
 }
 
-FilePath CMakeBuildSystem::buildDirectory(const BuildDirParameters &parameters)
+void CMakeBuildSystem::ensureBuildDirectory(const BuildDirParameters &parameters)
 {
     const FilePath bdir = parameters.buildDirectory;
 
     if (!buildConfiguration()->createBuildDirectory())
         handleParsingFailed(
             tr("Failed to create build directory \"%1\".").arg(bdir.toUserOutput()));
-
-    return bdir;
 }
 
 void CMakeBuildSystem::stopParsingAndClearState()
@@ -917,7 +914,8 @@ void CMakeBuildSystem::runCTest()
     QTC_ASSERT(parameters.isValid(), return);
 
     const CommandLine cmd { m_ctestPath, { "-N", "--show-only=json-v1" } };
-    const FilePath workingDirectory = buildDirectory(parameters);
+    ensureBuildDirectory(parameters);
+    const FilePath workingDirectory = parameters.buildDirectory;
     const Environment environment = buildConfiguration()->environment();
 
     auto future = Utils::runAsync([cmd, workingDirectory, environment]
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.h b/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
index 37b076b939d..bb505b65f34 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
@@ -191,7 +191,7 @@ private:
 
     void wireUpConnections();
 
-    Utils::FilePath buildDirectory(const BuildDirParameters &parameters);
+    void ensureBuildDirectory(const BuildDirParameters &parameters);
     void stopParsingAndClearState();
     void becameDirty();