1 files changed, 8 insertions, 10 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 20116ff56..1b9fa0b15 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -2173,7 +2173,7 @@ void TestBlackbox::trackExternalProductChanges()
     const QStringList toolchainTypes = profileToolchain(profile);
     if (!toolchainTypes.contains("gcc"))
         QSKIP("Need GCC-like compiler to run this test");
-    params.environment = QProcessEnvironment::systemEnvironment();
+    params.environment = QbsRunParameters::defaultEnvironment();
     params.environment.insert("INCLUDE_PATH_TEST", "1");
     params.expectFailure = true;
     QVERIFY(runQbs(params) != 0);
@@ -3598,16 +3598,14 @@ void TestBlackbox::propertyEvaluationContext()
 
 void TestBlackbox::qtBug51237()
 {
-    const QString profileName = "profile-qtBug51237";
-    const QString propertyName = "mymodule.theProperty";
-    {
-        const SettingsPtr s = settings();
-        Profile profile(profileName, s.get());
-        profile.setValue(propertyName, QStringList());
-    }
+    const SettingsPtr s = settings();
+    qbs::Internal::TemporaryProfile profile("qbs_autotests_qtBug51237", s.get());
+    profile.p.setValue("mymodule.theProperty", QStringList());
+    s->sync();
+
     QDir::setCurrent(testDataDir + "/QTBUG-51237");
     QbsRunParameters params;
-    params.profile = profileName;
+    params.profile = profile.p.name();
     QCOMPARE(runQbs(params), 0);
 }
 
@@ -6054,7 +6052,7 @@ void TestBlackbox::qbsSession()
     QJsonObject overriddenValues;
     overriddenValues.insert("products.theLib.cpp.cxxLanguageVersion", "c++17");
     resolveMessage.insert("overridden-properties", overriddenValues);
-    resolveMessage.insert("environment", envToJson(QProcessEnvironment::systemEnvironment()));
+    resolveMessage.insert("environment", envToJson(QbsRunParameters::defaultEnvironment()));
     resolveMessage.insert("data-mode", "only-if-changed");
     resolveMessage.insert("log-time", true);
     resolveMessage.insert("module-properties",