diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index 3a14ac82e1e..6b323c3037a 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -72,9 +72,9 @@ Module {
 
     property bool preferSystemSyntaxHighlighting: true
 
-    property bool withPluginTests: Environment.getEnv("TEST") || qbs.buildVariant === "debug"
-    property bool testsEnabled: withPluginTests // TODO: compat, remove
-    property bool withAutotests: project.withAutotests // FIXME: withPluginTests
+    property bool withAllTests: Environment.getEnv("TEST") || qbs.buildVariant === "debug"
+    property bool withPluginTests: withAllTests
+    property bool withAutotests: withAllTests
 
     property stringList generalDefines: [
         "QT_CREATOR",
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 21f610de563..052350b77e0 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -1,7 +1,6 @@
 Project {
     name: "Qt Creator"
     minimumQbsVersion: "2.0.0"
-    property bool withAutotests: qbs.buildVariant === "debug" // TODO: compat, remove
     property path ide_source_tree: path
     property pathList additionalPlugins: []
     property pathList additionalLibs: []