84 files changed, 114 insertions, 112 deletions

diff --git a/tests/auto/api/testdata/QBS-728/project.qbs b/tests/auto/api/testdata/QBS-728/QBS-728.qbs
index 6ab244c83..6ab244c83 100644
--- a/tests/auto/api/testdata/QBS-728/project.qbs
+++ b/tests/auto/api/testdata/QBS-728/QBS-728.qbs
diff --git a/tests/auto/api/testdata/add-qobject-macro-to-cpp-file/project.qbs b/tests/auto/api/testdata/add-qobject-macro-to-cpp-file/add-qobject-macro-to-cpp-file.qbs
index 40c5395ef..40c5395ef 100644
--- a/tests/auto/api/testdata/add-qobject-macro-to-cpp-file/project.qbs
+++ b/tests/auto/api/testdata/add-qobject-macro-to-cpp-file/add-qobject-macro-to-cpp-file.qbs
diff --git a/tests/auto/api/testdata/added-file-persistent/project.qbs b/tests/auto/api/testdata/added-file-persistent/added-file-persistent.qbs
index 672886646..672886646 100644
--- a/tests/auto/api/testdata/added-file-persistent/project.qbs
+++ b/tests/auto/api/testdata/added-file-persistent/added-file-persistent.qbs
diff --git a/tests/auto/api/testdata/app-without-sources/project.qbs b/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs
index 726726337..726726337 100644
--- a/tests/auto/api/testdata/app-without-sources/project.qbs
+++ b/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs
diff --git a/tests/auto/api/testdata/build-properties-source/project.qbs b/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs
index 49f565b29..49f565b29 100644
--- a/tests/auto/api/testdata/build-properties-source/project.qbs
+++ b/tests/auto/api/testdata/build-properties-source/build-properties-source.qbs
diff --git a/tests/auto/api/testdata/build-single-file/project.qbs b/tests/auto/api/testdata/build-single-file/build-single-file.qbs
index 0f24278be..0f24278be 100644
--- a/tests/auto/api/testdata/build-single-file/project.qbs
+++ b/tests/auto/api/testdata/build-single-file/build-single-file.qbs
diff --git a/tests/auto/api/testdata/buildgraph-locking/project.qbs b/tests/auto/api/testdata/buildgraph-locking/buildgraph-locking.qbs
index e08b008bc..e08b008bc 100644
--- a/tests/auto/api/testdata/buildgraph-locking/project.qbs
+++ b/tests/auto/api/testdata/buildgraph-locking/buildgraph-locking.qbs
diff --git a/tests/auto/api/testdata/check-outputs/project.qbs b/tests/auto/api/testdata/check-outputs/check-outputs.qbs
index 27eada48f..27eada48f 100644
--- a/tests/auto/api/testdata/check-outputs/project.qbs
+++ b/tests/auto/api/testdata/check-outputs/check-outputs.qbs
diff --git a/tests/auto/api/testdata/codegen/project.qbs b/tests/auto/api/testdata/codegen/codegen.qbs
index 282ee4a7f..282ee4a7f 100644
--- a/tests/auto/api/testdata/codegen/project.qbs
+++ b/tests/auto/api/testdata/codegen/codegen.qbs
diff --git a/tests/auto/api/testdata/command-extraction/project.qbs b/tests/auto/api/testdata/command-extraction/command-extraction.qbs
index 73b66aaa0..73b66aaa0 100644
--- a/tests/auto/api/testdata/command-extraction/project.qbs
+++ b/tests/auto/api/testdata/command-extraction/command-extraction.qbs
diff --git a/tests/auto/api/testdata/disabled-product/disabledProduct.qbs b/tests/auto/api/testdata/disabled-product/disabled-product.qbs
index c57615c10..c57615c10 100644
--- a/tests/auto/api/testdata/disabled-product/disabledProduct.qbs
+++ b/tests/auto/api/testdata/disabled-product/disabled-product.qbs
diff --git a/tests/auto/api/testdata/disabled-project/disabled_project.qbs b/tests/auto/api/testdata/disabled-project/disabled-project.qbs
index 1461b70ad..1461b70ad 100644
--- a/tests/auto/api/testdata/disabled-project/disabled_project.qbs
+++ b/tests/auto/api/testdata/disabled-project/disabled-project.qbs
diff --git a/tests/auto/api/testdata/disabled_install_group/project.qbs b/tests/auto/api/testdata/disabled_install_group/disabled_install_group.qbs
index 6364506b4..6364506b4 100644
--- a/tests/auto/api/testdata/disabled_install_group/project.qbs
+++ b/tests/auto/api/testdata/disabled_install_group/disabled_install_group.qbs
diff --git a/tests/auto/api/testdata/empty-filetag-list/project.qbs b/tests/auto/api/testdata/empty-filetag-list/empty-filetag-list.qbs
index 294616124..294616124 100644
--- a/tests/auto/api/testdata/empty-filetag-list/project.qbs
+++ b/tests/auto/api/testdata/empty-filetag-list/empty-filetag-list.qbs
diff --git a/tests/auto/api/testdata/empty-submodules-list/project.qbs b/tests/auto/api/testdata/empty-submodules-list/empty-submodules-list.qbs
index 88b5e3177..88b5e3177 100644
--- a/tests/auto/api/testdata/empty-submodules-list/project.qbs
+++ b/tests/auto/api/testdata/empty-submodules-list/empty-submodules-list.qbs
diff --git a/tests/auto/api/testdata/enable-and-disable-product/project.qbs b/tests/auto/api/testdata/enable-and-disable-product/enable-and-disable-product.qbs
index 4afa1e25e..4afa1e25e 100644
--- a/tests/auto/api/testdata/enable-and-disable-product/project.qbs
+++ b/tests/auto/api/testdata/enable-and-disable-product/enable-and-disable-product.qbs
diff --git a/tests/auto/api/testdata/explicitly-depends-on/project.qbs b/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs
index eda4e27df..eda4e27df 100644
--- a/tests/auto/api/testdata/explicitly-depends-on/project.qbs
+++ b/tests/auto/api/testdata/explicitly-depends-on/explicitly-depends-on.qbs
diff --git a/tests/auto/api/testdata/export-item-with-group/project.qbs b/tests/auto/api/testdata/export-item-with-group/export-item-with-group.qbs
index 2dffc2803..2dffc2803 100644
--- a/tests/auto/api/testdata/export-item-with-group/project.qbs
+++ b/tests/auto/api/testdata/export-item-with-group/export-item-with-group.qbs
diff --git a/tests/auto/api/testdata/export-simple/project.qbs b/tests/auto/api/testdata/export-simple/export-simple.qbs
index 6eca71e89..6eca71e89 100644
--- a/tests/auto/api/testdata/export-simple/project.qbs
+++ b/tests/auto/api/testdata/export-simple/export-simple.qbs
diff --git a/tests/auto/api/testdata/export-with-recursive-depends/project.qbs b/tests/auto/api/testdata/export-with-recursive-depends/export-with-recursive-depends.qbs
index d5f5f79e5..d5f5f79e5 100644
--- a/tests/auto/api/testdata/export-with-recursive-depends/project.qbs
+++ b/tests/auto/api/testdata/export-with-recursive-depends/export-with-recursive-depends.qbs
diff --git a/tests/auto/api/testdata/filetagsfilter_override/project.qbs b/tests/auto/api/testdata/filetagsfilter_override/filetagsfilter_override.qbs
index a6cec7d07..a6cec7d07 100644
--- a/tests/auto/api/testdata/filetagsfilter_override/project.qbs
+++ b/tests/auto/api/testdata/filetagsfilter_override/filetagsfilter_override.qbs
diff --git a/tests/auto/api/testdata/infinite-loop-resolving/project.qbs b/tests/auto/api/testdata/infinite-loop-resolving/infinite-loop-resolving.qbs
index b690f5041..b690f5041 100644
--- a/tests/auto/api/testdata/infinite-loop-resolving/project.qbs
+++ b/tests/auto/api/testdata/infinite-loop-resolving/infinite-loop-resolving.qbs
diff --git a/tests/auto/api/testdata/installed-artifact/installed_artifact.qbs b/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs
index 7f7de9bc2..7f7de9bc2 100644
--- a/tests/auto/api/testdata/installed-artifact/installed_artifact.qbs
+++ b/tests/auto/api/testdata/installed-artifact/installed-artifact.qbs
diff --git a/tests/auto/api/testdata/is-runnable/project.qbs b/tests/auto/api/testdata/is-runnable/is-runnable.qbs
index 47e217a6a..47e217a6a 100644
--- a/tests/auto/api/testdata/is-runnable/project.qbs
+++ b/tests/auto/api/testdata/is-runnable/is-runnable.qbs
diff --git a/tests/auto/api/testdata/lib-same-source/project.qbs b/tests/auto/api/testdata/lib-same-source/lib-same-source.qbs
index dc5785e98..dc5785e98 100644
--- a/tests/auto/api/testdata/lib-same-source/project.qbs
+++ b/tests/auto/api/testdata/lib-same-source/lib-same-source.qbs
diff --git a/tests/auto/api/testdata/link-static-lib/project.qbs b/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs
index 6840a4cc6..6840a4cc6 100644
--- a/tests/auto/api/testdata/link-static-lib/project.qbs
+++ b/tests/auto/api/testdata/link-static-lib/link-static-lib.qbs
diff --git a/tests/auto/api/testdata/lots-of-dots/project.qbs b/tests/auto/api/testdata/lots-of-dots/lots-of-dots.qbs
index 5e033bd36..5e033bd36 100644
--- a/tests/auto/api/testdata/lots-of-dots/project.qbs
+++ b/tests/auto/api/testdata/lots-of-dots/lots-of-dots.qbs
diff --git a/tests/auto/api/testdata/moc-cpp/project.qbs b/tests/auto/api/testdata/moc-cpp/moc-cpp.qbs
index f8ee0736b..f8ee0736b 100644
--- a/tests/auto/api/testdata/moc-cpp/project.qbs
+++ b/tests/auto/api/testdata/moc-cpp/moc-cpp.qbs
diff --git a/tests/auto/api/testdata/moc-hpp-included/project.qbs b/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs
index 554b0a2b3..554b0a2b3 100644
--- a/tests/auto/api/testdata/moc-hpp-included/project.qbs
+++ b/tests/auto/api/testdata/moc-hpp-included/moc-hpp-included.qbs
diff --git a/tests/auto/api/testdata/moc-hpp/project.qbs b/tests/auto/api/testdata/moc-hpp/moc-hpp.qbs
index 54451a509..54451a509 100644
--- a/tests/auto/api/testdata/moc-hpp/project.qbs
+++ b/tests/auto/api/testdata/moc-hpp/moc-hpp.qbs
diff --git a/tests/auto/api/testdata/multi-arch/project.qbs b/tests/auto/api/testdata/multi-arch/multi-arch.qbs
index d88c84ba7..d88c84ba7 100644
--- a/tests/auto/api/testdata/multi-arch/project.qbs
+++ b/tests/auto/api/testdata/multi-arch/multi-arch.qbs
diff --git a/tests/auto/api/testdata/new-output-artifact-in-dependency/project.qbs b/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs
index ed08e8315..ed08e8315 100644
--- a/tests/auto/api/testdata/new-output-artifact-in-dependency/project.qbs
+++ b/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs
diff --git a/tests/auto/api/testdata/new-pattern-match/project.qbs b/tests/auto/api/testdata/new-pattern-match/new-pattern-match.qbs
index 18975da75..18975da75 100644
--- a/tests/auto/api/testdata/new-pattern-match/project.qbs
+++ b/tests/auto/api/testdata/new-pattern-match/new-pattern-match.qbs
diff --git a/tests/auto/api/testdata/nonexistingprojectproperties/project.qbs b/tests/auto/api/testdata/nonexistingprojectproperties/nonexistingprojectproperties.qbs
index 7d453a671..7d453a671 100644
--- a/tests/auto/api/testdata/nonexistingprojectproperties/project.qbs
+++ b/tests/auto/api/testdata/nonexistingprojectproperties/nonexistingprojectproperties.qbs
diff --git a/tests/auto/api/testdata/precompiled-header-dynamic/project.qbs b/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs
index 3e1e676ba..3e1e676ba 100644
--- a/tests/auto/api/testdata/precompiled-header-dynamic/project.qbs
+++ b/tests/auto/api/testdata/precompiled-header-dynamic/precompiled-header-dynamic.qbs
diff --git a/tests/auto/api/testdata/precompiled-header-new/project.qbs b/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs
index 5c73c9670..5c73c9670 100644
--- a/tests/auto/api/testdata/precompiled-header-new/project.qbs
+++ b/tests/auto/api/testdata/precompiled-header-new/precompiled-header-new.qbs
diff --git a/tests/auto/api/testdata/precompiled-header/project.qbs b/tests/auto/api/testdata/precompiled-header/precompiled-header.qbs
index 5f7b4b616..5f7b4b616 100644
--- a/tests/auto/api/testdata/precompiled-header/project.qbs
+++ b/tests/auto/api/testdata/precompiled-header/precompiled-header.qbs
diff --git a/tests/auto/api/testdata/productNameWithDots/project.qbs b/tests/auto/api/testdata/productNameWithDots/productNameWithDots.qbs
index f0cf5813c..f0cf5813c 100644
--- a/tests/auto/api/testdata/productNameWithDots/project.qbs
+++ b/tests/auto/api/testdata/productNameWithDots/productNameWithDots.qbs
diff --git a/tests/auto/api/testdata/project-editing/project.qbs b/tests/auto/api/testdata/project-editing/project-editing.qbs
index 57cb30355..57cb30355 100644
--- a/tests/auto/api/testdata/project-editing/project.qbs
+++ b/tests/auto/api/testdata/project-editing/project-editing.qbs
diff --git a/tests/auto/api/testdata/project-locking/project.qbs b/tests/auto/api/testdata/project-locking/project-locking.qbs
index e08b008bc..e08b008bc 100644
--- a/tests/auto/api/testdata/project-locking/project.qbs
+++ b/tests/auto/api/testdata/project-locking/project-locking.qbs
diff --git a/tests/auto/api/testdata/project-properties-by-name/project.qbs b/tests/auto/api/testdata/project-properties-by-name/project-properties-by-name.qbs
index b90068f87..b90068f87 100644
--- a/tests/auto/api/testdata/project-properties-by-name/project.qbs
+++ b/tests/auto/api/testdata/project-properties-by-name/project-properties-by-name.qbs
diff --git a/tests/auto/api/testdata/project-with-properties-item/project.qbs b/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs
index 91d5de42f..91d5de42f 100644
--- a/tests/auto/api/testdata/project-with-properties-item/project.qbs
+++ b/tests/auto/api/testdata/project-with-properties-item/project-with-properties-item.qbs
diff --git a/tests/auto/api/testdata/properties-blocks/propertiesblocks.qbs b/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs
index 1b4c3680a..1b4c3680a 100644
--- a/tests/auto/api/testdata/properties-blocks/propertiesblocks.qbs
+++ b/tests/auto/api/testdata/properties-blocks/properties-blocks.qbs
diff --git a/tests/auto/api/testdata/qt5-plugin/project.qbs b/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs
index 834c386ad..834c386ad 100644
--- a/tests/auto/api/testdata/qt5-plugin/project.qbs
+++ b/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs
diff --git a/tests/auto/api/testdata/recursive-wildcards/recursive_wildcards.qbs b/tests/auto/api/testdata/recursive-wildcards/recursive-wildcards.qbs
index a1970e1c4..a1970e1c4 100644
--- a/tests/auto/api/testdata/recursive-wildcards/recursive_wildcards.qbs
+++ b/tests/auto/api/testdata/recursive-wildcards/recursive-wildcards.qbs
diff --git a/tests/auto/api/testdata/same-base-name/project.qbs b/tests/auto/api/testdata/same-base-name/same-base-name.qbs
index c6a7a6fa3..c6a7a6fa3 100644
--- a/tests/auto/api/testdata/same-base-name/project.qbs
+++ b/tests/auto/api/testdata/same-base-name/same-base-name.qbs
diff --git a/tests/auto/api/testdata/simple-probe/project.qbs b/tests/auto/api/testdata/simple-probe/simple-probe.qbs
index 34700a99b..34700a99b 100644
--- a/tests/auto/api/testdata/simple-probe/project.qbs
+++ b/tests/auto/api/testdata/simple-probe/simple-probe.qbs
diff --git a/tests/auto/api/testdata/soft-dependency/project.qbs b/tests/auto/api/testdata/soft-dependency/soft-dependency.qbs
index bbf37fda8..bbf37fda8 100644
--- a/tests/auto/api/testdata/soft-dependency/project.qbs
+++ b/tests/auto/api/testdata/soft-dependency/soft-dependency.qbs
diff --git a/tests/auto/api/testdata/source-file-in-build-dir/project.qbs b/tests/auto/api/testdata/source-file-in-build-dir/source-file-in-build-dir.qbs
index 9fe39cdba..9fe39cdba 100644
--- a/tests/auto/api/testdata/source-file-in-build-dir/project.qbs
+++ b/tests/auto/api/testdata/source-file-in-build-dir/source-file-in-build-dir.qbs
diff --git a/tests/auto/api/testdata/static-lib-deps/project.qbs b/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs
index 074acc8a5..074acc8a5 100644
--- a/tests/auto/api/testdata/static-lib-deps/project.qbs
+++ b/tests/auto/api/testdata/static-lib-deps/static-lib-deps.qbs
diff --git a/tests/auto/api/testdata/two-default-property-values/project.qbs b/tests/auto/api/testdata/two-default-property-values/two-default-property-values.qbs
index c0bc720f7..c0bc720f7 100644
--- a/tests/auto/api/testdata/two-default-property-values/project.qbs
+++ b/tests/auto/api/testdata/two-default-property-values/two-default-property-values.qbs
diff --git a/tests/auto/api/testdata/type-change/project.qbs b/tests/auto/api/testdata/type-change/type-change.qbs
index 7661aa305..7661aa305 100644
--- a/tests/auto/api/testdata/type-change/project.qbs
+++ b/tests/auto/api/testdata/type-change/type-change.qbs
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp
index 3ba570307..fee3495f6 100644
--- a/tests/auto/api/tst_api.cpp
+++ b/tests/auto/api/tst_api.cpp
@@ -164,7 +164,7 @@ void TestApi::init()
 void TestApi::addQObjectMacroToCppFile()
 {
     BuildDescriptionReceiver receiver;
-    qbs::ErrorInfo errorInfo = doBuildProject("add-qobject-macro-to-cpp-file/project.qbs", &receiver);
+    qbs::ErrorInfo errorInfo = doBuildProject("add-qobject-macro-to-cpp-file", &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY2(!receiver.descriptions.contains("moc"), qPrintable(receiver.descriptions));
     receiver.descriptions.clear();
@@ -177,7 +177,7 @@ void TestApi::addQObjectMacroToCppFile()
     cppFile.resize(0);
     cppFile.write(contents);
     cppFile.close();
-    errorInfo = doBuildProject("add-qobject-macro-to-cpp-file/project.qbs", &receiver);
+    errorInfo = doBuildProject("add-qobject-macro-to-cpp-file", &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY2(receiver.descriptions.contains("moc"), qPrintable(receiver.descriptions));
 }
@@ -191,7 +191,7 @@ static bool isAboutUndefinedSymbols(const QString &_message)
 void TestApi::addedFilePersistent()
 {
     // On the initial run, linking will fail.
-    const QString relProjectFilePath = "added-file-persistent/project.qbs";
+    const QString relProjectFilePath = "added-file-persistent";
     ProcessResultReceiver receiver;
     qbs::ErrorInfo errorInfo = doBuildProject(relProjectFilePath, 0, &receiver);
     QVERIFY(errorInfo.hasError());
@@ -250,7 +250,7 @@ void TestApi::baseProperties()
 void TestApi::buildGraphLocking()
 {
     qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("buildgraph-locking/project.qbs");
+            = defaultSetupParameters("buildgraph-locking");
     QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(setupParams,
                                                                         m_logSink, 0));
     waitForFinished(setupJob.data());
@@ -314,9 +314,11 @@ void TestApi::buildProject()
 {
     QFETCH(QString, projectSubDir);
     QFETCH(QString, productFileName);
-    qbs::SetupProjectParameters params = defaultSetupParameters(projectSubDir + "/project.qbs");
+    const QString projectFilePath = projectSubDir + QLatin1Char('/') + projectSubDir
+            + QLatin1String(".qbs");
+    qbs::SetupProjectParameters params = defaultSetupParameters(projectFilePath);
     removeBuildDir(params);
-    qbs::ErrorInfo errorInfo = doBuildProject(projectSubDir + "/project.qbs");
+    qbs::ErrorInfo errorInfo = doBuildProject(projectFilePath);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(regularFileExists(relativeBuildGraphFilePath()));
     if (!productFileName.isEmpty()) {
@@ -327,7 +329,7 @@ void TestApi::buildProject()
     WAIT_FOR_NEW_TIMESTAMP();
     qbs::BuildOptions options;
     options.setForceTimestampCheck(true);
-    errorInfo = doBuildProject(projectSubDir + "/project.qbs", 0, 0, 0, options);
+    errorInfo = doBuildProject(projectFilePath, 0, 0, 0, options);
     VERIFY_NO_ERROR(errorInfo);
     if (!productFileName.isEmpty())
         QVERIFY2(regularFileExists(productFileName), qPrintable(productFileName));
@@ -402,12 +404,13 @@ void TestApi::buildProjectDryRun()
 {
     QFETCH(QString, projectSubDir);
     QFETCH(QString, productFileName);
-    qbs::SetupProjectParameters params = defaultSetupParameters(projectSubDir + "/project.qbs");
+    const QString projectFilePath = projectSubDir + QLatin1Char('/') + projectSubDir
+            + QLatin1String(".qbs");
+    qbs::SetupProjectParameters params = defaultSetupParameters(projectFilePath);
     removeBuildDir(params);
     qbs::BuildOptions options;
     options.setDryRun(true);
-    const qbs::ErrorInfo errorInfo
-            = doBuildProject(projectSubDir + "/project.qbs", 0, 0, 0, options);
+    const qbs::ErrorInfo errorInfo = doBuildProject(projectFilePath, 0, 0, 0, options);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY2(!QFileInfo::exists(relativeBuildDir()), qPrintable(QDir(relativeBuildDir())
             .entryList(QDir::NoDotAndDotDot | QDir::AllEntries | QDir::System).join(", ")));
@@ -421,7 +424,7 @@ void TestApi::buildProjectDryRun_data()
 void TestApi::buildSingleFile()
 {
     qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("build-single-file/project.qbs");
+            = defaultSetupParameters("build-single-file");
     QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(setupParams,
                                                                               m_logSink, 0));
     waitForFinished(setupJob.data());
@@ -538,11 +541,11 @@ void TestApi::canonicalToolchainList()
 void TestApi::checkOutputs()
 {
     QFETCH(bool, check);
-    qbs::SetupProjectParameters params = defaultSetupParameters("/check-outputs/project.qbs");
+    qbs::SetupProjectParameters params = defaultSetupParameters("/check-outputs");
     qbs::BuildOptions options;
     options.setForceOutputCheck(check);
     removeBuildDir(params);
-    qbs::ErrorInfo errorInfo = doBuildProject("/check-outputs/project.qbs", 0, 0, 0, options);
+    qbs::ErrorInfo errorInfo = doBuildProject("/check-outputs", 0, 0, 0, options);
     if (check)
         QVERIFY(errorInfo.hasError());
     else
@@ -585,7 +588,7 @@ static void printProjectData(const qbs::ProjectData &project)
 
 void TestApi::changeContent()
 {
-    qbs::SetupProjectParameters setupParams = defaultSetupParameters("project-editing/project.qbs");
+    qbs::SetupProjectParameters setupParams = defaultSetupParameters("project-editing");
     QScopedPointer<qbs::SetupProjectJob> job(qbs::Project().setupProject(setupParams,
                                                                         m_logSink, 0));
     waitForFinished(job.data());
@@ -873,8 +876,7 @@ void TestApi::changeContent()
 
 void TestApi::commandExtraction()
 {
-    qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("/command-extraction/project.qbs");
+    qbs::SetupProjectParameters setupParams = defaultSetupParameters("/command-extraction");
     QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(setupParams,
                                                                               m_logSink, 0));
     waitForFinished(setupJob.data());
@@ -916,7 +918,7 @@ void TestApi::commandExtraction()
 
 void TestApi::changeDependentLib()
 {
-    qbs::ErrorInfo errorInfo = doBuildProject("change-dependent-lib/change-dependent-lib.qbs");
+    qbs::ErrorInfo errorInfo = doBuildProject("change-dependent-lib");
     VERIFY_NO_ERROR(errorInfo);
 
     WAIT_FOR_NEW_TIMESTAMP();
@@ -930,19 +932,19 @@ void TestApi::changeDependentLib()
     qbsFile.seek(0);
     qbsFile.write(content2);
     qbsFile.close();
-    errorInfo = doBuildProject("change-dependent-lib/change-dependent-lib.qbs");
+    errorInfo = doBuildProject("change-dependent-lib");
     VERIFY_NO_ERROR(errorInfo);
 }
 
 void TestApi::enableAndDisableProduct()
 {
     BuildDescriptionReceiver bdr;
-    qbs::ErrorInfo errorInfo = doBuildProject("enable-and-disable-product/project.qbs", &bdr);
+    qbs::ErrorInfo errorInfo = doBuildProject("enable-and-disable-product", &bdr);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(!bdr.descriptions.contains("compiling"));
 
     WAIT_FOR_NEW_TIMESTAMP();
-    QFile projectFile("project.qbs");
+    QFile projectFile("enable-and-disable-product.qbs");
     QVERIFY(projectFile.open(QIODevice::ReadWrite));
     QByteArray content = projectFile.readAll();
     content.replace("undefined", "'hidden'");
@@ -950,7 +952,7 @@ void TestApi::enableAndDisableProduct()
     projectFile.write(content);
     projectFile.close();
     bdr.descriptions.clear();
-    errorInfo = doBuildProject("enable-and-disable-product/project.qbs", &bdr);
+    errorInfo = doBuildProject("enable-and-disable-product", &bdr);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(bdr.descriptions.contains("linking"));
 
@@ -963,7 +965,7 @@ void TestApi::enableAndDisableProduct()
     projectFile.write(content);
     projectFile.close();
     bdr.descriptions.clear();
-    errorInfo = doBuildProject("enable-and-disable-product/project.qbs", &bdr);
+    errorInfo = doBuildProject("enable-and-disable-product", &bdr);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(!bdr.descriptions.contains("compiling"));
 }
@@ -971,8 +973,7 @@ void TestApi::enableAndDisableProduct()
 void TestApi::errorInSetupRunEnvironment()
 {
     qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("error-in-setup-run-environment/"
-                                     "error-in-setup-run-environment.qbs");
+            = defaultSetupParameters("error-in-setup-run-environment");
     QScopedPointer<qbs::SetupProjectJob> job(qbs::Project().setupProject(setupParams,
                                                                         m_logSink, 0));
     waitForFinished(job.data());
@@ -1009,7 +1010,7 @@ static qbs::ErrorInfo forceRuleEvaluation(const qbs::Project project)
 void TestApi::disabledInstallGroup()
 {
     qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("disabled_install_group/project.qbs");
+            = defaultSetupParameters("disabled_install_group");
     QScopedPointer<qbs::SetupProjectJob> job(qbs::Project().setupProject(setupParams,
                                                                         m_logSink, 0));
     waitForFinished(job.data());
@@ -1033,13 +1034,13 @@ void TestApi::disabledInstallGroup()
 
 void TestApi::disabledProduct()
 {
-    const qbs::ErrorInfo errorInfo = doBuildProject("disabled-product/disabledProduct.qbs");
+    const qbs::ErrorInfo errorInfo = doBuildProject("disabled-product");
     VERIFY_NO_ERROR(errorInfo);
 }
 
 void TestApi::disabledProject()
 {
-    const qbs::ErrorInfo errorInfo = doBuildProject("disabled-project/disabled_project.qbs");
+    const qbs::ErrorInfo errorInfo = doBuildProject("disabled-project");
     VERIFY_NO_ERROR(errorInfo);
 }
 
@@ -1069,44 +1070,44 @@ void TestApi::dynamicLibs()
 
 void TestApi::emptyFileTagList()
 {
-    const qbs::ErrorInfo errorInfo = doBuildProject("empty-filetag-list/project.qbs");
+    const qbs::ErrorInfo errorInfo = doBuildProject("empty-filetag-list");
     VERIFY_NO_ERROR(errorInfo);
 }
 
 void TestApi::emptySubmodulesList()
 {
-    const qbs::ErrorInfo errorInfo = doBuildProject("empty-submodules-list/project.qbs");
+    const qbs::ErrorInfo errorInfo = doBuildProject("empty-submodules-list");
     VERIFY_NO_ERROR(errorInfo);
 }
 
 void TestApi::explicitlyDependsOn()
 {
     BuildDescriptionReceiver receiver;
-    qbs::ErrorInfo errorInfo = doBuildProject("explicitly-depends-on/project.qbs", &receiver);
+    qbs::ErrorInfo errorInfo = doBuildProject("explicitly-depends-on", &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(receiver.descriptions.contains("Creating output artifact"));
     receiver.descriptions.clear();
 
-    errorInfo = doBuildProject("explicitly-depends-on/project.qbs", &receiver);
+    errorInfo = doBuildProject("explicitly-depends-on", &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(!receiver.descriptions.contains("Creating output artifact"));
 
     WAIT_FOR_NEW_TIMESTAMP();
     touch("dependency.txt");
-    errorInfo = doBuildProject("explicitly-depends-on/project.qbs", &receiver);
+    errorInfo = doBuildProject("explicitly-depends-on", &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(receiver.descriptions.contains("Creating output artifact"));
 }
 
 void TestApi::exportSimple()
 {
-    const qbs::ErrorInfo errorInfo = doBuildProject("export-simple/project.qbs");
+    const qbs::ErrorInfo errorInfo = doBuildProject("export-simple");
     VERIFY_NO_ERROR(errorInfo);
 }
 
 void TestApi::exportWithRecursiveDepends()
 {
-    const qbs::ErrorInfo errorInfo = doBuildProject("export-with-recursive-depends/project.qbs");
+    const qbs::ErrorInfo errorInfo = doBuildProject("export-with-recursive-depends");
     VERIFY_NO_ERROR(errorInfo);
 }
 
@@ -1121,7 +1122,7 @@ void TestApi::fileTagger()
 void TestApi::fileTagsFilterOverride()
 {
     qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("filetagsfilter_override/project.qbs");
+            = defaultSetupParameters("filetagsfilter_override");
     QScopedPointer<qbs::SetupProjectJob> job(qbs::Project().setupProject(setupParams,
                                                                          m_logSink, 0));
     waitForFinished(job.data());
@@ -1142,7 +1143,7 @@ void TestApi::fileTagsFilterOverride()
 void TestApi::generatedFilesList()
 {
     qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("generated-files-list/generated-files-list.qbs");
+            = defaultSetupParameters("generated-files-list");
     QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(setupParams,
                                                                               m_logSink, 0));
     QVERIFY(waitForFinished(setupJob.data()));
@@ -1218,8 +1219,7 @@ void TestApi::infiniteLoopBuilding_data()
 
 void TestApi::infiniteLoopResolving()
 {
-    qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("infinite-loop-resolving/project.qbs");
+    qbs::SetupProjectParameters setupParams = defaultSetupParameters("infinite-loop-resolving");
     QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(setupParams,
                                                                               m_logSink, 0));
     QTimer::singleShot(1000, setupJob.data(), &qbs::AbstractJob::cancel);
@@ -1262,8 +1262,7 @@ template <typename T, class Pred> T findElem(const QList<T> &list, Pred p)
 
 void TestApi::installableFiles()
 {
-    qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("installed-artifact/installed_artifact.qbs");
+    qbs::SetupProjectParameters setupParams = defaultSetupParameters("installed-artifact");
     QVariantMap overriddenValues;
     overriddenValues.insert(QLatin1String("qbs.installRoot"), QLatin1String("/tmp"));
     setupParams.setOverriddenValues(overriddenValues);
@@ -1295,7 +1294,7 @@ void TestApi::installableFiles()
         }
     }
 
-    setupParams  = defaultSetupParameters("recursive-wildcards/recursive_wildcards.qbs");
+    setupParams  = defaultSetupParameters("recursive-wildcards");
     setupParams.setOverriddenValues(overriddenValues);
     job.reset(project.setupProject(setupParams, m_logSink, 0));
     waitForFinished(job.data());
@@ -1316,7 +1315,7 @@ void TestApi::installableFiles()
 
 void TestApi::isRunnable()
 {
-    qbs::SetupProjectParameters setupParams = defaultSetupParameters("is-runnable/project.qbs");
+    qbs::SetupProjectParameters setupParams = defaultSetupParameters("is-runnable");
     QScopedPointer<qbs::SetupProjectJob> job(qbs::Project().setupProject(setupParams,
                                                                         m_logSink, 0));
     waitForFinished(job.data());
@@ -1380,7 +1379,7 @@ void TestApi::missingSourceFile()
 void TestApi::mocCppIncluded()
 {
     // Initial build.
-    qbs::ErrorInfo errorInfo = doBuildProject("moc-hpp-included/project.qbs");
+    qbs::ErrorInfo errorInfo = doBuildProject("moc-hpp-included");
     VERIFY_NO_ERROR(errorInfo);
 
     // Touch header and try again.
@@ -1390,7 +1389,7 @@ void TestApi::mocCppIncluded()
              qPrintable(headerFile.errorString()));
     headerFile.write("\n");
     headerFile.close();
-    errorInfo = doBuildProject("moc-hpp-included/project.qbs");
+    errorInfo = doBuildProject("moc-hpp-included");
     VERIFY_NO_ERROR(errorInfo);
 
     // Touch cpp file and try again.
@@ -1400,13 +1399,13 @@ void TestApi::mocCppIncluded()
              qPrintable(cppFile.errorString()));
     cppFile.write("\n");
     cppFile.close();
-    errorInfo = doBuildProject("moc-hpp-included/project.qbs");
+    errorInfo = doBuildProject("moc-hpp-included");
     VERIFY_NO_ERROR(errorInfo);
 }
 
 void TestApi::multiArch()
 {
-    qbs::SetupProjectParameters setupParams = defaultSetupParameters("multi-arch/project.qbs");
+    qbs::SetupProjectParameters setupParams = defaultSetupParameters("multi-arch");
     qbs::Settings settings((QString()));
     qbs::Internal::TemporaryProfile tph("host", &settings);
     qbs::Profile hostProfile = tph.p;
@@ -1503,7 +1502,7 @@ void TestApi::newOutputArtifactInDependency()
 {
     BuildDescriptionReceiver receiver;
     qbs::ErrorInfo errorInfo
-            = doBuildProject("new-output-artifact-in-dependency/project.qbs", &receiver);
+            = doBuildProject("new-output-artifact-in-dependency", &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(receiver.descriptions.contains("linking app"));
     const QByteArray linkingLibString = QByteArray("linking ")
@@ -1512,14 +1511,14 @@ void TestApi::newOutputArtifactInDependency()
     receiver.descriptions.clear();
 
     WAIT_FOR_NEW_TIMESTAMP();
-    QFile projectFile("project.qbs");
+    QFile projectFile("new-output-artifact-in-dependency.qbs");
     QVERIFY2(projectFile.open(QIODevice::ReadWrite), qPrintable(projectFile.errorString()));
     QByteArray contents = projectFile.readAll();
     contents.replace("//Depends", "Depends");
     projectFile.resize(0);
     projectFile.write(contents);
     projectFile.close();
-    errorInfo = doBuildProject("new-output-artifact-in-dependency/project.qbs", &receiver);
+    errorInfo = doBuildProject("new-output-artifact-in-dependency", &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(receiver.descriptions.contains("linking app"));
     QVERIFY(receiver.descriptions.contains(linkingLibString));
@@ -1528,12 +1527,12 @@ void TestApi::newOutputArtifactInDependency()
 void TestApi::newPatternMatch()
 {
     TaskReceiver receiver;
-    qbs::ErrorInfo errorInfo = doBuildProject("new-pattern-match/project.qbs", 0, 0, &receiver);
+    qbs::ErrorInfo errorInfo = doBuildProject("new-pattern-match", 0, 0, &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY2(receiver.taskDescriptions.contains("Resolving"), qPrintable(m_logSink->output));
     receiver.taskDescriptions.clear();
 
-    errorInfo = doBuildProject("new-pattern-match/project.qbs", 0, 0, &receiver);
+    errorInfo = doBuildProject("new-pattern-match", 0, 0, &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(!receiver.taskDescriptions.contains("Resolving"));
 
@@ -1541,18 +1540,18 @@ void TestApi::newPatternMatch()
     QFile f("test.txt");
     QVERIFY2(f.open(QIODevice::WriteOnly), qPrintable(f.errorString()));
     f.close();
-    errorInfo = doBuildProject("new-pattern-match/project.qbs", 0, 0, &receiver);
+    errorInfo = doBuildProject("new-pattern-match", 0, 0, &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(receiver.taskDescriptions.contains("Resolving"));
     receiver.taskDescriptions.clear();
 
-    errorInfo = doBuildProject("new-pattern-match/project.qbs", 0, 0, &receiver);
+    errorInfo = doBuildProject("new-pattern-match", 0, 0, &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(!receiver.taskDescriptions.contains("Resolving"));
 
     WAIT_FOR_NEW_TIMESTAMP();
     f.remove();
-    errorInfo = doBuildProject("new-pattern-match/project.qbs", 0, 0, &receiver);
+    errorInfo = doBuildProject("new-pattern-match", 0, 0, &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY(receiver.taskDescriptions.contains("Resolving"));
 }
@@ -1560,7 +1559,7 @@ void TestApi::newPatternMatch()
 void TestApi::nonexistingProjectPropertyFromProduct()
 {
     qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("nonexistingprojectproperties/invalidaccessfromproduct.qbs");
+            = defaultSetupParameters("nonexistingprojectproperties");
     QScopedPointer<qbs::SetupProjectJob> job(qbs::Project().setupProject(setupParams,
                                                                         m_logSink, 0));
     waitForFinished(job.data());
@@ -1573,7 +1572,7 @@ void TestApi::nonexistingProjectPropertyFromProduct()
 void TestApi::nonexistingProjectPropertyFromCommandLine()
 {
     qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("nonexistingprojectproperties/project.qbs");
+            = defaultSetupParameters("nonexistingprojectproperties");
     removeBuildDir(setupParams);
     QVariantMap projectProperties;
     projectProperties.insert(QLatin1String("project.blubb"), QLatin1String("true"));
@@ -1588,7 +1587,7 @@ void TestApi::nonexistingProjectPropertyFromCommandLine()
 
 void TestApi::objC()
 {
-    const qbs::ErrorInfo errorInfo = doBuildProject("objc/objc.qbs");
+    const qbs::ErrorInfo errorInfo = doBuildProject("objc");
     VERIFY_NO_ERROR(errorInfo);
 }
 
@@ -1642,7 +1641,7 @@ void TestApi::processResult()
     // for a while.
     if (qbs::Internal::HostOsInfo::isWindowsHost())
         QTest::qWait(500);
-    removeBuildDir(defaultSetupParameters("process-result/process-result.qbs"));
+    removeBuildDir(defaultSetupParameters("process-result"));
 
     QFETCH(int, expectedExitCode);
     QFETCH(bool, redirectStdout);
@@ -1652,7 +1651,7 @@ void TestApi::processResult()
     overridden.insert("products.app-caller.redirectStdout", redirectStdout);
     overridden.insert("products.app-caller.redirectStderr", redirectStderr);
     ProcessResultReceiver resultReceiver;
-    const qbs::ErrorInfo errorInfo = doBuildProject("process-result/process-result.qbs",
+    const qbs::ErrorInfo errorInfo = doBuildProject("process-result",
             nullptr, &resultReceiver, nullptr, qbs::BuildOptions(), overridden);
     QCOMPARE(expectedExitCode != 0, errorInfo.hasError());
     QVERIFY(resultReceiver.results.count() > 1);
@@ -1698,9 +1697,8 @@ void TestApi::processResult_data()
 
 void TestApi::projectInvalidation()
 {
-    qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("project-invalidation/project.qbs");
-    QVERIFY(QFile::copy("project.no-error.qbs", "project.qbs"));
+    qbs::SetupProjectParameters setupParams = defaultSetupParameters("project-invalidation");
+    QVERIFY(QFile::copy("project.no-error.qbs", "project-invalidation.qbs"));
     QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(setupParams,
                                                                         m_logSink, 0));
     waitForFinished(setupJob.data());
@@ -1708,13 +1706,13 @@ void TestApi::projectInvalidation()
     qbs::Project project = setupJob->project();
     QVERIFY(project.isValid());
     WAIT_FOR_NEW_TIMESTAMP();
-    copyFileAndUpdateTimestamp("project.early-error.qbs", "project.qbs");
+    copyFileAndUpdateTimestamp("project.early-error.qbs", "project-invalidation.qbs");
     setupJob.reset(project.setupProject(setupParams, m_logSink, 0));
     waitForFinished(setupJob.data());
     QVERIFY(setupJob->error().hasError());
     QVERIFY(project.isValid()); // Error in Loader, old project still valid.
     WAIT_FOR_NEW_TIMESTAMP();
-    copyFileAndUpdateTimestamp("project.late-error.qbs", "project.qbs");
+    copyFileAndUpdateTimestamp("project.late-error.qbs", "project-invalidation.qbs");
     setupJob.reset(project.setupProject(setupParams, m_logSink, 0));
     waitForFinished(setupJob.data());
     QVERIFY(setupJob->error().hasError());
@@ -1723,7 +1721,7 @@ void TestApi::projectInvalidation()
 
 void TestApi::projectLocking()
 {
-    qbs::SetupProjectParameters setupParams = defaultSetupParameters("project-locking/project.qbs");
+    qbs::SetupProjectParameters setupParams = defaultSetupParameters("project-locking");
     QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(setupParams,
                                                                         m_logSink, 0));
     waitForFinished(setupJob.data());
@@ -1743,7 +1741,7 @@ void TestApi::projectLocking()
 
 void TestApi::projectPropertiesByName()
 {
-    const QString projectFile = "project-properties-by-name/project.qbs";
+    const QString projectFile = "project-properties-by-name/project-properties-by-name.qbs";
     qbs::ErrorInfo errorInfo = doBuildProject(projectFile);
     QVERIFY(errorInfo.hasError());
     QVariantMap overridden;
@@ -1761,20 +1759,20 @@ void TestApi::projectPropertiesByName()
 
 void TestApi::projectWithPropertiesItem()
 {
-    const qbs::ErrorInfo errorInfo = doBuildProject("project-with-properties-item/project.qbs");
+    const qbs::ErrorInfo errorInfo = doBuildProject("project-with-properties-item");
     VERIFY_NO_ERROR(errorInfo);
 }
 
 void TestApi::propertiesBlocks()
 {
-    const qbs::ErrorInfo errorInfo = doBuildProject("properties-blocks/propertiesblocks.qbs");
+    const qbs::ErrorInfo errorInfo = doBuildProject("properties-blocks");
     VERIFY_NO_ERROR(errorInfo);
 }
 
 void TestApi::rc()
 {
     BuildDescriptionReceiver receiver;
-    const qbs::ErrorInfo errorInfo = doBuildProject("rc/rc.qbs", &receiver);
+    const qbs::ErrorInfo errorInfo = doBuildProject("rc", &receiver);
     VERIFY_NO_ERROR(errorInfo);
     const bool rcFileWasCompiled = receiver.descriptions.contains("compiling test.rc");
     QCOMPARE(rcFileWasCompiled, qbs::Internal::HostOsInfo::isWindowsHost());
@@ -1783,8 +1781,7 @@ void TestApi::rc()
 void TestApi::referencedFileErrors()
 {
     QFETCH(bool, relaxedMode);
-    qbs::SetupProjectParameters params
-            = defaultSetupParameters("referenced-file-errors/referenced-file-errors.qbs");
+    qbs::SetupProjectParameters params = defaultSetupParameters("referenced-file-errors");
     params.setDryRun(true);
     params.setProductErrorMode(relaxedMode ? qbs::ErrorHandlingMode::Relaxed
                                            : qbs::ErrorHandlingMode::Strict);
@@ -1808,13 +1805,22 @@ void TestApi::referencedFileErrors_data()
     QTest::newRow("relaxed mode") << true;
 }
 
-qbs::SetupProjectParameters TestApi::defaultSetupParameters(const QString &projectFilePath) const
+qbs::SetupProjectParameters TestApi::defaultSetupParameters(const QString &projectFileOrDir) const
 {
+    QFileInfo fi(m_workingDataDir + QLatin1Char('/') + projectFileOrDir);
+    QString projectDirPath;
+    QString projectFilePath;
+    if (fi.isDir()) {
+        projectDirPath = fi.absoluteFilePath();
+        projectFilePath = projectDirPath + QLatin1Char('/') + projectFileOrDir
+                + QStringLiteral(".qbs");
+    } else {
+        projectDirPath = fi.absolutePath();
+        projectFilePath = fi.absoluteFilePath();
+    }
+
     qbs::SetupProjectParameters setupParams;
-    const QString projectDirPath = QDir::cleanPath(m_workingDataDir + QLatin1Char('/')
-                                                   + QFileInfo(projectFilePath).path());
-    setupParams.setProjectFilePath(projectDirPath + QLatin1Char('/')
-                                   + QFileInfo(projectFilePath).fileName());
+    setupParams.setProjectFilePath(projectFilePath);
     setupParams.setPropertyCheckingMode(qbs::ErrorHandlingMode::Strict);
     QDir::setCurrent(projectDirPath);
     setupParams.setBuildRoot(projectDirPath);
@@ -1862,8 +1868,7 @@ void TestApi::references()
 
 void TestApi::relaxedModeRecovery()
 {
-    qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("relaxed-mode-recovery/relaxed-mode-recovery.qbs");
+    qbs::SetupProjectParameters setupParams = defaultSetupParameters("relaxed-mode-recovery");
     setupParams.setProductErrorMode(qbs::ErrorHandlingMode::Relaxed);
     setupParams.setPropertyCheckingMode(qbs::ErrorHandlingMode::Relaxed);
     QScopedPointer<qbs::SetupProjectJob> job(qbs::Project().setupProject(setupParams,
@@ -1960,8 +1965,7 @@ void TestApi::resolveProject()
     QFETCH(QString, projectSubDir);
     QFETCH(QString, productFileName);
 
-    const qbs::SetupProjectParameters params
-            = defaultSetupParameters(projectSubDir + "/project.qbs");
+    const qbs::SetupProjectParameters params = defaultSetupParameters(projectSubDir);
     removeBuildDir(params);
     const QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(params,
                                                                                     m_logSink, 0));
@@ -1981,7 +1985,7 @@ void TestApi::resolveProjectDryRun()
     QFETCH(QString, projectSubDir);
     QFETCH(QString, productFileName);
 
-    qbs::SetupProjectParameters params = defaultSetupParameters(projectSubDir + "/project.qbs");
+    qbs::SetupProjectParameters params = defaultSetupParameters(projectSubDir);
     params.setDryRun(true);
     removeBuildDir(params);
     const QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(params,
@@ -1999,8 +2003,7 @@ void TestApi::resolveProjectDryRun_data()
 
 void TestApi::restoredWarnings()
 {
-    qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("restored-warnings/restored-warnings.qbs");
+    qbs::SetupProjectParameters setupParams = defaultSetupParameters("restored-warnings");
     setupParams.setPropertyCheckingMode(qbs::ErrorHandlingMode::Relaxed);
     setupParams.setProductErrorMode(qbs::ErrorHandlingMode::Relaxed);
 
@@ -2048,7 +2051,7 @@ void TestApi::restoredWarnings()
 
 void TestApi::ruleConflict()
 {
-    const qbs::ErrorInfo errorInfo = doBuildProject("rule-conflict/rule-conflict.qbs");
+    const qbs::ErrorInfo errorInfo = doBuildProject("rule-conflict");
     QVERIFY(errorInfo.hasError());
     const QString errorString = errorInfo.toString();
     QVERIFY2(errorString.contains("conflict") && errorString.contains("pch1.h")
@@ -2057,15 +2060,14 @@ void TestApi::ruleConflict()
 
 void TestApi::softDependency()
 {
-    const qbs::ErrorInfo errorInfo = doBuildProject("soft-dependency/project.qbs");
+    const qbs::ErrorInfo errorInfo = doBuildProject("soft-dependency");
     VERIFY_NO_ERROR(errorInfo);
 }
 
 void TestApi::sourceFileInBuildDir()
 {
-    VERIFY_NO_ERROR(doBuildProject("source-file-in-build-dir/project.qbs"));
-    qbs::SetupProjectParameters setupParams
-            = defaultSetupParameters("source-file-in-build-dir/project.qbs");
+    VERIFY_NO_ERROR(doBuildProject("source-file-in-build-dir"));
+    qbs::SetupProjectParameters setupParams = defaultSetupParameters("source-file-in-build-dir");
     const QString generatedFile = relativeProductBuildDir("theProduct") + "/generated.cpp";
     QVERIFY2(regularFileExists(generatedFile), qPrintable(generatedFile));
     QScopedPointer<qbs::SetupProjectJob> job(qbs::Project().setupProject(setupParams,
@@ -2184,26 +2186,26 @@ void TestApi::transformers()
 void TestApi::typeChange()
 {
     BuildDescriptionReceiver receiver;
-    qbs::ErrorInfo errorInfo = doBuildProject("type-change/project.qbs", &receiver);
+    qbs::ErrorInfo errorInfo = doBuildProject("type-change", &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY2(!receiver.descriptions.contains("compiling"), qPrintable(receiver.descriptions));
 
     WAIT_FOR_NEW_TIMESTAMP();
-    QFile projectFile("project.qbs");
+    QFile projectFile("type-change.qbs");
     QVERIFY2(projectFile.open(QIODevice::ReadWrite), qPrintable(projectFile.errorString()));
     QByteArray content = projectFile.readAll();
     content.replace("//", "");
     projectFile.resize(0);
     projectFile.write(content);
     projectFile.close();
-    errorInfo = doBuildProject("type-change/project.qbs", &receiver);
+    errorInfo = doBuildProject("type-change", &receiver);
     VERIFY_NO_ERROR(errorInfo);
     QVERIFY2(receiver.descriptions.contains("compiling"), qPrintable(receiver.descriptions));
 }
 
 void TestApi::uic()
 {
-    const qbs::ErrorInfo errorInfo = doBuildProject("uic/uic.qbs");
+    const qbs::ErrorInfo errorInfo = doBuildProject("uic");
     VERIFY_NO_ERROR(errorInfo);
 }
 
diff --git a/tests/auto/api/tst_api.h b/tests/auto/api/tst_api.h
index b2ebbc336..4ee1feb18 100644
--- a/tests/auto/api/tst_api.h
+++ b/tests/auto/api/tst_api.h
@@ -136,7 +136,7 @@ private slots:
     void uic();
 
 private:
-    qbs::SetupProjectParameters defaultSetupParameters(const QString &projectFilePath) const;
+    qbs::SetupProjectParameters defaultSetupParameters(const QString &projectFileOrDir) const;
     qbs::ErrorInfo doBuildProject(const QString &projectFilePath,
                                   BuildDescriptionReceiver *buildDescriptionReceiver = 0,
                                   ProcessResultReceiver *procResultReceiver = 0,
diff --git a/tests/auto/blackbox/testdata/build-directories/project.qbs b/tests/auto/blackbox/testdata/build-directories/build-directories.qbs
index dd8fc6c05..dd8fc6c05 100644
--- a/tests/auto/blackbox/testdata/build-directories/project.qbs
+++ b/tests/auto/blackbox/testdata/build-directories/build-directories.qbs
diff --git a/tests/auto/blackbox/testdata/change-in-disabled-product/project.qbs b/tests/auto/blackbox/testdata/change-in-disabled-product/change-in-disabled-product.qbs
index 8a99d2c8c..8a99d2c8c 100644
--- a/tests/auto/blackbox/testdata/change-in-disabled-product/project.qbs
+++ b/tests/auto/blackbox/testdata/change-in-disabled-product/change-in-disabled-product.qbs
diff --git a/tests/auto/blackbox/testdata/changed-files/project.qbs b/tests/auto/blackbox/testdata/changed-files/changed-files.qbs
index dd222479f..dd222479f 100644
--- a/tests/auto/blackbox/testdata/changed-files/project.qbs
+++ b/tests/auto/blackbox/testdata/changed-files/changed-files.qbs
diff --git a/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/project.qbs b/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/nonexistentWorkingDir.qbs
index 8cf1bfaad..8cf1bfaad 100644
--- a/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/project.qbs
+++ b/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/nonexistentWorkingDir.qbs
diff --git a/tests/auto/blackbox/testdata/error-info/project.qbs b/tests/auto/blackbox/testdata/error-info/error-info.qbs
index a830be36c..a830be36c 100644
--- a/tests/auto/blackbox/testdata/error-info/project.qbs
+++ b/tests/auto/blackbox/testdata/error-info/error-info.qbs
diff --git a/tests/auto/blackbox/testdata/inputs-from-dependencies/project.qbs b/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs
index 1b40abaeb..1b40abaeb 100644
--- a/tests/auto/blackbox/testdata/inputs-from-dependencies/project.qbs
+++ b/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs
diff --git a/tests/auto/blackbox/testdata/install-tree/project.qbs b/tests/auto/blackbox/testdata/install-tree/install-tree.qbs
index cbd7300d6..cbd7300d6 100644
--- a/tests/auto/blackbox/testdata/install-tree/project.qbs
+++ b/tests/auto/blackbox/testdata/install-tree/install-tree.qbs
diff --git a/tests/auto/blackbox/testdata/installed-source-files/project.qbs b/tests/auto/blackbox/testdata/installed-source-files/installed-source-files.qbs
index 1aa564553..1aa564553 100644
--- a/tests/auto/blackbox/testdata/installed-source-files/project.qbs
+++ b/tests/auto/blackbox/testdata/installed-source-files/installed-source-files.qbs
diff --git a/tests/auto/blackbox/testdata/linkerMode/project.qbs b/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs
index f1cfcb52c..f1cfcb52c 100644
--- a/tests/auto/blackbox/testdata/linkerMode/project.qbs
+++ b/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs
diff --git a/tests/auto/blackbox/testdata/list-properties-with-outer/project.qbs b/tests/auto/blackbox/testdata/list-properties-with-outer/list-properties-with-outer.qbs
index 3b0b3be49..3b0b3be49 100644
--- a/tests/auto/blackbox/testdata/list-properties-with-outer/project.qbs
+++ b/tests/auto/blackbox/testdata/list-properties-with-outer/list-properties-with-outer.qbs
diff --git a/tests/auto/blackbox/testdata/multiple-changes/project.qbs b/tests/auto/blackbox/testdata/multiple-changes/multiple-changes.qbs
index 254e2b4da..254e2b4da 100644
--- a/tests/auto/blackbox/testdata/multiple-changes/project.qbs
+++ b/tests/auto/blackbox/testdata/multiple-changes/multiple-changes.qbs
diff --git a/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/project.qbs b/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/non-broken-files-in-broken-product.qbs
index 1ec764dfa..1ec764dfa 100644
--- a/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/project.qbs
+++ b/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/non-broken-files-in-broken-product.qbs
diff --git a/tests/auto/blackbox/testdata/non-default-product/project.qbs b/tests/auto/blackbox/testdata/non-default-product/non-default-product.qbs
index 498344975..498344975 100644
--- a/tests/auto/blackbox/testdata/non-default-product/project.qbs
+++ b/tests/auto/blackbox/testdata/non-default-product/non-default-product.qbs
diff --git a/tests/auto/blackbox/testdata/overrideProjectProperties/project.qbs b/tests/auto/blackbox/testdata/overrideProjectProperties/overrideProjectProperties.qbs
index 6e8ef62a1..6e8ef62a1 100644
--- a/tests/auto/blackbox/testdata/overrideProjectProperties/project.qbs
+++ b/tests/auto/blackbox/testdata/overrideProjectProperties/overrideProjectProperties.qbs
diff --git a/tests/auto/blackbox/testdata/product-dependencies-by-type/project.qbs b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
index ebfc45d3f..ebfc45d3f 100644
--- a/tests/auto/blackbox/testdata/product-dependencies-by-type/project.qbs
+++ b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
diff --git a/tests/auto/blackbox/testdata/productproperties/project.qbs b/tests/auto/blackbox/testdata/productproperties/productproperties.qbs
index 75c6224bc..75c6224bc 100644
--- a/tests/auto/blackbox/testdata/productproperties/project.qbs
+++ b/tests/auto/blackbox/testdata/productproperties/productproperties.qbs
diff --git a/tests/auto/blackbox/testdata/property-precedence/project.qbs b/tests/auto/blackbox/testdata/property-precedence/property-precedence.qbs
index 5246c8a7b..5246c8a7b 100644
--- a/tests/auto/blackbox/testdata/property-precedence/project.qbs
+++ b/tests/auto/blackbox/testdata/property-precedence/property-precedence.qbs
diff --git a/tests/auto/blackbox/testdata/propertyChanges/project.qbs b/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs
index a2b42a626..a2b42a626 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/project.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs
diff --git a/tests/auto/blackbox/testdata/qml-debugging/project.qbs b/tests/auto/blackbox/testdata/qml-debugging/qml-debugging.qbs
index 3606b4aa3..3606b4aa3 100644
--- a/tests/auto/blackbox/testdata/qml-debugging/project.qbs
+++ b/tests/auto/blackbox/testdata/qml-debugging/qml-debugging.qbs
diff --git a/tests/auto/blackbox/testdata/qobject-in-mm/project.qbs b/tests/auto/blackbox/testdata/qobject-in-mm/qobject-in-mm.qbs
index 2f819d012..2f819d012 100644
--- a/tests/auto/blackbox/testdata/qobject-in-mm/project.qbs
+++ b/tests/auto/blackbox/testdata/qobject-in-mm/qobject-in-mm.qbs
diff --git a/tests/auto/blackbox/testdata/referenceErrorInExport/project.qbs b/tests/auto/blackbox/testdata/referenceErrorInExport/referenceErrorInExport.qbs
index 91069f629..91069f629 100644
--- a/tests/auto/blackbox/testdata/referenceErrorInExport/project.qbs
+++ b/tests/auto/blackbox/testdata/referenceErrorInExport/referenceErrorInExport.qbs
diff --git a/tests/auto/blackbox/testdata/separate-debug-info/project.qbs b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
index c0498df3d..c0498df3d 100644
--- a/tests/auto/blackbox/testdata/separate-debug-info/project.qbs
+++ b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
diff --git a/tests/auto/blackbox/testdata/trackAddFile/after/project.qbs b/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs
index 469aff097..469aff097 100644
--- a/tests/auto/blackbox/testdata/trackAddFile/after/project.qbs
+++ b/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs
diff --git a/tests/auto/blackbox/testdata/trackAddFile/before/project.qbs b/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs
index fc647cdbe..fc647cdbe 100644
--- a/tests/auto/blackbox/testdata/trackAddFile/before/project.qbs
+++ b/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs
diff --git a/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs b/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs
index 232c8ea41..232c8ea41 100644
--- a/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs
+++ b/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs
diff --git a/tests/auto/blackbox/testdata/trackFileTags/after/project.qbs b/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs
index c0e5c4715..c0e5c4715 100644
--- a/tests/auto/blackbox/testdata/trackFileTags/after/project.qbs
+++ b/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs
diff --git a/tests/auto/blackbox/testdata/trackFileTags/before/project.qbs b/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs
index 7ac895c5f..7ac895c5f 100644
--- a/tests/auto/blackbox/testdata/trackFileTags/before/project.qbs
+++ b/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs
diff --git a/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/usings-as-sole-inputs-non-multiplexed.qbs
index 7d4087620..7d4087620 100644
--- a/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs
+++ b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/usings-as-sole-inputs-non-multiplexed.qbs
diff --git a/tests/auto/blackbox/testdata/wildcards-and-rules/project.qbs b/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs
index 88fadd3a5..88fadd3a5 100644
--- a/tests/auto/blackbox/testdata/wildcards-and-rules/project.qbs
+++ b/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 46f735a72..6aff99de9 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -744,7 +744,7 @@ void TestBlackbox::changeInDisabledProduct()
     QDir::setCurrent(testDataDir + "/change-in-disabled-product");
     QCOMPARE(runQbs(), 0);
     WAIT_FOR_NEW_TIMESTAMP();
-    QFile projectFile("project.qbs");
+    QFile projectFile("change-in-disabled-product.qbs");
     QVERIFY2(projectFile.open(QIODevice::ReadWrite), qPrintable(projectFile.errorString()));
     QByteArray content = projectFile.readAll();
     content.replace("// 'test2.txt'", "'test2.txt'");
@@ -1417,7 +1417,7 @@ void TestBlackbox::trackAddFile()
 
     WAIT_FOR_NEW_TIMESTAMP();
     ccp("../after", ".");
-    touch("project.qbs");
+    touch("trackAddFile.qbs");
     touch("main.cpp");
     QCOMPARE(runQbs(), 0);
 
@@ -1552,16 +1552,16 @@ void TestBlackbox::trackRemoveFile()
     QDateTime unchangedObjectFileTime1 = QFileInfo(unchangedObjectFile).lastModified();
 
     WAIT_FOR_NEW_TIMESTAMP();
-    QFile::remove("project.qbs");
+    QFile::remove("trackAddFile.qbs");
     QFile::remove("main.cpp");
-    QFile::copy("../before/project.qbs", "project.qbs");
+    QFile::copy("../before/trackAddFile.qbs", "trackAddFile.qbs");
     QFile::copy("../before/main.cpp", "main.cpp");
     QVERIFY(QFile::remove("zort.h"));
     QVERIFY(QFile::remove("zort.cpp"));
     QCOMPARE(runQbs(QbsRunParameters(QLatin1String("resolve"))), 0);
 
     touch("main.cpp");
-    touch("project.qbs");
+    touch("trackAddFile.qbs");
     QCOMPARE(runQbs(), 0);
 
     process.start(relativeExecutableFilePath("someapp"), QStringList());
@@ -1603,7 +1603,7 @@ void TestBlackbox::trackAddFileTag()
     WAIT_FOR_NEW_TIMESTAMP();
     ccp("../after", ".");
     touch("main.cpp");
-    touch("project.qbs");
+    touch("trackFileTags.qbs");
     QCOMPARE(runQbs(), 0);
 
     process.start(relativeExecutableFilePath("someapp"), QStringList());
@@ -1642,7 +1642,7 @@ void TestBlackbox::trackRemoveFileTag()
     WAIT_FOR_NEW_TIMESTAMP();
     ccp("../before", ".");
     touch("main.cpp");
-    touch("project.qbs");
+    touch("trackFileTags.qbs");
     QCOMPARE(runQbs(), 0);
 
     process.start(relativeExecutableFilePath("someapp"), QStringList());
@@ -1780,7 +1780,7 @@ void TestBlackbox::referenceErrorInExport()
     QVERIFY(runQbs(params) != 0);
     QEXPECT_FAIL(0, "QBS-946", Abort);
     QVERIFY(m_qbsStderr.contains(
-                "project.qbs:17:31 ReferenceError: Can't find variable: includePaths"));
+        "referenceErrorInExport.qbs:17:31 ReferenceError: Can't find variable: includePaths"));
 }
 
 void TestBlackbox::reproducibleBuild()
@@ -2007,7 +2007,7 @@ void TestBlackbox::overrideProjectProperties()
     QDir::setCurrent(testDataDir + "/overrideProjectProperties");
     QCOMPARE(runQbs(QbsRunParameters(QStringList()
                                      << QLatin1String("-f")
-                                     << QLatin1String("project.qbs")
+                                     << QLatin1String("overrideProjectProperties.qbs")
                                      << QLatin1String("project.nameSuffix:ForYou")
                                      << QLatin1String("project.someBool:false")
                                      << QLatin1String("project.someInt:156")
@@ -2283,15 +2283,15 @@ void TestBlackbox::productProperties()
 {
     QDir::setCurrent(testDataDir + "/productproperties");
     QCOMPARE(runQbs(QbsRunParameters(QStringList() << QLatin1String("-f")
-                                     << QLatin1String("project.qbs"))), 0);
+                                     << QLatin1String("productproperties.qbs"))), 0);
     QVERIFY(regularFileExists(relativeExecutableFilePath("blubb_user")));
 }
 
 void TestBlackbox::propertyChanges()
 {
     QDir::setCurrent(testDataDir + "/propertyChanges");
-    QFile projectFile("project.qbs");
-    QbsRunParameters params(QStringList() << "-f" << "project.qbs");
+    QFile projectFile("propertyChanges.qbs");
+    QbsRunParameters params(QStringList() << "-f" << "propertyChanges.qbs");
 
     // Initial build.
     QCOMPARE(runQbs(params), 0);
@@ -2672,19 +2672,19 @@ void TestBlackbox::errorInfo()
 
     params.arguments = QStringList() << "project.fail1:true";
     QVERIFY(runQbs(params) != 0);
-    QVERIFY2(m_qbsStderr.contains("project.qbs:25"), m_qbsStderr);
+    QVERIFY2(m_qbsStderr.contains("error-info.qbs:25"), m_qbsStderr);
 
     params.arguments = QStringList() << "project.fail2:true";
     QVERIFY(runQbs(params) != 0);
-    QVERIFY2(m_qbsStderr.contains("project.qbs:37"), m_qbsStderr);
+    QVERIFY2(m_qbsStderr.contains("error-info.qbs:37"), m_qbsStderr);
 
     params.arguments = QStringList() << "project.fail3:true";
     QVERIFY(runQbs(params) != 0);
-    QVERIFY2(m_qbsStderr.contains("project.qbs:52"), m_qbsStderr);
+    QVERIFY2(m_qbsStderr.contains("error-info.qbs:52"), m_qbsStderr);
 
     params.arguments = QStringList() << "project.fail4:true";
     QVERIFY(runQbs(params) != 0);
-    QVERIFY2(m_qbsStderr.contains("project.qbs:67"), m_qbsStderr);
+    QVERIFY2(m_qbsStderr.contains("error-info.qbs:67"), m_qbsStderr);
 
     params.arguments = QStringList() << "project.fail5:true";
     QVERIFY(runQbs(params) != 0);
@@ -2697,7 +2697,7 @@ void TestBlackbox::errorInfo()
     params.arguments = QStringList() << "project.fail7:true";
     QVERIFY(runQbs(params) != 0);
     QVERIFY2(m_qbsStderr.contains("JavaScriptCommand.sourceCode"), m_qbsStderr);
-    QVERIFY2(m_qbsStderr.contains("project.qbs:58"), m_qbsStderr);
+    QVERIFY2(m_qbsStderr.contains("error-info.qbs:58"), m_qbsStderr);
 }
 
 void TestBlackbox::systemRunPaths()
@@ -3411,7 +3411,7 @@ void TestBlackbox::propertyPrecedence()
     qbs::Internal::TemporaryProfile profile("qbs_autotests_propPrecedence", &s);
     profile.p.setValue("qbs.architecture", "x86"); // Profiles must not be empty...
     s.sync();
-    const QStringList args = QStringList() << "-f" << "project.qbs"
+    const QStringList args = QStringList() << "-f" << "property-precedence.qbs"
                                            << ("profile:" + profile.p.name());
     QbsRunParameters params(args);
     params.useProfile = false;
@@ -3480,7 +3480,7 @@ void TestBlackbox::propertyPrecedence()
              m_qbsStdout.constData());
 
     // Case 9: [cmdline=0,prod=1,export=0,nonleaf=0,profile=0]
-    QFile productFile("project.qbs");
+    QFile productFile("property-precedence.qbs");
     QVERIFY2(productFile.open(QIODevice::ReadWrite), qPrintable(productFile.errorString()));
     switchProfileContents(profile.p, &s, false);
     switchFileContents(nonleafFile, false);