diff --git a/qbs/modules/qtc_gtest_gmock/qtc_gtest_gmock.qbs b/qbs/modules/qtc_gtest_gmock/qtc_gtest_gmock.qbs
index 7b1d663cf0e..4a8299ba516 100644
--- a/qbs/modules/qtc_gtest_gmock/qtc_gtest_gmock.qbs
+++ b/qbs/modules/qtc_gtest_gmock/qtc_gtest_gmock.qbs
@@ -19,7 +19,7 @@ Module {
         property bool hasRepo
 
         configure: {
-            repoDir = FileInfo.cleanPath(path + "/../../../tests/unit/3rdparty/googletest");
+            repoDir = FileInfo.cleanPath(path + "/../../../src/libs/3rdparty/googletest");
             gtestDir = FileInfo.joinPaths(repoDir, "googletest");
             gmockDir = FileInfo.joinPaths(repoDir, "googlemock");
             hasRepo = File.exists(gtestDir);
diff --git a/tests/auto/qml/qml.qbs b/tests/auto/qml/qml.qbs
index 76659a5256b..46b3557c68a 100644
--- a/tests/auto/qml/qml.qbs
+++ b/tests/auto/qml/qml.qbs
@@ -7,7 +7,6 @@ Project {
 //        "qmldesigner/qmldesigner.qbs",
         "qmleditor/qmleditor.qbs",
         "qmljssimplereader/qmljssimplereader.qbs",
-        "qmlprojectmanager/qmlprojectmanager.qbs",
         "qrcparser/qrcparser.qbs",
         "reformatter/reformatter.qbs",
         "persistenttrie/persistenttrie.qbs"
diff --git a/tests/unit/unit.qbs b/tests/unit/unit.qbs
new file mode 100644
index 00000000000..b263b933f8f
--- /dev/null
+++ b/tests/unit/unit.qbs
@@ -0,0 +1,4 @@
+Product {
+    name: "QmlDesigner unit tests"
+    files: ["*", "**/*"]
+}