diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index 0656dbd8783..8b1c4c85612 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -437,17 +437,14 @@ CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FilePath &pr
 
 Utils::FilePath CompilationDatabaseProject::rootPathFromSettings() const
 {
-#ifdef WITH_TESTS
-    return Utils::FilePath::fromString(projectDirectory().fileName());
-#else
-    auto rootPath = Utils::FilePath::fromString(
+    Utils::FilePath rootPath;
+#ifndef WITH_TESTS
+    rootPath = Utils::FilePath::fromString(
         namedSettings(ProjectExplorer::Constants::PROJECT_ROOT_PATH_KEY).toString());
-
-    if (rootPath.isEmpty())
-        rootPath = Utils::FilePath::fromString(projectDirectory().fileName());
-
-    return rootPath;
 #endif
+    if (rootPath.isEmpty())
+        rootPath = projectDirectory();
+    return rootPath;
 }
 
 void CompilationDatabaseProject::configureAsExampleProject(Kit *kit)
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
index fba6ca246b9..37216a48878 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
@@ -138,9 +138,9 @@ void CompilationDbParser::stop()
 
 QList<FileNode *> CompilationDbParser::scannedFiles() const
 {
+    const bool canceled = m_treeScanner->future().isCanceled();
     const TreeScanner::Result result = m_treeScanner->release();
-    return m_treeScanner && !m_treeScanner->future().isCanceled() ? result.allFiles
-                                                                  : QList<FileNode *>();
+    return !canceled ? result.allFiles : QList<FileNode *>();
 }
 
 void CompilationDbParser::parserJobFinished()